This commit was manufactured by cvs2svn to create tagEVOLUTION_2_8_2

'EVOLUTION_2_8_2'.

svn path=/tags/EVOLUTION_2_8_2/; revision=33006

46 files changed, 29931 insertions, 24833 deletions

diff --git a/ChangeLog b/ChangeLog
index a365ac91fb..48d901ea9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,42 +1,21 @@
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* data/Makefile.am: Install evolution.desktop
-	instead of evolution-<version>.desktop.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Add targets help/quickref/es/Makefile
-	and mail/default/es/Makefile.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
+2006-11-20  Harish Krishnaswamy  <kharish@novell.com>
 
-	* configure.in: Reverting the previous patch as it breaks
-	the HEAD build. Target Help/C/Makefile was removed from 
-	configure.in while Help/Makefile.am still refers to subdirectory
-	C. 
-
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* configure.in: Fixes #76336 and add Spanish quickref.
-
-2006-11-07  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in : Evolution 2.9.2 release
+	* NEWS, configure.in: Evolution 2.8.2 release
 	updates.
 
-2006-11-06  Harish Krishnaswamy  <kharish@novell.com>
+2006-11-20  Harish Krishnaswamy  <kharish@novell.com>
 
 	* configure.in: Move prefer-plain plugin to the 'standard'
 	list from 'experimental'.
 
-2006-11-02  Jules Colding  <colding@omesc.com>
+2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
 
-	* evolution-shell.pc.in (execversion): Added variable so that 
-	the Evolution version is easily deduced programmatically.
+	* data/Makefile.am: Install evolution.desktop 
+	instead of evolution-<version>.desktop.
 
-2006-10-16  Harish Krishnaswamy  <kharish@novell.com>
+2006-10-19  Harish Krishnaswamy  <kharish@novell.com>
 
-	* configure.in: Evolution 2.9.1 release
+	* NEWS, configure.in: Evolution 2.8.1.1 release
 	updates.
 
 2006-10-16  Tor Lillqvist  <tml@novell.com>
@@ -45,19 +24,6 @@
 	mail_win32_get_mail_thread_queued() instead of the variable
 	mail_thread_queued.  (#348212)
 
-2006-10-15  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* addressbook/gui/widgets/eab-contact-display.c,
-	addressbook/importers/evolution-ldif-importer.c 
- 	addressbook/importers/evolution-vcard-importer.c 
- 	calendar/importers/icalendar-importer.c 
- 	plugins/groupwise-features/properties.glade 
- 	plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml 
- 	plugins/save-attachments/org-gnome-save-attachments.xml 
- 	shell/shell.error.xml: Fixed some strings to improve gettext
-	compendia for translators.
-	
-
 2006-10-02  Harish Krishnaswamy  <kharish@novell.com>
 
 	* NEWS, configure.in: Evolution 2.8.1 release
diff --git a/NEWS b/NEWS
index dbc6c774d8..be557ada35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,60 +1,47 @@
-Evolution 2.9.2 2006-11-07
---------------------------
+Evolution 2.8.2 2006-11-20
+---------------------------
+
+Bug fixes :
+#354875, #358249, #357492. 
+Bugzilla.novell.com : #208396, #208318, #222605. 
+
+Contributors:
+Veerapuram Varadhan, Harish Krishnaswamy, Chenthill,
+Ben Gamari, Srinivasa Ragavan, Parthasarathi Susarla.
+
 
 Updated Translations:
-Christophe Merlet (fr), Alexander Shopov (bg),
-Francisco Javier F. Serrador (es), Ivar Smolin (et),
-Ilkka Tuohela (fi), Pawan Chitrakar (ne), Gabor Kelemen (hu),
-Josep Puigdemont i Casamajó (ca).
 
-Contributors :
-Jules Colding, Harish Krishnaswamy, Ben Gamari, Priit Laes.
+Yair Hershkovitz (he), Duarte Loreto (pt),
+Ivar Smolin (et), Djihed Afifi (ar),
+Karsten Brackelmann (nb), Priit Laes (et),
+Pema Geyleg (dz), Christophe Merlet (fr),
+Alexander Shopov (bg), Francisco Javier F. Serrador (es),
+Satoru SATOH (ja), Luca Ferretti (it), Ignacio Casal Quinteiro (gl),
+Wouter Bolsterlee (nl), David Lodge (en_GB), Clytie Siddal (vi),
+Daniel Nylander (sv), Gabor Kelemen (hu),
+Josep Puigdemont i Casamajó (ca), Ankit Patel (gu), Ilkka Tuohela (fi),
+Jovan Naumovski (mk), Kjartan Maraas (nb).
 
 
-Evolution 2.9.1 2006-10-16
---------------------------
 
-Updated Translations:
+Evolution 2.8.1.1 2006-10-19
+----------------------------
 
-Ivar Smolin (et)
-Jovan Naumovski (mk)
-Ilkka Tuohela (fi)
-Francisco Javier F. Serrador (es)
-Johan Dahlin (sv)
-Satoru SATOH (ja)
-Alexander Shopov (bg)
-Luca Ferretti (it)
-Zygimantas Beručka (lt)
-Cyprien Le Pannérer (fr)
-Jordi Mas (ca)
-Tino Meinen (nl)
-Ankit Patel (gu)
-Daniel Nylander (sv)
-Ignacio Casal Quinteiro (gl)
-Pema Geyleg (dz)
-Åsmund Skjæveland (nn)
-Hendrik Richter (de)
-Nickolay V. Shmyrev (ru)
-Changwoo Ryu (ko)
-Wouter Bolsterlee (nl)
-Luca Ferretti (it)
-Gabor Kelemen (hu)
-Subhransu Behera (or)
-Pawan Chitrakar (ne)
-David Lodge (en_GB)
-Vladimer Sichinava (ka)
-Kostas Papadimas (el)
-Jamil Ahmed (bn)
-Alessio Frusciante (it)
+Bugs/Regressions fixed in this release :
 
-Contributors:
+#348212, #360815, #333864, #351374, #360815, #334966,
+#333224, #359271, #360237, #359236. 
+
+Updated Translations:
+
+Ivar Smolin (et), Josep Puigdemont i Casamajó (ca),
+Clytie Siddal (vi), Ankit Patel (gu), Ilkka Tuohela (fi),
+Jovan Naumovski (mk), Luca Ferretti (it), Kjartan Maraas (nb),
+Zygimantas Beručka (lt), Cyprien Le Pannérer (fr),
+Jordi Mas (ca), Tino Meinen (nl), Daniel Nylander (sv),
+Francisco Javier F. Serrador (es).
 
-Mathew Barnes, Harish Krishnaswamy, Radhika Nair,
-Tor Lillqvist, Chris Heath, Sankar P, Ushveen Kaur,
-Srinivasa Ragavan, Daniel Gryniewicz, Nick Sukharev,
-Roozbeh Pournader, Wouter Bolsterlee, Andre Klapper,
-Kjartan Maraas, Chenthill Palanisamy, Devashish Sharma,
-Hiroyuki Ikezoe. 
 
 Evolution 2.8.1 2006-10-02
 --------------------------
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 8ff9e95773..379a6b7955 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,29 +1,7 @@
 2006-11-11  Francisco Javier F. Serrador  <serrador@openshine.com>
 
-	* gui/widgets/e-minicard.c: Fixed #358249
 	* gui/widgets/eab-contact-display.c: Fixed #358249
-
-2005-10-16  Devashish Sharma <sdevashish@novell.com>
-
-	* gui/widgets/e-addressbook-view.c (display_view): Changed the
-	parameter passed to gal_view_minicard_attach.
-	
-	* gui/widgets/gal-view-minicard.c (column_width_changed): Sets the
-	horizontal scroll amount for the addresss card view to the current
-	page size. 
-	
-	* gui/widgets/gal-view-minicard.h: Changed function prototype for
-	gal_view_minicard_attach. Passing EABView instead of
-	EMinicardViewWidget.
-	Fixes Bug#218273
-
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug#332908
-	* addressbook.error.xml :
-	* gui/contact-editor/e-contact-editor.c : Prompt-resize dialog
-	options changed. Three options given now, "Resize", "Use as it is"
-	and "Do not save".
+	* gui/widgets/e-minicard.c: Fixed #358249
 
 2006-10-01  Kjartan Maraas  <kmaraas@gnome.org>
 
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 964d37804e..237514a4a3 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -173,7 +173,7 @@ eab_selection_clear_event(GtkWidget *widget, GdkEventSelection *event, EABContac
 static EPopupItem eab_uri_popups[] = {
 	{ E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
         { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO },
-        { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, NULL, EAB_POPUP_URI_MAILTO}, 
+        { E_POPUP_ITEM, "15.send", N_("_Send New Message To ..."), eab_uri_popup_address_send, NULL, NULL, EAB_POPUP_URI_MAILTO}, 
 	{ E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "gtk-copy", EAB_POPUP_URI_MAILTO},
         };
 
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d235e04709..90fab85952 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,22 +1,3 @@
-2006-11-20  Carlos Garcia Campos  <carlosgc@gnome.org>
-	
-	Fixes bug #367183
-	* gui/e-cal-model.c: (e_cal_model_set_instance_times): Make end_time a
-	valid date for all day events when ical file doesn't provide neither
-	DTEND nor DURATION for such events. 
-
-2006-11-15  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/gnome-cal.c: (client_cal_opened_cb),
-	(default_client_cal_opened_cb): Diplay a warning
-	if calendar fails to open.
-
-2006-11-14  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/gnome-cal.c: (gnome_calendar_destroy):
-	Disconnect signal handlers before gcal is destroyed.
-	Fixes #208959 (bugzilla.novell.com).
-
 2006-11-07  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	* gui/alarm-notify/alarm-notify.c: (list_changed_cb),
@@ -30,7 +11,7 @@
 	Committing for Ben Gamari <bgamari@gmail.com>
 
 	* recurrence-page.c: Correct recurrence editor default behavior.
-	Fixes #354875 
+	Fixes #354875
 
 2006-10-16  Kjartan Maraas  <kmaraas@gnome.org>
 
@@ -95,36 +76,16 @@
 	* gui/tasks-component.c: (set_info):
 	GString fixes.
 
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
+2006-10-16  Srinivasa Ragavan  <sragavan@novell.com>
 
-	** Fixes bug #347768
-	
-	* gui/dialogs/memo-page.glade : Label changed from "_Memo Content"
-	to "_Description".
-
-2006-10-16 Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #329696
-	* gui/e-itip-control.c : (show_current_event),(show_current_todo):
-	String change to make it more clear.
-
-2006-10-16  Harish Krishnaswamy  <kharish@novell.com>
+	** Fix for bug #333224 
 
 	* gui/e-day-view.c: (e_day_view_init),
 	(e_day_view_on_top_canvas_button_press),
 	(e_day_view_on_main_canvas_button_press),
 	(e_day_view_on_long_event_button_press),
 	(e_day_view_on_event_button_press),
-	(e_day_view_on_text_item_event): Disable tooltips
-	on drag, resize and edit. Fixes #333224. Patch 
-	submitted by Srinivasa Ragavan.
-
-2006-10-14  Matthew Barnes  <mbarnes@redhat.com>
-
-	Fixes bug #352546
-
-	* gui/dialogs/event-page.c: (init_widgets) Fix typo in a
-	translated string ("appointement").
+	(e_day_view_on_text_item_event): Dont show tooltip on edit/resize/DnD.
 
 2006-10-03  Francisco Javier F. Serrador  <serrador@openshine.com>
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 4d419b317d..1318890386 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2939,7 +2939,7 @@ init_widgets (EventPage *epage)
 		
 	case CAL_MINUTES:
 		if (priv->alarm_interval != 15) {
-			menu_label = g_strdup_printf (ngettext("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
+			menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
 		} 
 		break;
 	}
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 6b47fb96e1..0797144c3e 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -2105,16 +2105,7 @@ e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezon
 	start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
 	end_time = icalcomponent_get_dtend (comp_data->icalcomp);
 
-	if (icaltime_is_null_time (end_time)) {
-		/* If end_time is null and it's an all day event,
-		 * just make start_time = end_time so that end_time
-		 * will be a valid date
-		 */
-		end_time = start_time;
-		icaltime_adjust (&end_time, 1, 0, 0, 0);
-		icalcomponent_set_dtend (comp_data->icalcomp, end_time);
-	} else if (start_time.is_date && end_time.is_date &&
-		   (icaltime_compare_date_only (start_time, end_time) == 0)) {
+	if (start_time.is_date && end_time.is_date && (icaltime_compare_date_only (start_time, end_time) == 0)) {
 		/* If both DTSTART and DTEND are DATE values, and they are the
 		   same day, we add 1 day to DTEND. This means that most
 		   events created with the old Evolution behavior will still
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 5b80084fc2..f0f240c172 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1719,7 +1719,6 @@ gnome_calendar_destroy (GtkObject *object)
 	GnomeCalendar *gcal;
 	GnomeCalendarPrivate *priv;
 	gchar *filename;
-	ECalModel *cal_model;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (GNOME_IS_CALENDAR (object));
@@ -1775,7 +1774,7 @@ gnome_calendar_destroy (GtkObject *object)
 			calendar_config_remove_notification (GPOINTER_TO_UINT (l->data));
 		g_list_free (priv->notifications);
 		priv->notifications = NULL;
-	
+		
 		/* Save the TaskPad layout. */
 		filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
 					     "TaskPad", NULL);
@@ -1848,24 +1847,6 @@ gnome_calendar_destroy (GtkObject *object)
 			g_object_unref (priv->memopad_menu);
 			priv->memopad_menu = NULL;
 		}
-		/* Disconnect all handlers */
-		cal_model = e_calendar_view_get_model ((ECalendarView *)priv->week_view);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_progress_cb), gcal);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_done_cb), gcal);
-
-		cal_model = e_calendar_table_get_model ((ECalendarTable *) priv->todo);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_progress_cb), gcal);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_done_cb), gcal);
-
-		cal_model = e_memo_table_get_model ((EMemoTable *)priv->memo);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_progress_cb), gcal);
-		g_signal_handlers_disconnect_by_func (cal_model,
-				G_CALLBACK (view_done_cb), gcal);
 
 		g_free (priv);
 		gcal->priv = NULL;
@@ -2587,8 +2568,6 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
 		g_object_unref (source);
 
-		g_warning ("Unable to load the calendar %s \n", e_cal_get_error_message (status));
-
 		return;
 	}
 
@@ -2691,8 +2670,6 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[SOURCE_REMOVED], source_type, source);
 		g_object_unref (source);
 
-		g_warning ("Unable to load the calendar %s \n", e_cal_get_error_message (status));
-
 		return;
 	}
 
diff --git a/configure.in b/configure.in
index f572a2fc7f..692121f080 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 2.9.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.8.2, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 
 # Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
@@ -27,7 +27,7 @@ dnl This is for api/versioning tracking for things like bonobo .server files
 dnl
 dnl This should always be the major/minor of the stable version or stable version to be
 dnl *************************************************************************************************
-BASE_VERSION=2.10
+BASE_VERSION=2.8
 AC_SUBST(BASE_VERSION)
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", [Base version (Major.Minor)])
 
@@ -49,7 +49,7 @@ dnl The controls whether things like the development warning in shell/main.c are
 dnl
 dnl This should be set to 0 for stable releases and 1 for unstable releases
 dnl *************************************************************************************************
-AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not])
+AC_DEFINE(DEVELOPMENT, 0, [If we are in development mode or not])
 AC_SUBST(DEVELOPMENT)
 
 AC_ISC_POSIX
@@ -1473,7 +1473,7 @@ plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter
 plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
 all_plugins_base="$plugins_base_always sa-junk-plugin exchange-operations mono"
 
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments prefer-plain"  
 plugins_standard="$plugins_standard_always"
 all_plugins_standard="$plugins_standard"
 
@@ -1704,7 +1704,6 @@ help/C/Makefile
 help/quickref/Makefile
 help/quickref/C/Makefile
 help/quickref/de/Makefile
-help/quickref/es/Makefile
 shell/Makefile
 shell/evolution-nognome
 ui/Makefile
@@ -1736,7 +1735,6 @@ mail/Makefile
 mail/default/Makefile
 mail/default/C/Makefile
 mail/default/de/Makefile
-mail/default/es/Makefile
 mail/default/fi/Makefile
 mail/default/fr/Makefile
 mail/default/lt/Makefile
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 00faba7090..a0e1bf8f38 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-20  Harish Krishnaswamy  <kharish@novell.com>
+
+	* e-icon-factory.c: (load_icon), (e_icon_factory_get_icon):
+	Remove unreachable code and fix the leak of basename.
+
 2006-09-18  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #352450
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 2a5cfb35f5..5471b5adab 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -124,6 +124,7 @@ load_icon (const char *icon_key, const char *icon_name, int size, int scale)
 							     dent,
 							     basename,
 							     NULL);
+				g_free (basename);
 				if ((unscaled = gdk_pixbuf_new_from_file (filename, NULL)))
 					break;
 			}
@@ -308,18 +309,8 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size)
 	pthread_mutex_lock (&lock);
 	
 	if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) {
-		if (!(icon = load_icon (icon_key, icon_name, size, TRUE))) {
-			g_warning ("Icon not found -- %s", icon_name);
-			
-			/* Create an empty icon so that we don't keep spitting
-			   out the same warning over and over, every time this
-			   icon is requested.  */
-			
-			icon = icon_new (icon_key, NULL);
-			g_hash_table_insert (name_to_icon, icon->name, icon);
-		} else {
-			g_hash_table_insert (name_to_icon, icon->name, icon);
-		}
+		icon = load_icon (icon_key, icon_name, size, TRUE);
+		g_hash_table_insert (name_to_icon, icon->name, icon);
 	}
 	
 	if ((pixbuf = icon->pixbuf)) {
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/mail/ChangeLog b/mail/ChangeLog
index df767f0f9a..7bf6125948 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,19 +1,14 @@
-2006-11-09  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-11-20  Veerapuram Varadhan  <vvaradhan@novell.com>
 
-	* default/Makefile.am: Added "es" to SUBDIRS
-	
-2006-11-09  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* default/es/Inbox: Added Spanish welcome mail.
-	* default/es/Makefile.am: Added Makefile
-
-2006-11-09  Sankar P  <psankar@novell.com>
-
-	* em-folder-browser.c: (emfb_view_hide_selected):
-	* em-folder-view.c: (emfv_popup_delete):
-	* mail.error.xml:
-	Disable mail delete for proxy when there are not enough rights
+	Fix for bnc #208396
 
+	* em-folder-tree.c (em_folder_tree_get_selected_folder_info): Do
+	not make camel calls, instead fetch the information from the tree
+	itself.
+	(emft_popup_new_folder): Free the CamelFolderInfo structure.
+	* em-folder-utils.c (emfu_copy_folder_selected): Free the
+	CamelFolderInfo structure.
+	
 2006-10-16  Tor Lillqvist  <tml@novell.com>
 
 	Fix for #348212:
@@ -31,18 +26,6 @@
 	* mail-component.c (create_local_item_cb): Fix memory leak.
 	Fixes bug #360815.
 
-2005-10-16  Sankar P  <psankar@novell.com>
-
-	* mail-ops.c: (em_filter_folder_element_describe)
-	Changes the string displayed in the status bar.
-	Fixes #320615
-
-2006-10-16  Ushveen Kaur <kushveen@novell.com>
-
-	** Fixes bug #308276
-
-	* mail.error.xml : secondary for "vfolder-notunique" corrected.
-
 2006-10-16  Srinivasa Ragavan  <sragavan@novell.com>
 	
 	** Fix for bug #333864 and bug #351374 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 234510f6cf..fca9a38c92 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1984,6 +1984,7 @@ emft_popup_new_folder (EPopup *ep, EPopupItem *pitem, void *data)
 
 	if ((fi = em_folder_tree_get_selected_folder_info (emft)) != NULL) {
 		em_folder_utils_create_folder(fi);
+		camel_folder_info_free(fi);
 	}
 }
 
@@ -2329,7 +2330,7 @@ em_folder_tree_get_selected_folder_info (EMFolderTree *emft)
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	char *full_name = NULL;
+	char *full_name = NULL, *name = NULL, *uri = NULL;
 	CamelException ex;
 	CamelStore *store = NULL;
 	CamelFolderInfo *fi = NULL;
@@ -2341,12 +2342,29 @@ em_folder_tree_get_selected_folder_info (EMFolderTree *emft)
 	selection = gtk_tree_view_get_selection(emft->priv->treeview);
 	if (gtk_tree_selection_get_selected(selection, &model, &iter))
 		gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
-				    COL_STRING_FULL_NAME, &full_name, -1);
+				    COL_STRING_FULL_NAME, &full_name, 
+				    COL_STRING_DISPLAY_NAME, &name, 
+				    COL_STRING_URI, &uri, -1);
 
-	fi = camel_store_get_folder_info (store, full_name, CAMEL_STORE_FOLDER_INFO_FAST, &ex);
+	fi = g_new0(CamelFolderInfo, 1);
+	fi->full_name = g_strdup (full_name);
+	fi->uri = g_strdup (uri);
+	fi->name = g_strdup (name);
 
-	camel_exception_clear (&ex);
+	d(g_print ("em_folder_tree_get_selected_folder_info: fi->full_name=[%s], fi->uri=[%s], fi->name=[%s]\n",
+		   fi->full_name, fi->uri, fi->name));
+	d(g_print ("em_folder_tree_get_selected_folder_info: full_name=[%s], uri=[%s], name=[%s]\n",
+		   full_name, uri, name));
 
+	if (!fi->full_name)
+		goto done;
+
+	g_free (fi->name);
+        if (!g_ascii_strcasecmp (fi->full_name, "INBOX"))
+                fi->name = g_strdup (_("Inbox"));
+        else
+                fi->name = g_strdup (name);
+ done:
 	return fi;
 }
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index ff5947bcdd..940dfde803 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -321,6 +321,9 @@ fail:
 	if (tostore)
 		camel_object_unref(tostore);
 	camel_exception_clear (&ex);
+
+	/* Free the folder-info structure that was passed through data pointer */
+	camel_folder_info_free(cfd->fi);
 	g_free (cfd);
 }
 
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 41be77e111..ac77b374a5 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,8 +1,9 @@
-2006-10-23  Priit Laes  <amd@store20.com>
-
-	* org-gnome-default-source.eplug.xml: Fixed typo in plugin 
-	description. Fixes bug 363999.
+2006-11-20  Veerapuram Varadhan  <vvaradhan@novell.com>
 
+	* exchange-folder-permission.c
+	(org_gnome_exchange_folder_permissions): Decode folder path - in
+	case if it has any encoded characters.
+	
 2006-08-07  Sushma Rai  <rsushma@novell.com>
 
 	* org-gnome-exchange-operations.error.xml: Corrected a spelling 
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 8760cf8d79..95a99e82c1 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -32,6 +32,7 @@
 #include <e-util/e-dialog-utils.h>
 #include <calendar/gui/e-cal-popup.h>
 #include <libedataserverui/e-source-selector.h>
+#include <camel/camel-url.h>
 #include <mail/em-popup.h>
 #include <mail/em-menu.h>
 #include <libebook/e-book.h>
@@ -43,6 +44,8 @@
 #include "calendar/gui/e-cal-model.h"
 #include "addressbook/gui/widgets/eab-menu.h"
 
+#define d(x) 
+
 static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t);
 void org_gnome_exchange_menu_folder_permissions (EPlugin *ep, EMMenuTargetSelect *target);
@@ -151,8 +154,11 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 	int i = 0, mode;
 	static int first =0;
 	gchar *path = NULL;
+	char *fixed_path = NULL;
 	ExchangeAccount *account = NULL;
 
+	d(g_print ("exchange-folder-permission.c: entry\n"));
+
 	if (!g_strrstr (target->uri, "exchange://"))
 		return;
 
@@ -164,9 +170,16 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target)
 		return;
 
 	path = target->uri + strlen ("exchange://") + strlen (account->account_filename);
+	fixed_path = camel_url_decode_path (path);
+	d(g_print ("exchange-folder-permission.c: path=[%s], fixed_path=[%s]\n", path, fixed_path));
+
 	if (! g_strrstr (target->uri, "exchange://") ||
-		!exchange_account_get_folder (account, path))
+	    !exchange_account_get_folder (account, fixed_path)) {
+		g_free (fixed_path);
 		return ;
+	}
+
+	g_free (fixed_path);
 
 	selected_exchange_folder_uri = path;
 	/* for translation*/
diff --git a/po/ChangeLog b/po/ChangeLog
index ce8dfe1ae8..4f15bfa806 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,23 @@
+2006-11-20  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
+2006-11-19  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2006-11-19  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
 2006-11-19  Priit Laes  <plaes@cvs.gnome.org>
 
 	* et.po: Translation updated by Ivar Smolin.
 
+2006-11-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
+
 2006-11-17  Karsten Bräckelmann  <guenther@rudersport.de>
 
 	* nb.po: Fixed a typo, bug #376337.
@@ -10,21 +26,17 @@
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2006-11-16  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-11-16  Yair Hershkovitz  <yairhr@gmail.com>
 
-	* es.po: Updated Spanish translation.
+	* he.po: Updated Hebrew translation.
 
-2006-11-15  Priit Laes  <plaes@cvs.gnome.org>
-
-	* et.po: Translation updated by Ivar Smolin.
+2006-11-15  Djihed Afifi <djihed@gmail.com> 
 
-2006-11-14  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
+	* ar.po: Updated Arabic Translation.
 
-2006-11-14  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-11-15  Priit Laes  <plaes@cvs.gnome.org>
 
-	* es.po: Updated Spanish translation.
+	* et.po: Translation updated by Ivar Smolin.
 
 2006-11-12  Priit Laes  <plaes@cvs.gnome.org>
 
@@ -32,19 +44,23 @@
 
 2006-11-11  Priit Laes  <plaes@cvs.gnome.org>
 
-	* et.po: Translation updated by Ivar Smolin.
+	* et.po: Translation updated.
 
-2006-11-10  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-11-10  Djihed Afifi <djihed@gmail.com> 
 
-	* es.po: Updated Spanish translation.
+	* ar.po: Updated Arabic Translation.
 
-2006-11-08  Priit Laes  <plaes@cvs.gnome.org>
+2006-11-09  Pema Geyleg  <pgeyleg@gmail.com>
 
-	* et.po: Translation updated by Ivar Smolin.
+	* dz.po: Updated Dzongkha Translation
+
+2006-11-6  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
 
 2006-11-06  Christophe Merlet  <redfox@redfoxcenter.org>
 
-	* fr.po: Updated French translation and fixed #370232.
+	* fr.po: Updated French translation and closed #370232.
 
 2006-11-04  Alexander Shopov  <ash@contact.bg>
 
@@ -53,39 +69,55 @@
 
 2006-11-02  Francisco Javier F. Serrador  <serrador@openshine.com>
 
-	* es.po: Updated Spanish translation.
+	* es.po: Updated Spansih translation.
 
-2006-11-01  Priit Laes  <plaes@cvs.gnome.org>
+2006-11-03  Satoru SATOH <ss@gnome.gr.jp> 
 
-	* et.po: Translation updated by Ivar Smolin.
+	* ja.po: Fixed wrong plural header.
+
+2006-10-30  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po Updated Arabic Translation.
 
 2006-10-28  Priit Laes  <plaes@cvs.gnome.org>
 
-	* et.po: Translation updated by Ivar Smolin.
+	* et.po: Translation updated.
 
-2006-10-26  Ilkka Tuohela  <hile@iki.fi>
+2006-10-26  Luca Ferretti  <elle.uca@libero.it>
 
-	* fi.po: Updated Finnish translation.
+	* it.po: Updated Italian translation.
 
-2006-10-24  Priit Laes  <plaes@cvs.gnome.org>
+2006-10-25  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
-	* et.po: Translation updated by Ivar Smolin.
+	* gl.po: Updated Galician Translation.
 
-2006-10-24  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-10-24  Wouter Bolsterlee  <wbolster@cvs.gnome.org>
 
-	* es.po: Updated Spanish translation.
+	* nl.po: Dutch translation updated by Wouter Bolsterlee.
+
+2006-10-22  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated.
+
+2006-10-22  David Lodge <dave@cirt.net>
+
+	* en_GB.po: Updated English (British) translation
 
 2006-10-22  Christophe Merlet  <redfox@redfoxcenter.org>
 
-	* fr.po: Updated French translation.
+	* fr.po: Updated French translation and closed #339097.
 
-2006-10-21  Priit Laes  <plaes@cvs.gnome.org>
+2006-10-21  Clytie Siddall <clytie@riverland.net.au>
 
-	* et.po: Translation updated.
+	* vi.po: Updated Vietnamese translation.
 
-2006-10-20  Pawan Chitrakar  <pchitrakar@gmail.com>
+2006-10-20  Daniel Nylander <po@danielnylander.se>
 
-	* ne.po: Updated Nepali Translation
+	* sv.po: Updated Swedish translation.
+
+2006-10-20  Francisco Javier F. Serrador  <serrador@openshine.com>
+
+	* es.po: Updated Spanish translation.
 
 2006-10-20  Gabor Kelemen  <kelemeng@gnome.hu>
 
@@ -107,51 +139,34 @@
 
 	* et.po: Translation updated by Ivar Smolin.
 
-2006-10-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
+2006-10-17  Clytie Siddall <clytie@riverland.net.au>
 
-2006-10-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* POTFILES.in: Add two files here.
-	* nb.po: Update the translation.
+	* vi.po: Updated Vietnamese translation.
 
-2006-10-15  Priit Laes  <plaes@cvs.gnome.org>
+2006-10-17  Ankit Patel  <ankit644@yahoo.com>
 
-	* et.po: Translation updated by Ivar Smolin.
-
-2006-10-15  Jovan Naumovski  <jovan@lugola.net>
-	
-	* mk.po: Updated Macedonian translation.
+	* gu.po: Updated Gujarati Translation.
 
-2006-10-15  Ilkka Tuohela  <hile@iki.fi>
+2006-10-17  Ilkka Tuohela  <hile@iki.fi>
 
 	* fi.po: Updated Finnish translation.
 
-2006-10-15  Francisco Javier F. Serrador  <serrador@openshine.com>
-
-	* es.po: Updated Spanish translation.
-
-2006-10-15  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
+2006-10-17  Jovan Naumovski  <jovan@lugola.net>
 
-2006-10-14  Johan Dahlin  <jdahlin@async.com.br>
+	* mk.po: Updated Macedonian translation.
 
-	* sv.po: Updated swedish translation
+2006-10-16  Luca Ferretti  <elle.uca@libero.it>
 
-2006-10-15  Satoru SATOH <ss@gnome.gr.jp>
+	* it.po: Updated Italian translation.
 
-	* ja.po: Fixed plurals-related problem.
+2006-10-16  Kjartan Maraas  <kmaraas@gnome.org>
 
-2006-10-14  Priit Laes  <plaes@cvs.gnome.org>
+	* POTFILES.in: Add two missing files.
+	* nb.po: Updated Norwegian bokmål translation.
 
-	* et.po: Translation updated by Ivar Smolin.
- 
-2006-10-13  Alexander Shopov  <ash@contact.bg>
+2006-10-16  Luca Ferretti  <elle.uca@libero.it>
 
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
+	* it.po: Updated Italian translation.
 
 2006-10-11  Luca Ferretti  <elle.uca@libero.it>
 
diff --git a/po/ar.po b/po/ar.po
index cf4dd89ab5..19be223738 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,168 +1,168 @@
-# translation of evolution.po to Arabic
-# translation of evolution-1.5.po to Arabic
+# translation of evolution.gnome-2-16.po to Arabic
 # Arabic translation of PACKAGE.
 # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+#
 # Arafat Medini <lumina@silverpen.de>, 2003.
 # Ossama Khayat <okhayat@yahoo.com>, 2003.
 # Ossama M. Khayat <okhayat@yahoo.com>, 2004.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
-#
+# Khaled Hosny <khaledhosny@eglug.org>, 2006.
+# Djihed Afifi <djihed@gmail.com, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution\n"
+"Project-Id-Version: evolution.gnome-2-16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
-"PO-Revision-Date: 2004-06-20 13:25+0200\n"
-"Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
+"POT-Creation-Date: 2006-11-17 08:31+0000\n"
+"PO-Revision-Date: 2006-11-15 06:04+0100\n"
+"Last-Translator: Djihed Afifi <djihed@gmail.com>\n"
+"Language-Team: Arabic <support@eglug.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
+"3\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
-#, fuzzy
+#: ../a11y/addressbook/ea-minicard-view.c:180
 msgid "evolution addressbook"
-msgstr "دفتر عناوين إيفُليوشِن"
+msgstr "دفتر عناوين إيفوليوشن"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact"
 msgstr "مراسَل جديد"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:232
 msgid "New Contact List"
 msgstr "قائمة مراسَلين جديدة"
 
-#: ../a11y/addressbook/ea-minicard-view.c:152
+#: ../a11y/addressbook/ea-minicard-view.c:163
 #, fuzzy, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "سرد مجلّدات دفتر العناوين المحلي"
 msgstr[1] "سرد مجلّدات دفتر العناوين المحلي"
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "فتح"
 
 #: ../a11y/addressbook/ea-minicard.c:141
-#, fuzzy
 msgid "Contact List: "
-msgstr "_قائمة مراسَلين"
+msgstr "قائمة المراسَلين:"
 
 #: ../a11y/addressbook/ea-minicard.c:142
-#, fuzzy
 msgid "Contact: "
-msgstr "المراسَلون: "
+msgstr "مراسَل:"
 
 #: ../a11y/addressbook/ea-minicard.c:168
-#, fuzzy
 msgid "evolution minicard"
-msgstr "تنبيه إيفُليوشِن"
+msgstr "بطاقة إيفُليوشِن"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
-msgstr ""
+msgstr "له منبّهات."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
-msgstr "_دون تكرار"
+msgstr "له إعادات."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
-msgstr ""
+msgstr "هو اجتماع."
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-cal-view-event.c:278
+#, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "أحداث الرُّزنامة"
+msgstr "حدث رزنامة، ملخّص: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
-msgstr "أحداث الرُّزنامة"
+msgstr "حدث رزنامة: ل"
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
-msgstr "أحداث الرُّزنامة"
+msgstr "مظهر أحداث الأشهر"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:529
 msgid "Grab Focus"
-msgstr "له تركيز"
+msgstr "أخذ تركيز"
 
-#: ../a11y/calendar/ea-cal-view.c:306
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "موعد جديد"
 
-#: ../a11y/calendar/ea-cal-view.c:307
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
-msgstr "_حدث جديد يستغرق يوماً كاملاً"
+msgstr "حدث جديد يستغرق يوماً كاملاً"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "إجتماع جديد"
 
-#: ../a11y/calendar/ea-cal-view.c:309
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
-msgstr "إذهب إلى ال_يوم"
+msgstr "اذهب إلى صفحة اليوم"
 
-#: ../a11y/calendar/ea-cal-view.c:310
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
-msgstr "إذهب إلى ال_تاريخ"
+msgstr "اذهب إلى التاريخ"
 
 #: ../a11y/calendar/ea-day-view-main-item.c:299
 #: ../a11y/calendar/ea-week-view-main-item.c:301
-#, fuzzy
 msgid "a table to view and select the current time range"
-msgstr "زمن نسبيّ للوقت الحالي"
+msgstr "جدول لعرض و اختيار المجال الزمني"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+msgstr[0] "له %d حدث."
+msgstr[1] "له %d حدث."
+msgstr[2] "له %d حدث."
+msgstr[3] "له %d حدث."
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
-msgstr ""
+msgstr "ليس له أحداث."
 
-#: ../a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "مشهد أسبوع العمل"
+msgstr "مشهد أسبوع العمل: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "مشهد اليوم"
+msgstr "مشهد اليوم: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
-#, fuzzy
+#: ../a11y/calendar/ea-day-view.c:199
 msgid "calendar view for a work week"
-msgstr "معلومات الرزنامة"
+msgstr "مظهر الرزنامة لاسبوع عمل"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:201
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "مظهر الرزنامة ليوم أو أكثر"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:707
 msgid "%A %d %b %Y"
-msgstr "%a %d %b %Y"
+msgstr "%A %d %b %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -170,122 +170,123 @@ msgstr "%a %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:710
+#: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/e-week-view-main-item.c:319
+#: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:712
+#: ../calendar/gui/calendar-component.c:717
+#: ../calendar/gui/calendar-component.c:719
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:744
+#: ../calendar/gui/calendar-component.c:746
 msgid "%d %b %Y"
-msgstr "%d %B %Y"
+msgstr "%d %b %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d·%b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../a11y/calendar/ea-gnome-calendar.c:248
+#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "رزنامة جنوم"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "search bar"
-msgstr "قاعدة ال_بحث:"
+msgstr "شريط البحث"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:292
 msgid "evolution calendar search bar"
-msgstr "عارض رُزنامة إيفُليوشِن"
+msgstr "عمود البحث لرُزنامة إيفُليوشِن"
 
 #: ../a11y/calendar/ea-jump-button.c:149
-#, fuzzy
 msgid "Jump button"
-msgstr "رسم الزّر"
+msgstr "زر القفز"
 
 #: ../a11y/calendar/ea-jump-button.c:158
-#, fuzzy
 msgid "Click here, you can find more events."
-msgstr "أُنقر هنا لإضافة حاضر"
+msgstr "أُنقر هنا لإيجاد أحداث أخرى."
 
-#: ../a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "مشهد الشّهر"
+msgstr "مشهد الشّهر: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "مشهد الأسبوع"
+msgstr "مشهد الأسبوع: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
-#, fuzzy
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
-msgstr "معلومات الرزنامة"
+msgstr "مظهر الرزنامة لشهر"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+#, fuzzy
 msgid "popup"
-msgstr ""
+msgstr "نوافذ قافزة"
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#, fuzzy
 msgid "popup a child"
-msgstr ""
+msgstr "اذهب إلى الابن"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:612
 #, fuzzy
 msgid "edit"
-msgstr "تحرير"
+msgstr "_تحرير"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:613
 msgid "begin editing this cell"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+#, fuzzy
 msgid "toggle"
-msgstr ""
+msgstr "تحول"
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+#, fuzzy
 msgid "toggle the cell"
-msgstr ""
+msgstr "اتساع أسطر الخلية"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
-#, fuzzy
 msgid "expand"
-msgstr "_شطب"
+msgstr "تمديد"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
 msgid "expands the row in the ETree containing this cell"
@@ -293,32 +294,29 @@ msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
 msgid "collapse"
-msgstr ""
+msgstr "إنهيار"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
 msgid "collapses the row in the ETree containing this cell"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell.c:107
-#, fuzzy
 msgid "Table Cell"
-msgstr "جدول"
+msgstr "خلية جدول"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
-#, fuzzy
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
-msgstr "استخدم النّقر للإضافة"
+msgstr "انقر للإضافة"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
-msgstr ""
+msgstr "انقر"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
-#, fuzzy
 msgid "sort"
-msgstr "بعثرة"
+msgstr "رتّب"
 
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
@@ -328,26 +326,34 @@ msgstr "%d %B %Y"
 #: ../a11y/widgets/ea-calendar-item.c:304
 #, fuzzy, c-format
 msgid "Calendar: from %s to %s"
-msgstr "معلومات الرُّزنامة"
+msgstr "الإشتراك في رزنامة"
 
 #: ../a11y/widgets/ea-calendar-item.c:339
 #, fuzzy
 msgid "evolution calendar item"
-msgstr "عارض رُزنامة إيفُليوشِن"
+msgstr "مكوّن رُزنامة إيفُليوشِن"
 
 #: ../a11y/widgets/ea-combo-button.c:40
 #, fuzzy
 msgid "Combo Button"
-msgstr "المنافسة"
+msgstr "رسم الزّر"
 
 #: ../a11y/widgets/ea-combo-button.c:50
-#, fuzzy
 msgid "Activate Default"
-msgstr "الإفتراض"
+msgstr "تنشيط الإفتراض"
 
 #: ../a11y/widgets/ea-combo-button.c:52
 msgid "Popup Menu"
-msgstr ""
+msgstr "قائمة منبثقة"
+
+#: ../a11y/widgets/ea-expander.c:40
+#, fuzzy
+msgid "Toggle Attachment Bar"
+msgstr "شريط قوائم مخصّص"
+
+#: ../a11y/widgets/ea-expander.c:50
+msgid "activate"
+msgstr "تنشيط"
 
 #: ../addressbook/addressbook.error.xml.h:1
 #, fuzzy
@@ -361,12 +367,12 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:2
 #, fuzzy
 msgid "Address '{0}' already exists."
-msgstr "المجلّد موجود أصلاً"
+msgstr "الشهادة موجودة مسبقا."
 
 #: ../addressbook/addressbook.error.xml.h:3
 #, fuzzy
 msgid "Cannot move contact."
-msgstr "و مراسَل آخر."
+msgstr "نقل المراسَل إلى"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Category editor not available."
@@ -390,158 +396,178 @@ msgid "Could not remove addressbook."
 msgstr "لم يمكن تحميل دفتر العناوين"
 
 #: ../addressbook/addressbook.error.xml.h:8
-#, fuzzy
-msgid "Delete address book '{0}'?"
-msgstr "إنتقاء مراسَلين من دفتر العناوين"
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:9
-#, fuzzy
-msgid "Error loading addressbook."
-msgstr "خطأ عند تحميل دفتر العناوين الإفتراضي."
+msgid "Delete address book '{0}'?"
+msgstr "حذف دفتر العناوين '{0}'؟"
 
 #: ../addressbook/addressbook.error.xml.h:10
-#, fuzzy
-msgid "Error saving {0} to {1}: {2}"
-msgstr "خطأ أثناء إضافة المراسَل"
+msgid "Error loading addressbook."
+msgstr "خطأ عند تحميل دفتر العناوين."
 
 #: ../addressbook/addressbook.error.xml.h:11
+msgid "Error saving {0} to {1}: {2}"
+msgstr "خطأ حفظ {0} ل {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:12
 #, fuzzy
 msgid "Failed to authenticate with LDAP server."
-msgstr "فشل التّوثيق مع نادل LDAP"
+msgstr "فشل التّوثيق مع خادم POP %s: %s"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+msgid "Failed to delete contact"
+msgstr "فشل حذف المرَاسل"
+
+#: ../addressbook/addressbook.error.xml.h:14
+#, fuzzy
+msgid "GroupWise Address book creation:"
+msgstr "حجم نافذة دفتر العناوين"
+
+#: ../addressbook/addressbook.error.xml.h:15
 #, fuzzy
 msgid "LDAP server did not respond with valid schema information."
 msgstr "لم يستجب النّادل بمعلومات مخطّط سليمة"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:16
+#, fuzzy
+msgid "Permission Denied."
+msgstr "رُفض التّصريح"
+
+#: ../addressbook/addressbook.error.xml.h:17
 #, fuzzy
 msgid "Server Version"
-msgstr "النّسخة"
+msgstr "اصدارة الرزمة"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:19
 #, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "عارض عناوين دفتر عناوين إيفُليوشِن"
+msgstr "توقف جسم الشريط بصورة غير متوقعة"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:22
 #, fuzzy
 msgid "This address book will be removed permanently."
 msgstr "لم يمكن إرسال العنصر!\n"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:23
 #, fuzzy
 msgid "This addressbook could not be opened."
-msgstr "لم يمكن إرسال العنصر!\n"
+msgstr "لم يمكن السّؤال عن هذا القرص المدمج: %s\n"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:24
 #, fuzzy
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "إستجاب النّادل دون دعم لأي قواعد بحث"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:26
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information."
 msgstr "لا يدعم هذا النّادل معلومات مخطّط LDAPv3"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
 msgstr "لم يمكن فتح دفتر العناوين"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:28
 #, fuzzy
 msgid "Unable to perform search."
-msgstr "لم يمكن معالجة مجلّد البكرة"
+msgstr "%3d%% متبقية للبحث"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:29
 #, fuzzy
 msgid "Unable to save {0}."
-msgstr "لم يمكن ترجمة محتويات الرّسالة"
+msgstr "لا يمكن تحميل·'%s':·%s"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:30
 #, fuzzy
 msgid "Would you like to save your changes?"
 msgstr "هل تريد حفظ التّغييرات؟"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "إ_ضافة"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "_Discard"
 msgstr "_نبذ"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
-msgstr ""
+msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "عنوان التّزامن الإفتراضي:"
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr "لم يمكن تحميل دفتر العناوين"
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr "لم يمكن قراءة قالب تطبيقات العناوين للحاسوب اليدوي"
 
@@ -561,34 +587,40 @@ msgstr "الشّهادات"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #, fuzzy
 msgid "Configure autocomplete here"
-msgstr "إعداد التّكملة التّلقائية هنا"
+msgstr "إعداد حساباتك البريديّة هنا"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "المراسَلون"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "دفتر عناوين إيفُليوشِن"
+#, fuzzy
+msgid "Evolution Address Book"
+msgstr "بريد (دفتر العناوين)"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+#, fuzzy
+msgid "Evolution Address Book address pop-up"
 msgstr "نافذة منبثقة لعناوين دفتر عناوين إيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "عارض عناوين دفتر عناوين إيفُليوشِن"
+#, fuzzy
+msgid "Evolution Address Book address viewer"
+msgstr "حجم نافذة دفتر العناوين"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+#, fuzzy
+msgid "Evolution Address Book card viewer"
 msgstr "عارض بطاقات دفتر عناوين إيفُليوشِن"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "مكوّن دفتر عناوين إيفُليوشِن"
+#, fuzzy
+msgid "Evolution Address Book component"
+msgstr "حجم نافذة دفتر العناوين"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
@@ -605,12 +637,14 @@ msgstr "أدر شهادات S/Mime هنا"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:139
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:231
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "على هذا الحاسوب"
 
@@ -619,144 +653,150 @@ msgstr "على هذا الحاسوب"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:147
+#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../calendar/gui/calendar-component.c:241
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "شخصي"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
-msgstr "على نوادل LDAP"
+msgstr "على خوادم LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "_Contact"
 msgstr "_مراسَل"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact"
 msgstr "إنشاء مراسَل جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "Contact _List"
 msgstr "_قائمة مراسَلين"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Create a new contact list"
 msgstr "إنشاء قائمة مراسَلين جديدة"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-config.c:1205
 #, fuzzy
 msgid "New Address Book"
 msgstr "دفتر عناوين جديد"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:241
 #, fuzzy
 msgid "Address _Book"
-msgstr "العنوان ال_ثّاني:"
+msgstr "دفتر الع_ناوين"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:242
 #, fuzzy
 msgid "Create a new address book"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "حجم نافذة دفتر العناوين"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:405
+msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:332
 #, fuzzy
 msgid "Base"
-msgstr "أساسي"
+msgstr "أساس DN:"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Type:"
-msgstr "النّوع:"
+msgstr "ال_نوع:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
+#: ../plugins/itip-formatter/itip-formatter.c:2051
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "عام"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
+#: ../mail/importers/pine-importer.c:392
+#, fuzzy
+msgid "Address Book"
 msgstr "دفتر العناوين"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:989
 #, fuzzy
 msgid "Server Information"
-msgstr "الخطوة الثّانية: معلومات عن النّادل"
+msgstr "المعلومات التي سترسل للخادم"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:991
 #, fuzzy
 msgid "Authentication"
-msgstr "توثّق SMTP"
+msgstr "توثق"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "تفاصيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../mail/em-folder-browser.c:854
 #, fuzzy
 msgid "Searching"
-msgstr "بحث"
+msgstr "جاري البحث..."
 
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:997
 #, fuzzy
 msgid "Downloading"
-msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
+msgstr "تنزيل"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Address Book Properties"
-msgstr "مصادر دفاتر العناوين"
+msgstr "بريد (دفتر العناوين)"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
 msgid "Migrating..."
 msgstr "جاري التنزيح..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
 #, c-format
 msgid "Migrating `%s':"
 msgstr "جاري تنزيح `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 #, fuzzy
 msgid "LDAP Servers"
-msgstr "على نوادل LDAP"
+msgstr "على خوادم LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 #, fuzzy
 msgid "Autocompletion Settings"
-msgstr "التّكملة التّلقائية"
+msgstr "اختر الإعدادات"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
@@ -768,7 +808,7 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -779,7 +819,7 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -790,7 +830,7 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -801,37 +841,75 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "حذف"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "إعادة تسمية المجلّد"
+
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+#, fuzzy
+msgid "Folder names cannot contain '/'"
+msgstr "لا·يمكن·أن·يحتوي·إسم·المجلّد·الرمز \"/\"."
 
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "خصائص..."
+#: ../addressbook/gui/component/addressbook-view.c:445
+#, fuzzy
+msgid "A Folder with this name already exists"
+msgstr "الشّهادة موجودة أصلاً"
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../addressbook/gui/component/addressbook-view.c:956
+#, fuzzy
+msgid "_New Address Book"
+msgstr "دفتر عناوين جديد"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:986
+#: ../calendar/gui/calendar-component.c:584
+#: ../calendar/gui/e-calendar-table.c:1302
+#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1126
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_حذف"
+
+#: ../addressbook/gui/component/addressbook-view.c:959
+#, fuzzy
+msgid "Save As Vcard..."
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
+
+#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../calendar/gui/calendar-component.c:585
+#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+#, fuzzy
+msgid "_Properties..."
+msgstr "_خاصيات"
+
+#: ../addressbook/gui/component/addressbook-view.c:1343
 #, fuzzy
 msgid "Contact Source Selector"
-msgstr "لم يتم اختيار أي نادل"
+msgstr "منتقي نظم الوسائط المتعدّدة"
 
 #: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
-msgstr "النّفاذ إلى نادل LDAP كشخص مجهول"
+msgstr "النّفاذ إلى خادم LDAP كشخص مجهول"
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:501
 msgid "Failed to authenticate.\n"
 msgstr "فشل التّوثيق.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:481
 #, fuzzy, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
@@ -839,7 +917,7 @@ msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 #, fuzzy
 msgid "Autocomplete length"
-msgstr "التّكملة التّلقائية"
+msgstr "عتبة الطّول"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 #, fuzzy
@@ -881,201 +959,223 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "عنوان آخر دليل استُخدم في حوار إنتقاء الأسماء"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 #, fuzzy
 msgid "Vertical pane position"
-msgstr "الموقع الجغرافي"
+msgstr "GtkAdjustment للموقع العمودي"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 #, fuzzy
 msgid "Whether to show the preview pane."
-msgstr "إظهار لوح \"المعاينة\"."
+msgstr "فبما إذا يعرض القالب التالي مسبقا"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+#, fuzzy
 msgid "5"
-msgstr ""
+msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Authentication</b>"
-msgstr "التّوثّق"
+msgstr "توثق"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Display</b>"
-msgstr "ال_معرض"
+msgstr "الشاشة"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Downloading</b>"
-msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
+msgstr "تنزيل"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Searching</b>"
-msgstr "جاري البحث"
+msgstr "جاري البحث..."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Server Information</b>"
-msgstr "الخطوة الثّانية: معلومات عن النّادل"
+msgstr "المعلومات التي سترسل للخادم"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Type:</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "النّوع:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "Add Address Book"
-msgstr "دفتر العناوين"
+msgstr "أضف دفتر عناوين"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "دائماً"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "كشخص مجهول"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "أساسي"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 #, fuzzy
 msgid "Distinguished name"
-msgstr "إ_سم مميّز:"
+msgstr "بإستخدام الإسم المُميّز (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Email address"
-msgstr "عنوان البريد الإلكتروني:"
+msgstr "عنوان البريد الإلكتروني"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "سوف يستخدم إيفُليوشِن عنوان البريد الإلكتروني هذا لتوثيقك مع النّادل"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Find Possible Search Bases"
-msgstr "قواعد البحث المدعومة"
+msgstr "ايجاد الحدث السابق لجملة البحث"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Lo_gin:"
-msgstr "إسم التسجيل"
+msgstr "Lo-Fi"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "أبداً"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+#, fuzzy
+msgid "No encryption"
+msgstr "التّشفير مطلوب"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "واحد"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
 #, fuzzy
-msgid "Search _base:"
-msgstr "قاعدة ال_بحث:"
+msgid "SSL encryption"
+msgstr "التّشفير مطلوب"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
+msgid "Search Filter"
+msgstr "خطأ أثناء تنفيذ بحث المصفات: %s: %s"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Search _base:"
+msgstr "أساس DN:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search _filter:"
+msgstr "خطأ أثناء تنفيذ بحث المصفات: %s: %s"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Search filter"
+msgstr "خطأ أثناء تنفيذ بحث المصفات: %s: %s"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
-"إنتقاء هذا الخيار يعني أن إيفُليوشِن لن يتصل بنادل LDAP إلّا\n"
-"إذا كان النادل يدعم SSL أو TLS."
+"إنتقاء هذا الخيار يعني أن إيفُليوشِن لن يتصل بخادم LDAP إلّا\n"
+"إذا كان الخادم يدعم SSL أو TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 #, fuzzy
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
-"إنتقاء هذا الخيار يعني أن إيفُليوشِن سوف يحاول إستخدام SSL/TLS فقط إن كنت في\n"
-"بيئة غير آمنة. مثلاً، إذا كان جهازك ونادل LDAP خلف جدار ناري\n"
-"عند العمل، فإن إيفُليوشِن لن يحتاج لاستخدام SSL/TLS لأن إتّصالك آمن أصلاً."
+"إنتقاء هذا الخيار يعني أن إيفُليوشِن لن يتصل بخادم LDAP إلّا\n"
+"إذا كان الخادم يدعم SSL أو TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 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. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
-"إنتقاء هذا الخيار يعني أن نادلك لا يدعم SSL أو TLS.\n"
+"إنتقاء هذا الخيار يعني أن خادمك لا يدعم SSL أو TLS.\n"
 "هذا يعني أن إتّصالك لن يكون آمناً، وأنّك ستكون معرّضاً \n"
 "لمخاطر أمنيَّة."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "فرعي"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "قواعد البحث المدعومة"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+#, fuzzy
+msgid "TLS encryption"
+msgstr "التّشفير مطلوب"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 "قاعدة البحث هي الإسم المميّز (DN) للمدخل الذي تبدأ عنده بحوثك.\n"
 "إن تركت هذا فارغاً، سيبدأ البحث عند جذر شجرة الدّليل."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 #, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
@@ -1087,13 +1187,13 @@ msgstr ""
 "يشمل نطاق البحث \"الفرعي\" كل المدخلات تحت قاعدة بحثك.\n"
 "لن يشمل نطاق البحث \"واحد\" إلا المدخلات الواقعة تحت قاعدتك بمستوىً واحد.\n"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr "هذا هو الإسم الكامل لنادل ldap. مثلا، \"ldap.mycompany.com\"."
+msgstr "هذا هو الإسم الكامل لخادم ldap. مثلا، \"ldap.mycompany.com\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
@@ -1102,7 +1202,7 @@ msgstr ""
 "هذا هو العدد الأقصى للمدخلات لتنزيلها. تحديد هذا العدد برقم\n"
 "كبير جداً سوف يبطئ دفتر عناوينك."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
@@ -1110,9 +1210,9 @@ msgid ""
 "server."
 msgstr ""
 "هذه هي الطّريقة التي سيستخدمها إيفُليوشِن لتوثيقك.  لاحظ أنّ ضبط هذا لـ\"عنوان "
-"بريد الكتروني\" يتطلب نفاذا كشخص مجهول لنادل ldap."
+"بريد الكتروني\" يتطلب نفاذا كشخص مجهول لخادم ldap."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -1121,1494 +1221,1546 @@ msgstr ""
 "هذا هو الإسم لهذا النّادل الذي سيظهر على لائحتك لمجلّدات إيفُليوشِن.\n"
 "إنّه لغرض العرض فقط. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
-"هذا هو المنفذ على نادل LDAP الذي سيحاول إيفُليوشِن الإتّصال به. \n"
+"هذا هو المنفذ على خادم LDAP الذي سيحاول إيفُليوشِن الإتّصال به. \n"
 "تم تجهيز قائمة من المنافذ الإعتيادية. اسأل مدير نظامك\n"
 "عن المنفذ الذي يجب أن تحدّده."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "بإستخدام الإسم المُميّز (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "سيستخدم عنوان البريد الإلكتروني"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "كلّما كان ممكناً"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Add Address Book"
-msgstr "إ_ضافة لدفتر العناوين"
+msgstr "أضف دفتر عناوين"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "حدّ الإ_نزال:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "_Find Possible Search Bases"
-msgstr "قواعد البحث المدعومة"
+msgstr "ايجاد الحدث السابق لجملة البحث"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
 msgid "_Login method:"
-msgstr "طريقة التّس_جيل:"
+msgstr "طريقة NAT"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../mail/mail-config.glade.h:163
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "الإ_سم:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
-msgstr "الأ_ولويّة:"
+msgstr "ال_مَنْفذ:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
 msgid "_Search scope:"
-msgstr "نطاق ال_بحث: "
+msgstr "مجال البحث:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:170
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 #, fuzzy
 msgid "_Server:"
-msgstr "النّا_دل:"
+msgstr "الخادم:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 #, fuzzy
 msgid "_Timeout:"
-msgstr "صيغة الوقت:"
+msgstr "_فترة الإستراحة:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
-msgstr "إ_ستعمال إتصال آمن (SSL):"
+msgstr "ال_اسم المستخدم للاتصال:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "بطاقات"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2054
+#: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "دقائق"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 #, fuzzy
 msgid "<b>Email</b>"
-msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
+msgstr "<b>البريد الإلكتروني</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Home</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "<b>المنزل</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#, fuzzy
 msgid "<b>Instant Messaging</b>"
-msgstr ""
+msgstr "<b>الإتصال الفوري</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 #, fuzzy
 msgid "<b>Job</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "<b>العمل</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 #, fuzzy
 msgid "<b>Miscellaneous</b>"
-msgstr "<b>قيمة الحقل</b>"
+msgstr "تقني متنوع"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 #, fuzzy
 msgid "<b>Other</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "أخرى"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 #, fuzzy
 msgid "<b>Telephone</b>"
-msgstr "<b>خيارات الرُّزنامة</b>"
+msgstr "<b>الهاتف</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#, fuzzy
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "بحث في الويب"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 #, fuzzy
 msgid "<b>Work</b>"
-msgstr "<b>يبدء:</b> "
+msgstr "<b>عمل</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "AIM"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "المراسَل"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "محرّر المراسَلين"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Full _Name..."
 msgstr "الإ_سم الكامل..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Image"
-msgstr "صفحة"
+msgstr "صورة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_رسالة بريديّة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #, fuzzy
 msgid "Mailing Address"
-msgstr "عنوان البريد الالكتروني"
+msgstr "عنوان البريد الإلكتروني"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "الإسم ال_مستعار:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 msgid "Personal Information"
-msgstr "معلومات خياريّة"
+msgstr "المعلومات الشخصية"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Telephone"
-msgstr "<b>خيارات الرُّزنامة</b>"
+msgstr "<b>الهاتف</b>"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:585
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "عمل"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#, fuzzy
+msgid "_Address: "
 msgstr "ال_عنوان:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Anniversary:"
 msgstr "الذكرى ال_سنويّة:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Assistant:"
 msgstr "المساعد"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "_Birthday:"
 msgstr "عيد ال_ميلاد:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1709
 #, fuzzy
 msgid "_Calendar:"
-msgstr "الر_زنامة:"
+msgstr "تقويم: %s"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
-msgid "_Categories"
+msgid "_Categories..."
 msgstr "الفئات"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "_City:"
-msgstr "ال_مدينة:"
+msgstr "المدينة:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "_Company:"
-msgstr "الأمر:"
+msgstr "هاتف الشّركة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Country:"
-msgstr "ال_دّولة:"
+msgstr "كنتري"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "_Department:"
-msgstr "ال_قِسْم:"
+msgstr "المَصْلَحَة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "_File under:"
-msgstr "إسم الملف:"
+msgstr "إنتقاء ملف"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_Free/Busy:"
-msgstr "عنوان _حرّ/مشغول:"
+msgstr "معلومات متوفّر/مشغول"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "_Home Page:"
-msgstr "صفحة الإنترنت الشخصية"
+msgstr "الصفحة الرئيسيّة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Manager:"
-msgstr "المدير"
+msgstr "الم_دير:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 #, fuzzy
 msgid "_Notes:"
-msgstr "م_لاحظات:"
+msgstr "ملاحظات"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "_Office:"
-msgstr "ال_مكتب:"
+msgstr "مكتب"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_صندوق البريد:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #, fuzzy
 msgid "_Profession:"
-msgstr "الم_هنة:"
+msgstr "العمل:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "_Spouse:"
-msgstr "ال_زّوج:"
+msgstr "الزّوج"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "ال_ولاية/المحافظة:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "اللّ_قب:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#, fuzzy
 msgid "_Video Chat:"
-msgstr ""
+msgstr "نافذة المحادثة"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 #, fuzzy
 msgid "_Wants to receive HTML mail"
 msgstr "يريد تلقّي _بريد HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 #, fuzzy
 msgid "_Web Log:"
-msgstr "صفحة الإنترنت:"
+msgstr "سجلّ الشبكة:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "النّا_دل:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 #, fuzzy
 msgid "_Zip/Postal Code:"
-msgstr "ال_رّمز البريدي:"
+msgstr "الرمز البريدي:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Address"
 msgstr "العنوان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/table/e-cell-text.c:1821 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
 msgid "Editable"
 msgstr "قابل للتّحرير"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "الولايات المتحدة الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "أفغانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "ألبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "الجزائر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "صامُوَا الأمريكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "أندورا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "أنغولا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr "أنكويّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "القارة المتجمّدة الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "أنتيغا و بربودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "الأرجنتين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "أرمينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "اروبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "أستراليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "النّمسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
 msgstr "آذربيجان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "جزر البهاما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "البحرين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "بنغلادش"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "بربدوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "بلاروسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "البلجيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
 msgstr "بيليز"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "البنين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "جزر البرمودا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr "بوتان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "بوليفيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "البوسنة و الهرسك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr "بتسوانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr "جزيرة بوفي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "إقليم المحيط الهندي البريطاني"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr "بروناي دار السّلام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr "بوركينا فاصو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr "بوروندي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "كمبوديا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "الكامرون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "كندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr "كاب فيردا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr "جزر الكيمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "جمهورية إفريقيا الوسطى"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "التّشاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "الشيلي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "الصّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "جزيرة عيد الميلاد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "جزر الكوكوس (كيلنك)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "كولومبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr "جزر القمر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "الكنغو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#, fuzzy
 msgid "Congo, The Democratic Republic Of The"
-msgstr ""
+msgstr "جمهورية إفريقيا الوسطى"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "جزر كوك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "كوستا ريكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "ساحل العاج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "كرواتيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "كوبا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "قبرص"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "الجمهورية التّشيكية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "الدّنمارك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr "جيبوتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "الدّومينيكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "جمهورية الدّومينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "الإكوادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "مصر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "السّلفادور"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr "غينيا الإستوائيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "إرتريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "إستونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "إثيوبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
 msgstr "جزر الفالكلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr "جزر الفارو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "فيجي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "فنلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "فرنسا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "غينيا الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "بولونيزيا الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "الأقاليم الجنوبية الفرنسيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "الغابون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "غمبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "جورجيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "ألمانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
 msgstr "غانا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "جبل طارق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "اليونان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "جرينلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr "غرناطة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "كوادالوب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr "كوام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "غواتيمالا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 #, fuzzy
 msgid "Guernsey"
-msgstr "ألمانيا"
+msgstr "غيرنسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "غينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr "غينيا بيساو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr "غوَيانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "هايتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "هيرد و جزر ماكدونالد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr "البحر المقدّس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "هونغ كونغ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "المجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "إيسلاندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "الهند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "إندونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #, fuzzy
 msgid "Iran"
-msgstr "إيرلندا"
+msgstr "إيران، الجمهوريّة الإسلاميّة الإيرانيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #, fuzzy
 msgid "Iraq"
 msgstr "إسرائيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "إيرلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#, fuzzy
 msgid "Isle of Man"
-msgstr ""
+msgstr "جزيرة مان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "إسرائيل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "إيطاليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "الجمائيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "اليابان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#, fuzzy
 msgid "Jersey"
-msgstr ""
+msgstr "جيرسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "الأردن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "كزاخستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "كينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr "كيريباتي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 #, fuzzy
 msgid "Korea, Democratic People's Republic Of"
 msgstr "كوريا، جمهورية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "كوريا، جمهورية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "الكويت"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "كرغيزستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "لاوص"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "لاتفيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "لبنان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr "لزوتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "ليبيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 #, fuzzy
 msgid "Libya"
-msgstr "ليبيريا"
+msgstr "ليبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "ليشتنشتاين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr "لتوانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "لكسمبورغ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 #, fuzzy
 msgid "Macao"
-msgstr "ماكاو"
+msgstr "آسيا/ماكاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "مقدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "مدغشقر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "ملاوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "مليزيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
 msgstr "المالديف"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr "مالي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "مالطا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "جزر المارشل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr "مارتينيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "موريطانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "موريشيوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "مايوتا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "المكسيك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "مكرونيسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "مولدوفا، جمهورية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "موناكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "منغوليا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr "مونسيرات"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "المغرب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "الموزمبيق"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr "مينمار"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "ناميبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr "ناورو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "نيبال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr "أنتيل هولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "نيو قلدونيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "نيو زيلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "النّيجر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "نيجيريا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr "نيوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr "جزيرة نورفولك"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr "جزر ماريانا الشّمالية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "النّرويج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "عمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "باكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr "بالاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "فلسطين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "باناما"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr "غينيا الجديدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "البراغواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "بيرو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "الفلبّين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "بتكيرن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "بولندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "بوارتو ريكو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "قطر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "ريونيون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "رومانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "الإتّحاد الروسي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "روَندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr "سان كتس و نيفس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr "سينت لوسيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 #, fuzzy
 msgid "Saint Vincent And The Grenadines"
-msgstr "سينت فنسنت و الغرنادينز"
+msgstr "سان كتس و نيفس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "صاموا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr "سان مارينو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr "صاو تومي و برنسيب"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "العربيّة السّعودية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "السّينغال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#, fuzzy
 msgid "Serbia And Montenegro"
-msgstr ""
+msgstr "احفظ و اخرج"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "السّيشال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "سييرا ليون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "سنغفورة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "سلوفينيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "جزر سليمان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "الصّومال"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "جنوب إفريقيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "جنوب جورجيا و جزر ساندويتش الجنوبيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "إسبانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "سري لانكا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr "سان هيلانة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr "سان بيير و مِكويلون"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "السّودان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "سورينام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "سفالبارد و جزر جان مايِن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr "السّوازيلاند"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "السّويد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "سويسرا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 #, fuzzy
 msgid "Syria"
 msgstr "سورينام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "طاجيكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "جمهورية تنزانيا المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "تايلندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "طوغو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr "توكيلاو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "تونغا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
 msgstr "ترنداد و طوباغو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "تونس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "تركيّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "تركمانستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr "جزر تُركس و كيْكوس"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr "توفالو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "أوغندا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "أُكرانيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "الإمارات العربيّة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr "جزر الولايات المتّحدة الصّغرى النّائية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "الأوروغواي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "أوزباكستان"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr "فانواتو"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "فينزويلّا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "الفيتنام"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "جزر فيرجن البريطانيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "جزر فيرجن الأمريكيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr "جزر والس و فوتونا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "الصّحراء الغربيّة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "اليمن"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "زمبيا"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "زمبابوي"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/save-attachments/save-attachments.c:370
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "الإسم"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#, fuzzy
 msgid "AOL Instant Messenger"
-msgstr ""
+msgstr "مقطع صوتي لرسالة فورية جديدة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#, fuzzy
 msgid "Jabber"
-msgstr ""
+msgstr "_Jabber:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#, fuzzy
 msgid "Yahoo Messenger"
-msgstr ""
+msgstr "بحث في ياهو!"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+#, fuzzy
+msgid "Gadu-Gadu Messenger"
+msgstr "_رسالة بريديّة"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "ICQ"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 #, fuzzy
 msgid "Service"
-msgstr "الخدمة جاهزة"
+msgstr "خدمة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 #, fuzzy
 msgid "Location"
-msgstr "الموقع:"
+msgstr "الموقع"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
 #, fuzzy
 msgid "Username"
-msgstr "إ_سم المستخدم:"
+msgstr "إسم المستخدم"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "المنزل"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "أُخرى"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#, fuzzy
 msgid "Yahoo"
+msgstr "_Yahoo:"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+msgid "Gadu-Gadu"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "MSN"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 #, fuzzy
 msgid "GroupWise"
-msgstr "مجموعة"
+msgstr "_Groupwise:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #, fuzzy
 msgid "Source Book"
-msgstr "المصدر"
+msgstr "دفتر العناوين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#, fuzzy
 msgid "Target Book"
-msgstr ""
+msgstr "دفتر العناوين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Is New Contact"
 msgstr "مراسَل جديد"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 msgid "Writable Fields"
 msgstr "حقول قابلة للكتابة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 #, fuzzy
 msgid "Required Fields"
-msgstr "الأشخاص الإ_لزاميّون"
+msgstr "_حقول الشهادة"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 msgid "Changed"
 msgstr "غُيِّر"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
 msgstr "محرّر المراسَلين"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "الرجاء الانتقاء من الخيارات التالية"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 #, fuzzy
-msgid "No image"
-msgstr "النّيجر"
+msgid "_No image"
+msgstr "لا صورة."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "تاريخ التّكرار غير صحيح"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#, fuzzy, c-format
+msgid "'%s' has an invalid format"
+msgstr "نمط الملف غير صحيح."
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#, fuzzy, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "نمط الملف غير صحيح."
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#, fuzzy, c-format
+msgid "%s'%s' is empty"
+msgstr "المستند فارغ."
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 #, fuzzy
 msgid "Invalid contact."
-msgstr "توقيع غير سليم"
+msgstr "اسم الموصول"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr "إضافة سريعة لمراسَل"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
 msgid "_Edit Full"
 msgstr "ت_حرير كامل"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "الإسم ال_كامل:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#, fuzzy
+msgid "_Full name"
+msgstr "الإ_سم الكامل..."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#, fuzzy
+msgid "E_mail"
+msgstr "بريد"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "البريد الإل_كتروني:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#, fuzzy
+msgid "_Select Address Book"
+msgstr "بريد (دفتر العناوين)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
 "هل أنت متأكّد أنّك تريد\n"
 "حذف هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2617,16 +2769,16 @@ msgstr ""
 "هل أنت متأكّد أنّك تريد\n"
 "حذف هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
 "هل أنت متأكّد أنّك تريد\n"
 "حذف هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2634,180 +2786,186 @@ msgstr ""
 "هل أنت متأكّد أنّك تريد\n"
 "حذف هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "العنوان ال_ثّاني:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Ci_ty:"
 msgstr "ال_مدينة:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "ال_دّولة:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "العنوان الكامل:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "ال_عنوان:"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "ال_رّمز البريدي:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "الدّكتور"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "المحترم"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "الإسم الكامل"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "الإبن"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "الآنسة"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "السيّد"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "السيّدة"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "السيدة"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "سير"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "الأ_وّل:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "الأ_خير:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "الأو_سط:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "ال_لّاحقة:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
 #, fuzzy
 msgid "Add IM Account"
-msgstr "حسابات البريد"
+msgstr "عدّل معلومات الحساب"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 #, fuzzy
 msgid "_Account name:"
-msgstr "إسم الحساب"
+msgstr "إسم الحساب:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 #, fuzzy
 msgid "_IM Service:"
-msgstr "ال_ولاية/المحافظة:"
+msgstr "جاري فحص الخدمة"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 #, fuzzy
 msgid "_Location:"
-msgstr "الموقع:"
+msgstr "ال_موقع:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#, fuzzy
 msgid "Add an email to the List"
-msgstr ""
+msgstr "إرسال بريد إلكتروني إلى <b>%(name)s</b> (%(email)s)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
 msgid "Contact List Editor"
 msgstr "محرّر قائمة المراسَلين"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 #, fuzzy
 msgid "Insert email addresses from Address Book"
 msgstr "إنتقاء مراسَلين من دفتر العناوين"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Members"
 msgstr "الأعضاء"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 #, fuzzy
 msgid "Remove an email address from the List"
-msgstr "حذف العناصر المنتقاة من قائمة المُرفقات"
+msgstr "احذف الصوت المختار من القائمة"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr "إ_خفاء العناوين عند إرسال رسالة لهذه القائمة"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_List name:"
 msgstr "إسم ال_قائمة:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_Select"
-msgstr "مُنتقى"
+msgstr "إنت_قاء"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "أدخِل  عنواناً بريدياً أو إسحب مراسَلاً إلى اللّائحة أدناه:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "كتاب"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
 msgid "Is New List"
 msgstr "هي قائمة جديدة"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 #, fuzzy
 msgid "_Members"
 msgstr "الأعضاء"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 #, fuzzy
 msgid "Contact List Members"
-msgstr "أعضاء القائمة"
+msgstr "قائمة مراسَلين جديدة"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2846,11 +3004,21 @@ msgstr ""
 "الإسم أو العنوان البريدي لهذا المراسَل موجود مسبقاً\n"
 "في هذا الدّليل.  هل تودّ إضافته على كل حال؟"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "بحث متقدّم"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../calendar/gui/cal-search-bar.c:60
+msgid "Any field contains"
+msgstr "أي حقل يحوي"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Email begins with"
+msgstr "يبدأ البريد الإلكتروني بـ"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Name begins with"
+msgstr "يبدأ الإسم بـ"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2860,14 +3028,14 @@ msgstr "لا مراسَلين"
 #, fuzzy, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
-msgstr[0] "%d مراسَلين"
+msgstr[0] "_مراسَل"
 msgstr[1] "%d مراسَلين"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "بحث"
 
@@ -2876,12 +3044,12 @@ msgid "Error getting book view"
 msgstr "خطأ عند تلقّي المشهد الكتابي"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
 msgid "Model"
 msgstr "النّموذج"
 
@@ -2889,139 +3057,134 @@ msgstr "النّموذج"
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "يبدأ الإسم بـ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "يبدأ البريد الإلكتروني بـ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "الصّنف هو"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "أي حقل يحوي"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "متقدّم..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 msgid "Source"
 msgstr "المصدر"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:251
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-list-view.c:487
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:6
 msgid "Type"
 msgstr "النّوع"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-#, fuzzy
-msgid "Address Book"
-msgstr "دفتر العناوين"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:841
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
+#: ../ui/evolution-addressbook.xml.h:31
 #, fuzzy
 msgid "Save as VCard..."
-msgstr "حفظ كـ VCard"
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_فتح"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "مراسَل جديد..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#, fuzzy
+msgid "_New Contact..."
+msgstr "م_حادث جديد"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "قائمة مراسَلين جديدة..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#, fuzzy
+msgid "New Contact _List..."
+msgstr "قائمة مراسَلين جديدة"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "تمرير المراسَل"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 #, fuzzy
-msgid "Forward Contacts"
+msgid "_Forward Contact"
 msgstr "تمرير المراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#, fuzzy
+msgid "_Forward Contacts"
+msgstr "مراسَلين بعيدين"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#, fuzzy
+msgid "Send _Message to Contact"
 msgstr "إرسال رسالة للمراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 #, fuzzy
-msgid "Send Message to List"
+msgid "Send _Message to List"
 msgstr "إرسال رسالة للمراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 #, fuzzy
-msgid "Send Message to Contacts"
+msgid "Send _Message to Contacts"
 msgstr "إرسال رسالة للمراسَل"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "طبع"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#, fuzzy
+msgid "_Print"
+msgstr "_طبع"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #, fuzzy
-msgid "Copy to Address Book..."
-msgstr "دفتر العناوين..."
+msgid "Cop_y to Address Book..."
+msgstr "أضف المكالم إلى دفتر العناوين"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
 #, fuzzy
-msgid "Move to Address Book..."
-msgstr "دفتر العناوين..."
+msgid "Mo_ve to Address Book..."
+msgstr "أضف المكالم إلى دفتر العناوين"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "قص"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "_قص"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "نسخ"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../calendar/gui/calendar-component.c:583
+#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3153 ../mail/em-folder-tree.c:1002
+#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1920
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_نسخ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:985
+#, fuzzy
+msgid "P_aste"
 msgstr "لصق"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "أيّ صنف"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
 #, fuzzy
 msgid "Print cards"
-msgstr "طبع المهام"
+msgstr "بطاقات ال_عناوين"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Other error"
+msgstr "خطأ آخر"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "المساعد"
 
@@ -3042,17 +3205,19 @@ msgid "Business Phone 2"
 msgstr "هاتف العمل الثاني"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#, fuzzy
 msgid "Callback Phone"
-msgstr ""
+msgstr "هاتف المساعد"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "هاتف السّيارة"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "الفئات"
 
@@ -3061,18 +3226,16 @@ msgid "Company Phone"
 msgstr "هاتف الشّركة"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "البريد الإلكتروني الثّاني"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "البريد الإلكتروني الثّالث"
 
@@ -3109,20 +3272,22 @@ msgid "Journal"
 msgstr "السّجل اليومي"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "المدير"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:596
 msgid "Mobile Phone"
 msgstr "الهاتف الجوال"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "الإسم المستعار"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -3131,7 +3296,7 @@ msgid "Office"
 msgstr "مكتب"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Organization"
 msgstr "المنظّمة"
 
@@ -3157,13 +3322,14 @@ msgstr "المذياع"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:498
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "الدّور"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "الزّوج"
 
@@ -3194,38 +3360,38 @@ msgid "Web Site"
 msgstr "موقع الإنترنت"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../addressbook/gui/widgets/e-minicard.c:150
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Width"
 msgstr "العرض"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../addressbook/gui/widgets/e-minicard.c:157
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
 msgid "Height"
 msgstr "الإرتفاع"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:165
 msgid "Has Focus"
 msgstr "له تركيز"
 
@@ -3249,7 +3415,7 @@ msgstr "الطّول الأقصى لإسم الحقل"
 msgid "Column Width"
 msgstr "عرض العمود"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 #, fuzzy
 msgid ""
 "\n"
@@ -3264,7 +3430,7 @@ msgstr ""
 "\n"
 "إنقر نقرا مزدوجاً لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3278,15 +3444,15 @@ msgstr ""
 "\n"
 "إنقر نقرا مزدوجاً لإنشاء مراسَل جديد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 #, fuzzy
 msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "بحث عن المراسَلين..."
+msgstr "عنوان البريد الالكتروني للموصول"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
@@ -3296,203 +3462,277 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:501
 msgid "Adapter"
 msgstr "محوّل"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#, fuzzy
+msgid "Work Email"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#, fuzzy
+msgid "Home Email"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#, fuzzy
+msgid "Other Email"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../addressbook/gui/widgets/e-minicard.c:173
 msgid "Selected"
 msgstr "مُنتقى"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:180
 msgid "Has Cursor"
 msgstr "له مؤشّر"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_فتح الوصلة في المتصفّح"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../mail/em-folder-view.c:2511
+msgid "_Copy Link Location"
+msgstr "_نسخ موقع الوصلة"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#, fuzzy
+msgid "_Send New Message To ..."
+msgstr "إرسال رسالة للمراسَل"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "نسخ البريد الالكتروني"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:301
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#, fuzzy
 msgid "(map)"
-msgstr ""
+msgstr "خارطة صورة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:311
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#, fuzzy
 msgid "map"
-msgstr ""
+msgstr "خارطة صورة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:462
+#: ../addressbook/gui/widgets/eab-contact-display.c:763
 msgid "List Members"
 msgstr "أعضاء القائمة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 #, fuzzy
 msgid "E-mail"
-msgstr "البريد الإلكتروني"
+msgstr "البريد إلكتروني"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Department"
+msgstr "المَصْلَحَة"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#, fuzzy
+msgid "Profession"
+msgstr "العمل:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 #, fuzzy
 msgid "Position"
-msgstr "الوصف"
+msgstr "موقع"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr ""
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#, fuzzy
+msgid "Video Chat"
+msgstr "نافذة المحادثة"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:578
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2286
+#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+#: ../plugins/hula-account-setup/camel-hula-listener.c:381
+#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "الرُّزنامة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../ui/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Free/Busy"
+msgstr "معلومات متوفّر/مشغول"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 #, fuzzy
 msgid "Phone"
-msgstr "هاتف السّيارة"
+msgstr "هاتف المساعد"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#, fuzzy
 msgid "Fax"
-msgstr ""
+msgstr "فاكس العمل"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
 #, fuzzy
-msgid "work"
-msgstr "عمل"
+msgid "Home Page"
+msgstr "الصفحة الرئيسيّة"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr ""
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#, fuzzy
+msgid "Web Log"
+msgstr "سجلّ الشبكة:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr "البلوغ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#, fuzzy
+msgid "Birthday"
+msgstr "عيد ال_ميلاد:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
 #, fuzzy
-msgid "personal"
-msgstr "شخصي"
+msgid "Anniversary"
+msgstr "الذكرى ال_سنويّة:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:781
 msgid "Job Title"
 msgstr "المسمّى الوظيفي"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:812
 msgid "Home page"
 msgstr "صفحة الإنترنت الشخصية"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:820
+msgid "Blog"
+msgstr "البلوغ"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "نجاح"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#, fuzzy
 msgid "Backend busy"
-msgstr ""
+msgstr "الدليل مشغول"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "المستودع غير متّصل"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Address Book does not exist"
-msgstr "دفتر العناوين غير موجود"
+msgstr "%s: %s غير موجود لكن يجب أن يكون موجودًا."
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "No Self Contact defined"
-msgstr "قائمة مراسَلين جديدة"
+msgstr "لا خادم مخصص للعبة"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "رُفض التّصريح"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "لم يوجد المراسَل"
 
 # checked, typed but the nchanged: you add a new ID and the other exists
 # the meaning of this dialog is more" you can't add a newone cz another one exists"
-# 
+#
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "هويّة المراسَل موجودة مسبقاً"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "البروتوكول غير مدعوم"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#, fuzzy
+msgid "Canceled"
 msgstr "ألغي"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Could not cancel"
-msgstr "لم يمكن إنشاء الأنبوب: %s"
+msgstr "تعذّر العثور على '%s'"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "فشل التّوثيق"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "التّوثيق مطلوب"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "TLS not Available"
 msgstr "TLS غير متوفر"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 #, fuzzy
 msgid "No such source"
 msgstr "لا رسالة بهذا الإسم"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #, fuzzy
 msgid "Not available in offline mode"
-msgstr "بدأ دون اتصال بالإنترنت"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "خطأ آخر"
+msgstr "لا يمكن الشطب بالوضع دون اتّصال."
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 #, fuzzy
 msgid "Invalid server version"
-msgstr "النّسخة"
+msgstr "تحدّي النّادل غير صحيح\n"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
@@ -3501,16 +3741,16 @@ msgstr ""
 "لم نتمكّن من فتح دفتر العناوين هذا. الرجاءً التأكّد من وجود\n"
 "المسار و التراخيص الكافية للنفاذ إليه."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 "لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك\n"
-"أنّك أدخلت عنواناً خاطأ، أو أنّه لا يمكن الوصول إلى نادل LDAP."
+"أنّك أدخلت عنواناً خاطأ، أو أنّه لا يمكن الوصول إلى خادم LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -3521,7 +3761,7 @@ msgstr ""
 "إذا كنت تريد استخدام LDAP في إيفُليوشِن قم بتجميع البرنامج\n"
 "من مصادر الـ CVS بعد جلب OpenLDAP من الوصلة أدناه.\n"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3530,7 +3770,7 @@ msgstr ""
 "لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك\n"
 "أنّك أدخلت عنواناً غير سليم، أو أنّه لم يمكن الوصول للنّادل."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3539,10 +3779,10 @@ msgid ""
 msgstr ""
 "طابَق هذا الاستعلام بطاقات أكثر ممّا هو معدّ للنّادل إرجاعه\n"
 "أو لإيفُليوشِن إظهاره. الرجاءً جعل بحثك أكثر دقّة\n"
-"أو رفع قيمة الحدّ الأقصى للنتائج في تفضيلات نادل الدّليل\n"
+"أو رفع قيمة الحدّ الأقصى للنتائج في تفضيلات خادم الدّليل\n"
 "لدفتر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3552,47 +3792,47 @@ msgstr ""
 "لقد تخطّى وقت تنفيذ هذا الإستعلام حدّ النّادل أو الحدّ المعدّ لدفتر\n"
 "العناوين هذا. الرجاءً جعل بحثك أكثر دقّة أو رفع قيمة الحدّ الأقصى لزمن "
 "الإستعلام\n"
-"في تفضيلات نادل الدّليل لدفتر العناوين هذا."
+"في تفضيلات خادم الدّليل لدفتر العناوين هذا."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "لم تتمكن خلفيّة دفتر العناوين هذا من ترجمة هذا البحث."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "رفضت خلفيّة دفتر العناوين القيام بهذا البحث."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
 msgstr "لم يتمّ البحث بنجاح."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr "خطأ أثناء إضافة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Error adding contact"
 msgstr "خطأ أثناء إضافة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr "خطأ أثناء تغيير اللّائحة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr "خطأ أثناء تغيير المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr "خطأ أثناء إزالة القائمة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:659
 msgid "Error removing contact"
 msgstr "خطأ أثناء إزالة المراسَل"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
 #, fuzzy, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3607,7 +3847,8 @@ msgstr[1] ""
 "فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
 "هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3616,95 +3857,75 @@ msgstr ""
 "%s موجود\n"
 "هل تريد تنميقه؟"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:328
 msgid "Overwrite"
 msgstr "تنميق"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:378
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
-msgstr[0] "مراسَل واحد"
+msgstr[0] "_مراسَل"
 msgstr[1] "مراسَل واحد"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:426
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#, fuzzy
+msgid "Select Address Book"
+msgstr "بريد (دفتر العناوين)"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:604
 msgid "list"
 msgstr "سرد"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Move contact to"
 msgstr "نقل المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Copy contact to"
 msgstr "نسخ المراسَل إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Move contacts to"
 msgstr "نقل المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:775
 msgid "Copy contacts to"
 msgstr "نسخ المراسَلين إلى"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "إنتقاء مراسَلين من دفتر العناوين"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
 msgid "Multiple VCards"
 msgstr "VCards عديدة"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 #, c-format
 msgid "VCard for %s"
 msgstr "بطاقة VCard لـ%s"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(لاشيء)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "البريد الإلكتروني الأساسي"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "إختيار عمل"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "إنشاء مراسَل جديد \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:1045
+#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#, fuzzy
+msgid "Contact information"
+msgstr "عدّل معلومات الاتصال"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "إضافة عنوان إلى المراسَل \"%s\" الموجود مسبقاً"
+#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#, fuzzy, c-format
+msgid "Contact information for %s"
+msgstr "لمعلوماتك"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
 #, fuzzy
 msgid "Querying Address Book..."
-msgstr "جاري البحث في دفتر العناوين..."
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "دمج عنوان البريد الإلكتروني"
+msgstr "بريد (دفتر العناوين)"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
@@ -3734,28 +3955,64 @@ msgstr "مشهد البطاقة"
 msgid "GTK Tree View"
 msgstr "مشهد شجرة GTK"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "جاري الاستيراد..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+#, fuzzy
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "لا دعم إلا لتهيئات csv أو vcard."
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+#, fuzzy
+msgid "Outlook CSV and Tab Importer"
+msgstr "مستورد آي-كلندر لإيفُليوشِن"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+#, fuzzy
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "لا دعم إلا لتهيئات csv أو vcard."
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+#, fuzzy
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "لا دعم إلا لتهيئات csv أو vcard."
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+#, fuzzy
+msgid "Evolution CSV and Tab Importer"
+msgstr "مستورد آي-كلندر لإيفُليوشِن"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 #, fuzzy
 msgid "Importing ..."
 msgstr "جاري الاستيراد..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 #, fuzzy
 msgid "Evolution LDIF importer"
-msgstr "مستورد elm لإيفُليوشِن"
+msgstr "مستورد آي-كلندر لإيفُليوشِن"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+#, fuzzy
 msgid "VCard (.vcf, .gcrd)"
-msgstr ""
+msgstr "ملفّات في-كلندر (.vcf)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 #, fuzzy
 msgid "Evolution VCard Importer"
 msgstr "مستورد آي-كلندر لإيفُليوشِن"
@@ -3765,12 +4022,12 @@ msgstr "مستورد آي-كلندر لإيفُليوشِن"
 msgid "Print envelope"
 msgstr "طبع الغلاف"
 
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:849
 msgid "Print contacts"
 msgstr "طبع المراسَلين"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:939
+#: ../addressbook/printing/e-contact-print.c:967
 msgid "Print contact"
 msgstr "طبع المراسَل"
 
@@ -3815,11 +4072,11 @@ msgid "Format"
 msgstr "التهيئة"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1913
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "التّرويسة"
@@ -3873,7 +4130,7 @@ msgid "Options"
 msgstr "خيارات"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "الإتّجاه"
 
@@ -3923,9 +4180,9 @@ msgstr "تظليل"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "الحجم:"
 
@@ -3975,21 +4232,21 @@ msgstr "إختبار طباعة المراسَل"
 msgid "This should test the contact print code"
 msgstr "سيختبر هذا رمز طباعة المراسَل"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "لا يمكن فتح الملف"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 #, fuzzy
 msgid "Couldn't get list of addressbooks"
-msgstr "لم يمكن تحميل دفتر العناوين"
+msgstr "فشل في الحصول على قائمة المستخدمين"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 #, fuzzy
 msgid "failed to open book"
-msgstr "لم يمكن فتح دفتر العناوين"
+msgstr "فشل فتح الجهاز"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
@@ -4014,7 +4271,7 @@ msgstr "[vcard|csv]"
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 #, fuzzy
 msgid "Export in asynchronous mode"
-msgstr "تصدير بنسق غير متزامن"
+msgstr "القفل في نمط ملء الشاشة"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 #, fuzzy
@@ -4049,7 +4306,7 @@ msgstr "ليس هناك حاجة لخيار الحجم في النسق العا�
 #: ../addressbook/tools/evolution-addressbook-export.c:153
 #, fuzzy
 msgid "Unhandled error"
-msgstr "خطأ مجهول"
+msgstr "خطأ لا يمكن معالجته، إلغاء"
 
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -4065,360 +4322,446 @@ msgstr "لم يحدّد إسم ملف."
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 #, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "هل تريد فعلاً حذف المهمّة `%s'؟"
+msgstr "هل أنت متأكّدٌ أنّك تريد حذف الحساب  %s؟"
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 #, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "هل تريد فعلاً حذف الموعد `%s'؟"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 #, fuzzy
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 #, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "هل تريد فعلاً حذف الموعد `%s'؟"
+msgstr ""
+"هل أنت متأكّد أنّك تريد\n"
+"حذف هؤلاء المراسَلين؟"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 #, fuzzy
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "هل تريد فعلاً حذف `%d' من خانات السّجل؟"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 #, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "هل تريد فعلاً حذف المهمّة `%s'؟"
+msgstr ""
+"هل أنت متأكّد أنّك تريد\n"
+"حذف هؤلاء المراسَلين؟"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 #, fuzzy
 msgid "Are you sure you want to delete this appointment?"
-msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/gui/dialogs/delete-comp.c:189
 #, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
 msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:183
 #, fuzzy
 msgid "Are you sure you want to delete this meeting?"
-msgstr "هل تريد فعلاً إلغاء و حذف هذا الإجتماع؟"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/gui/dialogs/delete-comp.c:186
 #, fuzzy
 msgid "Are you sure you want to delete this task?"
-msgstr "هل تريد فعلاً حذف %d من المهام؟"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 #, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "مسائلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 #, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "مسائلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
+#, fuzzy
+msgid "Cannot create a new event"
+msgstr "تعذر إنشاء ملاحظة جديدة"
+
+#: ../calendar/calendar.error.xml.h:24
 #, fuzzy
 msgid "Delete calendar '{0}'?"
-msgstr "حذف \"%s\""
+msgstr "رزنامة جنوم"
+
+#: ../calendar/calendar.error.xml.h:25
+#, fuzzy
+msgid "Delete memo list '{0}'?"
+msgstr "لائحة كودكات الصوت"
 
 #: ../calendar/calendar.error.xml.h:26
 #, fuzzy
 msgid "Delete task list '{0}'?"
-msgstr "حذف هذه القائمة"
+msgstr "<b>خيارات قائمة المهام</b>"
 
 #: ../calendar/calendar.error.xml.h:27
 #, fuzzy
-msgid "Discard Changes"
-msgstr "تجا_هل التّغييرات"
+msgid "Do _not Send"
+msgstr "الرجاء عدم الإزعاج"
 
 #: ../calendar/calendar.error.xml.h:28
 #, fuzzy
-msgid "Don't Send"
-msgstr "عدم الحذف"
-
-#: ../calendar/calendar.error.xml.h:29
-#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 #, fuzzy
 msgid "Editor could not be loaded."
-msgstr "لم يعثر على الجسم\n"
+msgstr "لم يمكن إيجاد “%s”"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 #, fuzzy
 msgid "Error loading calendar"
-msgstr "خطأ أثناء فتح الرُّزنامة"
+msgstr "خطأ عند تحميل الرزنامة"
+
+#: ../calendar/calendar.error.xml.h:34
+#, fuzzy
+msgid "Error loading memo list"
+msgstr "خطأ عند تحميل دفتر العناوين الإفتراضي."
 
 #: ../calendar/calendar.error.xml.h:35
 #, fuzzy
 msgid "Error loading task list"
-msgstr "خطأ أثناء إضافة القائمة"
+msgstr "إضافة قائمة مهام جديدة"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:39
-#, fuzzy
-msgid "Save Changes"
-msgstr "تجا_هل التّغييرات"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "إرسال"
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
-msgid "Send Notice"
-msgstr "إرسال إلى:"
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:43
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:44
 #, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "مستورد في-كلندر لإيفُليوشِن"
+msgstr "توقف جسم الشريط بصورة غير متوقعة"
+
+#: ../calendar/calendar.error.xml.h:45
+#, fuzzy
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "توقف جسم الشريط بصورة غير متوقعة"
 
 #: ../calendar/calendar.error.xml.h:46
+#, fuzzy
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr ""
+msgstr "رُزنامة و مهامّ إيفُليوشِن"
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
+msgid "The calendar is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "This calendar will be removed permanently."
+msgid "The task list is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "This task list will be removed permanently."
+msgid "This calendar will be removed permanently."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:51
 #, fuzzy
+msgid "This memo list will be removed permanently."
+msgstr "لم يمكن إرسال العنصر!\n"
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "This task list will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:53
+#, fuzzy
 msgid "Would you like to save your changes to this appointment?"
 msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "Would you like to save your changes to this memo?"
+msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
+
+#: ../calendar/calendar.error.xml.h:55
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 #, fuzzy
-msgid "Would you like to send a cancellation notice for this journal entry?"
+msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
 
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:57
+#, fuzzy
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:63
+msgid ""
+"You have a read-only calendar source selected. Change to Calendar View and "
+"highlight a calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
 #, fuzzy
-msgid "You have made changes to this appointment, but not yet saved them."
+msgid "You have changed this appointment, but not yet saved it."
 msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 #, fuzzy
-msgid "You have made changes to this task, but not yet saved them."
+msgid "You have changed this task, but not yet saved it."
 msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
+#, fuzzy
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
+
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:68
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:70
+#: ../composer/mail-composer.error.xml.h:27
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "التراجع عن التغييرات؟"
+
+#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_حفظ"
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "_Save Changes"
+msgstr "التراجع عن التغييرات؟"
+
+#: ../calendar/calendar.error.xml.h:73
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 #, fuzzy
 msgid "_Send"
-msgstr "إرسال"
+msgstr "إر_سال"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:74
+#, fuzzy
+msgid "_Send Notice"
+msgstr "تنبيه أمني"
+
+#: ../calendar/calendar.error.xml.h:75
 msgid "{0}."
 msgstr ""
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
 #, fuzzy
 msgid "Enter password"
-msgstr "أدخل كلمة السّر"
+msgstr "أدخل كلمة المرور"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr "تجزأة أحداث متعدّدة في اليوم الواحد:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1038
+#: ../calendar/conduits/todo/todo-conduit.c:1039
 #, fuzzy
 msgid "Could not start evolution-data-server"
-msgstr "لم يمكن تشغيل نادل وُمْبَت"
+msgstr "لم يمكن تشغيل خادم وُمْبَت"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "لم يمكن قراءة قالب تطبيقات الرُّزنامة للحاسوب اليدوي"
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+#, fuzzy
+msgid "Could not read pilot's Memo application block"
+msgstr "لم يمكن قراءة قالب تطبيقات العناوين للحاسوب اليدوي"
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+#, fuzzy
+msgid "Could not write pilot's Memo application block"
+msgstr "لم يمكن قراءة قالب تطبيقات العناوين للحاسوب اليدوي"
+
+#: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
 msgstr "الأولويّة الإفتراضيّة:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
 msgstr "لم يمكن قراءة قالب تطبيقات المهام للحاسوب اليدوي"
 
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
+#, fuzzy
+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:2042
 msgid "Calendar and Tasks"
 msgstr "الرُّزنامة و المهام"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1361
 msgid "Calendars"
 msgstr "الرزنامات"
 
@@ -4447,27 +4790,47 @@ msgid "Evolution's Calendar component"
 msgstr "مكوّن رُزنامة إيفُليوشِن"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution's Memos component"
+msgstr "مكوّن رُزنامة إيفُليوشِن"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "مكوّن مهام إيفُليوشِن"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Memo_s"
+msgstr "الأعضاء"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#, fuzzy
+msgid "Memos"
+msgstr "الأعضاء"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1840
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:391
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:601
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "المهام"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 #, fuzzy
 msgid "_Calendars"
 msgstr "الرزنامات"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_مهام"
@@ -4476,55 +4839,63 @@ msgstr "_مهام"
 msgid "Evolution Calendar alarm notification service"
 msgstr "خدمة التبليغ لمنبِّه رُزنامة إيفُليوشِن"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "دقائق"
+msgstr[0] "دقيقة"
 msgstr[1] "دقائق"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#, fuzzy
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "ساعات"
+msgstr[1] "ساعات"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 #, fuzzy
 msgid "Start time"
 msgstr "زمن ال_بدء"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 #, fuzzy
 msgid "Appointments"
-msgstr "موعد"
+msgstr "مواعيد"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../plugins/itip-formatter/itip-view.c:936
 msgid "Location:"
 msgstr "الموقع:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 #, fuzzy
 msgid "Snooze _time:"
-msgstr "مدّة الغفوة (دقائق)"
+msgstr "وقت غير سليم"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:41
 msgid "_Edit"
 msgstr "_تحرير"
 
@@ -4533,58 +4904,38 @@ msgstr "_تحرير"
 msgid "_Snooze"
 msgstr "غ_فوة"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
-msgid "description of appointment"
-msgstr "بداية الموعد"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #, fuzzy
 msgid "location of appointment"
-msgstr "بداية الموعد"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr ""
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr ""
+msgstr "موعد جديد"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
 #, fuzzy
 msgid "No summary available."
 msgstr "لا وجود لوصف."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
 msgid "No description available."
 msgstr "لا وجود لوصف."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
 #, fuzzy
 msgid "No location information available."
-msgstr "لا وجود لوصف."
+msgstr "لا معلومات متوفّرة حول الخطأ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"التّنبيه عند %s\n"
-"%s\n"
-"بدءا من %s\n"
-"انتهاءا عند %s"
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#, fuzzy, c-format
+msgid "You have %d alarms"
+msgstr "فزتَ!"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4596,7 +4947,7 @@ msgstr ""
 "عُدّة لإرسال بريد إلكتروني. سيعرض\n"
 "إيفُليوشِن صندوق حوار مذكّرة عادي عوضا عن ذلك."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4613,7 +4964,7 @@ msgstr ""
 "\n"
 "هل تريد فعلاً تشغيل هذا البرنامج؟"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
@@ -4621,7 +4972,7 @@ msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 msgid "Could not initialize Bonobo"
 msgstr "لم يمكن تشغيل بونوبو"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "لم يمكن إنشاء مصنع خدمة تبليغ التنبيهات"
 
@@ -4629,10 +4980,39 @@ msgstr "لم يمكن إنشاء مصنع خدمة تبليغ التنبيهات
 msgid "invalid time"
 msgstr "وقت غير سليم"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ساعات"
+msgstr[1] "%d ساعات"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d دقائق"
+msgstr[1] "%d دقائق"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ثانية"
+msgstr[1] "%d ثواني"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 #, fuzzy
 msgid "Alarm programs"
-msgstr "تشغيل برنامج"
+msgstr "برامج بدء التشغيل"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
 #, fuzzy
@@ -4670,7 +5050,7 @@ msgstr "_ضغط نهايات الأسابيع في مشهد الشّهر"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 #, fuzzy
 msgid "Confirm expunge"
-msgstr "تأ_كيد عند شطب مجلّد"
+msgstr "تأكيد كلمة المرور:"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
@@ -4679,332 +5059,439 @@ msgstr ""
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 #, fuzzy
 msgid "Default appointment reminder"
-msgstr "حذف هذا الموعد"
+msgstr "إ_ظهار علامة تذكير"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 #, fuzzy
 msgid "Default reminder units"
-msgstr "الأولويّة الإفتراضيّة:"
+msgstr "ا_ستخدم وحدات النظام المتري"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 #, fuzzy
 msgid "Default reminder value"
-msgstr "وحدات علامة التّذكير الإفتراضيّة"
+msgstr "خطأ عند الحصول على القيمة الإفتراضية لـ %s: %s\n"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 #, fuzzy
-msgid "Free/busy server urls"
-msgstr "طلب متوفّر/مشغول"
+msgid "Event Gradient"
+msgstr "تدرّج أفقي"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 #, fuzzy
-msgid "Free/busy template url"
-msgstr "رد متفرّغ/مشغول"
+msgid "Event Transparency"
+msgstr "لون الشّفافيّة"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 #, fuzzy
-msgid "Hide completed tasks"
-msgstr "إ_خفاء المهام المُنجزة بعد"
+msgid "Free/busy server URLs"
+msgstr "رسالة متوفّر/مشغول رديئة"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 #, fuzzy
-msgid "Hide task units"
-msgstr "قائمة مهام جديدة"
+msgid "Free/busy template URL"
+msgstr "رسالة متوفّر/مشغول رديئة"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Hide task value"
+msgid "Gradient of the events in calendar views."
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 #, fuzzy
-msgid "Horizontal pane position"
-msgstr "شبكة رسم أفقيّة"
+msgid "Hide completed tasks"
+msgstr "إ_خفاء المهام المُنجزة بعد"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#, fuzzy
+msgid "Hide task units"
+msgstr "ا_ستخدم وحدات النظام المتري"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#, fuzzy
+msgid "Hide task value"
+msgstr "قيمة التكبير المحلي"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#, fuzzy
+msgid "Horizontal pane position"
+msgstr "GtkAdjustment للموقع الأفقي"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "الفواصل الزمنيّة معروضة كمشاهد يوم و أسبوع عمل"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#, fuzzy
 msgid "Last alarm time"
-msgstr ""
+msgstr "اظهار وقت آخر _وصول"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "List of server URLs for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
 msgid "Marcus Bains Line"
-msgstr ""
+msgstr "خط أسمك"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 #, fuzzy
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "دقيقة إنتهاء يوم العمل"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "دقيقة بدء يوم العمل"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 #, fuzzy
 msgid "Month view horizontal pane position"
 msgstr "موقع اللّوح الأفقي"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 #, fuzzy
 msgid "Month view vertical pane position"
 msgstr "موقع اللّوح العمودي في مشهد الشّهر"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 #, fuzzy
-msgid "Number of units for determining for a default reminder."
+msgid "Number of units for determining a default reminder."
 msgstr "عدد وحدات علامة التّذكير الإفتراضيّة"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 #, fuzzy
 msgid "Number of units for determining when to hide tasks."
 msgstr "عدد الوحدات التي تحدّد متى تُخفى المهام"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid "Overdue tasks color"
-msgstr "المهام ال_فائت موعدها:"
+msgstr "لون GDK fill"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#, fuzzy
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr "موقع اللّوح العمودي في مشهد الشّهر"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "موقع اللّوح العمودي في مشهد المهام"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 #, fuzzy
 msgid "Programs that are allowed to be run by alarms."
 msgstr "البرامج التي يمكنها العمل كجزء من المنبّهات"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #, fuzzy
 msgid "Show appointment end times in week and month views"
 msgstr "_عرض أوقات نهاية المواعيد في مشاهد الأسبوع و الشّهر"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:81
+msgid "Show the \"Preview\" pane"
+msgstr "إظهار لوح \"المعاينة\""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:82
+msgid "Show the \"Preview\" pane."
+msgstr "إظهار لوح \"المعاينة\"."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, fuzzy
 msgid "Show week numbers in date navigator"
 msgstr "إظهار أر_قام الأسابيع في متصفّح التّواريخ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 #, fuzzy
 msgid "Tasks due today color"
 msgstr "ال_مهام المستحقّة اليوم:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#, fuzzy
 msgid "Tasks vertical pane position"
-msgstr ""
+msgstr "GtkAdjustment للموقع العمودي"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, fuzzy
 msgid "Time divisions"
 msgstr "_أجزاء الوقت:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Time the last alarm ran, in time_t."
 msgstr "وقت إطلاق آخر منبّه"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 #, fuzzy
 msgid "Timezone"
 msgstr "المنطقة الزّمنيّة "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "وحدات تقرير إخفاء المهام"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid "Week start"
-msgstr "يبدأ الأ_سبوع:"
+msgstr "calendar:week_start:0"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "اليوم الذي يبدء منه الأسبوع"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ما إذا كان سيُسْأل عن تّأكيد لحذف موعد ما"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ما إذا كان سيُسْأل عن تّأكيد لحذف موعد ما"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "_عرض أوقات نهاية المواعيد في مشاهد الأسبوع و الشّهر"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 #, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "ما إذا ستخفى المهام المنجزة"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
 msgstr "ما إذا كان سيُحدّد مُذكّر افتراضي للأحداث"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#, fuzzy
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#, fuzzy
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#, fuzzy
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#, fuzzy
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 #, fuzzy
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "ما إذا سيعرض الوقت بتهيئة  24ساعة بدلاً من استخدام صباحاً/مساءً (ص/م)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#, fuzzy
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#, fuzzy
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
 #, fuzzy
 msgid "Work days"
 msgstr "أيّام العمل:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#, fuzzy
 msgid "Workday end hour"
-msgstr ""
+msgstr "سبب إنهاء المكالمة"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#, fuzzy
 msgid "Workday end minute"
-msgstr ""
+msgstr "أقسام بـ %02i دقيقة"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
 #, fuzzy
 msgid "Workday start hour"
-msgstr "ساعة بدء يوم العمل"
+msgstr "مكّن 'التشغيل السريع'"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
 #, fuzzy
 msgid "Workday start minute"
-msgstr "ساعة بدء يوم العمل"
+msgstr "أقسام بـ %02i دقيقة"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#, fuzzy
+msgid "daylight savings time"
+msgstr "الوقت الذي تحدّده أنت"
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "الملخّص يحتوي على"
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "الوصف يحتوي على"
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "الصّنف هو"
+
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "التّعليق يحتوي على"
 
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:59
 #, fuzzy
 msgid "Location contains"
-msgstr "الوصف يحتوي على"
+msgstr "يحوي المكان"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "دون مطابق"
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "الرُّزنامة"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "طبع"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5013,110 +5500,113 @@ msgstr ""
 "ستمحو هذه العمليّة كل الأحداث الأقدم من الفترة الزّمنيّة المختارة بشكل دائم لن "
 "تتمكّن من إستعادة هذه الأحداث إذا تابعت العمليّة."
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr "تنطيف الأحداث الأقدم من"
 
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "الأيّام"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:260
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
+#: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "على الإنترنت"
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:284
 #: ../plugins/calendar-weather/calendar-weather.c:100
 #, fuzzy
 msgid "Weather"
-msgstr "أُخرى"
+msgstr "تقرير عن حالة الطقس"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
+#: ../calendar/gui/calendar-component.c:582
+#, fuzzy
+msgid "_New Calendar"
 msgstr "رُزنامة جديدة"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:899
 #, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "جاري تحميل الرُّزنامة..."
+msgstr "فشل تسجيل %s إلى %s"
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1198
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1214
 msgid "There is no calendar available for creating events and meetings"
 msgstr "لا توجد رُزنامة متوفّرة لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1336
 #, fuzzy
 msgid "Calendar Source Selector"
-msgstr "موقع الرُّزنامة"
+msgstr "منتقي نظم الوسائط المتعدّدة"
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1544
 msgid "New appointment"
 msgstr "موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1545
 msgid "_Appointment"
 msgstr "_موعد"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1546
 msgid "Create a new appointment"
 msgstr "إنشاء موعد جديد"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1552
 msgid "New meeting"
 msgstr "إجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1553
 msgid "M_eeting"
 msgstr "إ_جتماع"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1554
 msgid "Create a new meeting request"
 msgstr "إنشاء طلب إجتماع جديد"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1560
 msgid "New all day appointment"
 msgstr "موعد جديد يستغرق يوماً بكامله"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1561
 #, fuzzy
 msgid "All Day A_ppointment"
-msgstr "موعد _يستغرق يوماً بكامله"
+msgstr "موعد جديد يستغرق يوماً بكامله"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1562
 msgid "Create a new all-day appointment"
 msgstr "إنشاء موعد جديد يستغرق يوماً بكامله"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1568
 #, fuzzy
 msgid "New calendar"
 msgstr "رُزنامة جديدة"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1569
 #, fuzzy
 msgid "Cale_ndar"
-msgstr "الرُّزنامة"
+msgstr "الرزنامة:"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1570
 msgid "Create a new calendar"
 msgstr "إنشاء رزنامة جديدة"
 
@@ -5136,68 +5626,75 @@ msgstr "مشهد الأسبوع"
 msgid "Month View"
 msgstr "مشهد الشّهر"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "خطأ أثناء فتح الرُّزنامة"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "الطريقة غير مدعومة عند فتح الرزنامة"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "رُفض التّصريح بفتح الرُّزنامة"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "خطأ مجهول"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#, fuzzy
+msgid "Edit Alarm"
+msgstr "ساعة منبهة"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Alarm</b>"
-msgstr "<b>يبدء:</b> "
+msgstr "ساعة منبهة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Options</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgstr "<b>الخيارات</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
 msgid "<b>Repeat</b>"
-msgstr "<b>الحالة:</b>"
+msgstr "إعادة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
 msgid "Add Alarm"
-msgstr "المنبّهات"
+msgstr "ساعة منبهة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
 msgid "Custom _message"
-msgstr "تأليف رسالة"
+msgstr "إر_سال رسالة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
 msgid "Custom alarm sound"
-msgstr ""
+msgstr "صوت نغمة مشغول"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 #, fuzzy
 msgid "Mes_sage:"
-msgstr "ال_رسائل"
+msgstr "أ_سماء مساحات العمل:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "عزف صوت"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
+#, fuzzy
 msgid "Pop up an alert"
-msgstr ""
+msgstr "تنبيه المفاتيح البطيئة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "تشغيل برنامج"
 
@@ -5206,29 +5703,29 @@ msgid "Send To:"
 msgstr "إرسال إلى:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "إرسال بريد إلكتروني"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #, fuzzy
 msgid "_Arguments:"
-msgstr "ال_قِسْم:"
+msgstr "المتغيرات"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 #, fuzzy
 msgid "_Program:"
-msgstr "تشغيل البرنامج:"
+msgstr "البرنامج"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 #, fuzzy
 msgid "_Repeat the alarm"
-msgstr "تكرار التّنبيه"
+msgstr "ساعة منبهة"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 #, fuzzy
 msgid "_Sound:"
-msgstr "ال_حساب:"
+msgstr "صوت"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
@@ -5238,8 +5735,10 @@ msgstr "بعد"
 msgid "before"
 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/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "أيّام"
 
@@ -5255,13 +5754,6 @@ msgstr "مرّات إضافيّة كل"
 msgid "hour(s)"
 msgstr "ساعات"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "ساعات"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "دقائق"
@@ -5270,7 +5762,7 @@ msgstr "دقائق"
 msgid "start of appointment"
 msgstr "بداية الموعد"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "الإجراء/المحفّز"
 
@@ -5279,508 +5771,358 @@ msgid "A_dd"
 msgstr "إ_ضافة"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "المنبّهات"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fك"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fم"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fغ"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "مُرفق"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "إ_زالة"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-#, fuzzy
-msgid "_Properties"
-msgstr "خصائص"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-#, fuzzy
-msgid "_Add attachment..."
-msgstr "إضافة مُرفق..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../composer/e-msg-composer-select-file.c:98
+#: ../composer/e-msg-composer-select-file.c:118
 #, fuzzy
-msgid "Attachment Bar"
-msgstr "المُرفق"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
+msgid "_Suggest automatic display of attachment"
 msgstr "إقتراح العرض التّلقائي للمُرفق"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
 msgid "Attach file(s)"
 msgstr "إرفاق الملف (أو الملفّات)"
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "لا يمكن إرفاق الملف %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr "خصائص المُرفق"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "الوصف:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
-msgstr "إسم الملف:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr "نوع MIME:"
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "مفعّل"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-#, fuzzy
-msgid "Are you sure you want to remove this URL?"
-msgstr "هل تريد فعلاً حذف هذا الحساب؟"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "حذف"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
 #, fuzzy
-msgid "Don't Remove"
-msgstr "لا تستورد"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "تعطيل"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "تفعيل"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 دقائق"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 دقائق"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 دقيقة"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 دقيقة"
+msgid "Selected Calendars for Alarms"
+msgstr "الرزنامات التي ستشغل المنبّهات لها"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 دقيقة"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#, fuzzy
-msgid "<b>Alerts</b>"
-msgstr "<b>يبدء:</b> "
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../mail/mail-config.glade.h:8
 #, fuzzy
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>خيارات الرُّزنامة</b>"
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">ألوان</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "<b>General</b>"
-msgstr "عام"
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<b>خيارات الرُّزنامة</b>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
 #, fuzzy
-msgid "<b>Publishing</b>"
-msgstr "معلومات متوفّر/مشغول"
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">عام</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
-msgid "<b>Task List</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span·weight=\"bold\">أعمدة القوائم</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
-msgid "<b>Time</b>"
-msgstr "<b>مستحَق:</b> "
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">ألوان</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
-msgid "<b>Work Week</b>"
-msgstr "أسبوع عمل"
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "تعيينات الرُّزنامة و المهام"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "لون المهام التي فات موعدها"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "لون المهام المستحقّة اليوم"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr "اليوم _ينتهي:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "أيّام"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Display"
-msgstr "ال_معرض"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_تفعيل"
+msgstr "الشاشة"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Free/Busy"
-msgstr "عنوان _حرّ/مشغول:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "الجمعة"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "ساعات"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "دقائق"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#, fuzzy
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr "الدقائق ال 30 الأخيرة"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "الإثنين"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#, fuzzy
-msgid "Publishing Table"
-msgstr "أزرق بنفسجي"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "إنتقي لوناً"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
 msgstr "الأ_حد"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "السّبت"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Select the calendars for alarm notification"
+msgstr "خدمة التبليغ لمنبِّه رُزنامة إيفُليوشِن"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
 msgstr "إ_ظهار علامة تذكير"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "إظهار أر_قام الأسابيع في متصفّح التّواريخ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "الأحد"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
 msgstr "ال_مهام المستحقّة اليوم:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "T_hu"
 msgstr "ال_خميس"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
 msgid "Template:"
-msgstr ""
+msgstr "قالب"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "الخميس"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "المنطقة ال_زّمنيّة:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "صيغة الوقت:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "الثّلاثاء"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "يبدأ الأ_سبوع:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "الأربعاء"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#, fuzzy
+msgid "Wee_k starts on:"
+msgstr "على هذا الحاسوب"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Work days:"
 msgstr "أيّام العمل:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ساعة (صباحاً/مساءً)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
 msgstr "_24 ساعة"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#, fuzzy
-msgid "_Add URL"
-msgstr "إ_ضافة"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr "_طلب التّأكيد عند حذف العناصر"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "_ضغط نهايات الأسابيع في مشهد الشّهر"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
 msgstr "ال_يوم يبدء:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Fri"
 msgstr "ال_جمعة"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr "إ_خفاء المهام المُنجزة بعد"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Mon"
 msgstr "الإ_ثنين"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
 msgstr "المهام ال_فائت موعدها:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Sat"
 msgstr "ال_سّبت"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+#, fuzzy
+msgid "_Show appointment end times in week and month view"
 msgstr "_عرض أوقات نهاية المواعيد في مشاهد الأسبوع و الشّهر"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
 msgstr "_أجزاء الوقت:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Tue"
 msgstr "الثُّ_لاثاء"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Wed"
 msgstr "الأ_ربعاء"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
+#: ../calendar/gui/dialogs/calendar-setup.c:288
+msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
-msgid "Copy calendar contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Copy task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 #, fuzzy
 msgid "C_olor:"
-msgstr "الأ_لوان"
+msgstr "ل_ون:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 #, fuzzy
-msgid "Tasks List"
-msgstr "قائمة المهام"
+msgid "Task List"
+msgstr "<b>خيارات قائمة المهام</b>"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#, fuzzy
+msgid "Memo List"
+msgstr "قائمة الحسابات"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:479
 #, fuzzy
 msgid "Calendar Properties"
-msgstr "خصائص المجلّد"
+msgstr "خصائص القائمة"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:481
+msgid "New Calendar"
+msgstr "رُزنامة جديدة"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:566
 #, fuzzy
 msgid "Task List Properties"
-msgstr "مجموعة قائمة المهام"
+msgstr "<b>خيارات قائمة المهام</b>"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:632
+#, fuzzy
+msgid "New Memo List"
+msgstr "قائمة مراسَلين جديدة"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #, fuzzy
 msgid "Add Calendar"
 msgstr "إضافة رزنامةً جديدة"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 #, fuzzy
 msgid "Add Task List"
 msgstr "إضافة قائمة مهام جديدة"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "إنتقي لوناً"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "إضافة رزنامةً جديدة"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Task List"
 msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 #, fuzzy
 msgid "_Refresh:"
 msgstr "إعادة التّحميل"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
 #, fuzzy
 msgid "_URL:"
-msgstr "العنوان"
+msgstr "الع_نوان:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "أسابيع"
@@ -5829,130 +6171,169 @@ msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه ال
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، هل تريد تحديث المحرّر؟"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
 msgstr "خطأ في التّصديق: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
 msgid " to "
 msgstr " إلى "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
 msgid " (Completed "
 msgstr " (مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
 msgid "Completed "
 msgstr "مُنجز "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
 msgid " (Due "
 msgstr " (مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
 msgid "Due "
 msgstr "مُستحق "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2889
 #, fuzzy, c-format
 msgid "Attached message - %s"
-msgstr "فشل وضع الرّسالة %s في الذّاكرة المخبّأة: %s"
+msgstr "إر_سال رسالة"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2894
+#: ../composer/e-msg-composer.c:3090
 #, fuzzy, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] "إرفاق الرّسالة الأصليّة"
+msgstr[0] "إر_سال رسالة"
 msgstr[1] "إرفاق الرّسالة الأصليّة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_نسخ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3154
+#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1921
 msgid "_Move"
 msgstr "_نقل"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3156
+#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1923
 #, fuzzy
 msgid "Cancel _Drag"
-msgstr "إلغاء المهمة"
+msgstr "سحب العتبة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:820
 msgid "Could not update object"
 msgstr "لم يمكن تحديث الجسم"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2502
 #, fuzzy, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "مرفق %s"
+msgstr[0] "مُرفق"
 msgstr[1] "مرفق %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
+#: ../calendar/gui/dialogs/comp-editor.c:998
+#, fuzzy
+msgid "Hide Attachment _Bar"
+msgstr "شريط قوائم مخصّص"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../calendar/gui/dialogs/comp-editor.c:1486
+#, fuzzy
+msgid "Show Attachment _Bar"
+msgstr "عرض عمود ال_قوائم"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3652
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "إ_زالة"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3653 ../mail/em-folder-tree.c:2081
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+#, fuzzy
+msgid "_Properties"
+msgstr "_خاصيات"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3655
+#, fuzzy
+msgid "_Add attachment..."
+msgstr "مُرفق للإضافة."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1510
+#: ../mail/em-format-html-display.c:2286
+#, fuzzy
+msgid "Show Attachments"
+msgstr "اظهار التفاصيل"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1511
+msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:2118
+#: ../calendar/gui/dialogs/comp-editor.c:2161
 msgid "Edit Appointment"
 msgstr "تحرير الموعد"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2167
 #, fuzzy, c-format
 msgid "Meeting - %s"
-msgstr "إجتماع"
+msgstr "إجتماع جديد"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2169
 #, c-format
 msgid "Appointment - %s"
 msgstr "الموعد - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2173
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
-msgstr "تعيين مهمّة"
+msgstr "ت_كليف بالمهمّة"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2175
 #, c-format
 msgid "Task - %s"
 msgstr "المهمّة - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:2135
+#: ../calendar/gui/dialogs/comp-editor.c:2178
 #, c-format
 msgid "Journal entry - %s"
 msgstr "خانة السّجل - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2188
 msgid "No summary"
 msgstr "دون ملخّص"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2733
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:350
+msgid "attachment"
+msgstr "مُرفق"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2876
+#: ../calendar/gui/dialogs/comp-editor.c:2900
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "قد تهمل التّغييرات التي أُجريت لهذا العنصر في حال وصول تحديث"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "لم يمكن الحصول على الإصدارة الحاليّة!"
@@ -5960,15 +6341,20 @@ msgstr "لم يمكن الحصول على الإصدارة الحاليّة!"
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 #, fuzzy
 msgid "Could not open source"
-msgstr "لم يمكن تحديث الجسم"
+msgstr "لم يمكن فتح المجلّد %s: %s"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 #, fuzzy
 msgid "Could not open destination"
-msgstr "وجهة النشر"
+msgstr "لم يمكن فتح المجلّد %s: %s"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#, fuzzy
 msgid "Destination is read only"
+msgstr "القرص المقصود قابل للقراءة فقط."
+
+#: ../calendar/gui/dialogs/delete-comp.c:206
+msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/delete-error.c:54
@@ -6033,266 +6419,210 @@ msgstr "تفويض لـ:"
 msgid "Enter Delegate"
 msgstr "إدراج المفوَّض"
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
+#: ../calendar/gui/dialogs/event-editor.c:564
+#, fuzzy
+msgid "Appoint_ment"
 msgstr "موعد"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "التّكرار"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "الجدولة"
+#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:2717
+#, fuzzy
+msgid "This event has alarms"
+msgstr "تم حذف هذا الحدث."
 
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.c:441
 #, fuzzy
-msgid "Delegatees"
-msgstr "مفوّض"
+msgid "Or_ganizer:"
+msgstr "ال_منظّمة:"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
+#: ../calendar/gui/dialogs/event-page.c:920
 #, fuzzy
-msgid "Attendees"
-msgstr "الحاضر"
+msgid "_Delegatees"
+msgstr "مفوّض"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
+#: ../calendar/gui/dialogs/event-page.c:922
 #, fuzzy
-msgid "Invitations"
-msgstr "الإتّجاه"
+msgid "Atte_ndees"
+msgstr "الحاضر"
 
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1087
 #, fuzzy
 msgid "Event with no start date"
 msgstr "تاريخ الإستحقاق يقع قبل تاريخ البدء!"
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1090
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "تاريخ البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "End date is wrong"
 msgstr "تاريخ الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1292
 msgid "Start time is wrong"
 msgstr "زمن البدء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "End time is wrong"
 msgstr "زمن الإنتهاء خاطئ"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1454
+#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/task-page.c:906
+msgid "The organizer selected no longer has an account."
+msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
+
+#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:912
+msgid "An organizer is required."
+msgstr "مطلوب منظّم."
+
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/task-page.c:927
+msgid "At least one attendee is required."
+msgstr "تحتاج إلى حاضرٍ واحد على الأقل."
+
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/task-page.c:1200
+#, fuzzy
+msgid "_Add "
+msgstr "إ_ضافة"
+
+#: ../calendar/gui/dialogs/event-page.c:2624
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
-msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+msgstr "تعذر فتح المستند"
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, fuzzy, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "قبل كل موعد"
 msgstr[1] "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/event-page.c:1900
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, fuzzy, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "نهاية الموعد"
+msgstr[0] "قبل كل موعد"
 msgstr[1] "نهاية الموعد"
 
-#: ../calendar/gui/dialogs/event-page.c:1908
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, fuzzy, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "قبل كل موعد"
 msgstr[1] "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:2955
+#, fuzzy
+msgid "Customize"
+msgstr "تخ_صيص أعمدة الأدوات..."
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1739
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
+#: ../widgets/misc/e-dateedit.c:1721
+msgid "None"
+msgstr "لا شيء"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 #, fuzzy
 msgid "1 day before appointment"
 msgstr "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 #, fuzzy
 msgid "1 hour before appointment"
 msgstr "قبل كل موعد"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
 msgid "15 minutes before appointment"
 msgstr "قبل كل موعد"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
-msgid "<b>Basics</b>"
-msgstr "<b>الحالة:</b>"
+msgid "Attendee_s..."
+msgstr "الحاضر"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
-msgid "<b>Date and Time</b>"
-msgstr "التاريخ و الوقت"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Send Options</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "حدث يستغرق _يوماً كاملاً"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
-msgid "C_ustomize..."
-msgstr "حفظ المشهد المخصّص..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "ال_فئات..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #, fuzzy
-msgid "Cale_ndar:"
-msgstr "الر_زنامة:"
+msgid "Custom Alarm:"
+msgstr "ساعة منبهة"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:3
 #, fuzzy
-msgid "Classi_fication:"
-msgstr "التّصنيف"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "سرّي"
+msgid "D_escription:"
+msgstr "الوصف:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
 msgid "Event Description"
-msgstr "الوصف"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
-msgid "Locat_ion:"
-msgstr "الموقع:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "خاص"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "عام"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#, fuzzy
-msgid "Show time as _busy"
-msgstr "عرض الوقت كـ"
+msgstr "الوصف يحتوي على"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "م_لخّص:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #, fuzzy
 msgid "_Alarm"
-msgstr "المنبّهات"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-#, fuzzy
-msgid "_Description:"
-msgstr "الوصف:"
+msgstr "ساعة منبهة"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "زمن الإ_نتهاء:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "زمن ال_بدء"
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>الحالة:</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.c:307
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #, fuzzy
-msgid "<b>From:</b>"
-msgstr "<b>مستحَق:</b> "
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "لا شيء"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "مطلوب منظّم."
+msgid "_Time:"
+msgstr "ال_وقت:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-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/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
+msgstr "لـ"
 
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-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])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
+msgstr "حتّى"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "الحاضر"
@@ -6327,18 +6657,18 @@ msgstr "اللّغة"
 msgid "Member"
 msgstr "عضو"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
+#: ../calendar/gui/e-meeting-list-view.c:510
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "تأكيد الحضور"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-list-view.c:521
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:16
 msgid "Status"
 msgstr "الحالة"
 
@@ -6350,18 +6680,12 @@ msgstr "<b>ينتهي:</b> "
 #: ../calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
 msgid "C_hange Organizer"
-msgstr "_تغيير المنظّم"
+msgstr "تغ_يير حالة الأحرف"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
 #, fuzzy
-msgid "Con_tacts..."
-msgstr "المراسَلون"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "Or_ganizer:"
-msgstr "المنظّم:"
+msgid "Co_ntacts..."
+msgstr "الاتّ_صالات:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 #, fuzzy
@@ -6369,62 +6693,109 @@ msgid "Organizer"
 msgstr "المنظّم:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "المنظّم:"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#, fuzzy
+msgid "Memo"
+msgstr "الإثنين"
+
+#: ../calendar/gui/dialogs/memo-page.c:870
+#, fuzzy, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "لم يمكن فتح مجلّد البكرة"
+
+#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+msgid "To"
+msgstr "إلى"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Sta_rt date:"
+msgstr "بحسب _تاريخ التعديل"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#, fuzzy
+msgid "Su_mmary"
+msgstr "م_لخّص:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#, fuzzy
+msgid "T_o:"
+msgstr "الأعلى:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+#, fuzzy
+msgid "_Group:"
+msgstr "مجموعة"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#, fuzzy
+msgid "_Memo Content:"
+msgstr "<b>محتوى الانترنت</b>"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>خيارات الرُّزنامة</b>"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "Add New Calendar"
 msgstr "إضافة رزنامةً جديدة"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Calendar Group"
 msgstr "مجموعة الرُّزنامة"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Location"
 msgstr "موقع الرُّزنامة"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Name"
 msgstr "إسم الرُّزنامة"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
 msgid "<b>Task List Options</b>"
 msgstr "<b>خيارات قائمة المهام</b>"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "Add New Task List"
 msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Task List Group"
 msgstr "مجموعة قائمة المهام"
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Name"
 msgstr "إسم قائمة المهام"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+#, fuzzy
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "إنّك بصدد تعديل حدث متكرّر، ما الذي تود تعديله؟"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, fuzzy
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "إنّك بصدد تعديل حدث متكرّر، ما الذي تود تعديله؟"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+#, fuzzy
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "إنّك·بصدد·تعديل·مهمّة·متكرّرة،·ما·الذي·تود·تعديله؟"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
+#, fuzzy
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+"You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "إنّك·بصدد·تعديل·خانة سجلّ·متكرّرة،·ما·الذي·تود·تعديله؟"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6443,55 +6814,133 @@ msgstr "هذا النموذج و الأنمذجة القادمة"
 msgid "All Instances"
 msgstr "كل الأنمذجة"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "يحتوي هذا الموعد متكرّرات لا يستطيع إيفُليوشِن أن يعدّلها."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr "تاريخ التّكرار غير صحيح"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr "يعمل"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:996
 msgid "first"
 msgstr "الأوّل"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "second"
 msgstr "الثّاني"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1007
 msgid "third"
 msgstr "الثّالث"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1012
 msgid "fourth"
 msgstr "الرّابع"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "last"
 msgstr "الأخير"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "Other Date"
 msgstr "تاريخ آخر"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#, fuzzy
+msgid "1st to 10th"
+msgstr "ا_ستعادة الحالة الأصلية"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#, fuzzy
+msgid "11th to 20th"
+msgstr "ا_ستعادة الحالة الأصلية"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#, fuzzy
+msgid "21st to 31st"
+msgstr "ا_ستعادة الحالة الأصلية"
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr "اليوم"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr "عند"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "حادثات"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#, fuzzy
+msgid "Add exception"
+msgstr "إرجاع إستثناء: %s"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#, fuzzy
+msgid "Could not get a selection to modify."
+msgstr "قص النّص المنتقى للحافظة الوسيطة"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#, fuzzy
+msgid "Modify exception"
+msgstr "إرجاع إستثناء: %s"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#, fuzzy
+msgid "Could not get a selection to delete."
+msgstr "لم يمكن تحديث الجسم"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2385
 msgid "Date/Time"
 msgstr "التّاريخ/الوقت"
 
@@ -6501,46 +6950,48 @@ msgid "<b>Exceptions</b>"
 msgstr "الإستثنائات"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 #, fuzzy
 msgid "<b>Preview</b>"
-msgstr "لمحة"
+msgstr "<b>لمحة</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
 msgid "<b>Recurrence</b>"
 msgstr "التّكرار"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. 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:6
 msgid "Every"
 msgstr "كل"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. 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:9
 #, fuzzy
 msgid "This appointment rec_urs"
 msgstr "_تحرير الموعد"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "لـ"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "إلى الأبد"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "شهور"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "حتّى"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "أسابيع"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "سنين"
 
@@ -6549,342 +7000,368 @@ msgstr "سنين"
 msgid "Completed date is wrong"
 msgstr "التاريخ المكمُّل خاطئ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:517
 #, fuzzy
 msgid "Web Page"
-msgstr "صفحة الإنترنت:"
+msgstr "_صفحة الإنترنت:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 #, fuzzy
 msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "التّبليغ بالبريد الجديد"
+msgstr "<span weight=\"bold\">ألوان</span>"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
+#, fuzzy
 msgid "<span weight=\"bold\">Status</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "مُنجز"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1032
 msgid "High"
 msgstr "مرتفع"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "جاري العمل"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1030
 msgid "Low"
 msgstr "منخفض"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1031
 msgid "Normal"
 msgstr "عادي"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "لم يباشَر"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
 msgid "P_ercent complete:"
-msgstr "النّسبة المكتملة: %i"
+msgstr "تمَّ التّحديث\n"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#, fuzzy
+msgid "Stat_us:"
+msgstr "الولايات المتحدة عالمي"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:390
 msgid "Undefined"
 msgstr "غير معرّف"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #, fuzzy
 msgid "_Date completed:"
-msgstr "_تاريخ الإنتهاء:"
+msgstr "التاريخ المكمُّل خاطئ"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Priority:"
 msgstr "الأ_ولويّة:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "ال_حالة:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr "_صفحة الإنترنت:"
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "مهمَّة"
+#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_مهمّة"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr "مهمّة"
+#: ../calendar/gui/dialogs/task-editor.c:429
+#, fuzzy
+msgid "Task Details"
+msgstr "اظهار التفاصيل"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr "تاريخ الإستحقاق خاطئ"
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1650
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "لم يمكن فتح دفتر العناوين"
+msgstr "لم يمكن فتح مجلّد البكرة"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
-msgid "D_escription:"
-msgstr "الوصف:"
+msgid "Atte_ndees..."
+msgstr "الحاضر"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
-msgid "Sta_rt date:"
-msgstr "تاريخ ال_بدء:"
+msgid "Categor_ies..."
+msgstr "ال_فئات..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Task Description"
-msgstr "الوصف"
+msgid "Or_ganiser:"
+msgstr "ال_منظّمة:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:7
 #, fuzzy
-msgid "_Due date:"
-msgstr "تاريخ الإ_ستحقاق:"
+msgid "Time zone:"
+msgstr "المنطقة الزمنيّة:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
+#: ../calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
-msgid "_Group:"
-msgstr "مجموعة:"
+msgid "_Due date:"
+msgstr "تاريخ الإستحقاق:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>خيارات الرُّزنامة</b>"
+msgstr "معلومات متوفّر/مشغول"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Publishing Frequency</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 #, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "معلومات متوفّر/مشغول"
+msgstr "فتح الموقع %s"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
 msgid "Free/Busy Publishing Settings"
-msgstr "طلب متوفّر/مشغول"
+msgstr "رسالة متوفّر/مشغول رديئة"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
 msgid "_Daily"
 msgstr "اليوم"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
 msgid "_Manual"
-msgstr "_بريد:"
+msgstr "فتح الدليل"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 #, fuzzy
 msgid "_Password:"
-msgstr "كلمة السّر"
+msgstr "_كلمة السر:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 #, fuzzy
 msgid "_Remember password"
-msgstr "تذكر كلمة السّر هذه"
+msgstr "تذكّر كلمة المرور هذه"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 #, fuzzy
 msgid "_Username:"
 msgstr "إ_سم المستخدم:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #, fuzzy
 msgid "_Weekly"
 msgstr "الأسبوع"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
 #, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d يوم"
+msgstr[0] "اليوم"
 msgstr[1] "%d يوم"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
 #, fuzzy, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] "%d أسابيع"
+msgstr[0] "أسابيع"
 msgstr[1] "%d أسابيع"
 
-#: ../calendar/gui/e-alarm-list.c:405
-#, fuzzy, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ساعات"
-msgstr[1] "%d ساعات"
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, fuzzy, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d دقائق"
-msgstr[1] "%d دقائق"
-
-#: ../calendar/gui/e-alarm-list.c:415
-#, fuzzy, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ثواني"
-msgstr[1] "%d ثواني"
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "العمليّة المطلوب إجراؤها مجهولة"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s قبل إبتداء الموعد"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s بعد إبتداء الموعد"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s عند إبتداء الموعد"
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. 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:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s قبل إنتهاء الموعد"
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. 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:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s بعد إنتهاء الموعد"
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s عند إنتهاء الموعد"
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. 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:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s عند %s"
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s لنوعيّة إطلاق مجهولة"
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2879
 #, fuzzy, c-format
 msgid "Click to open %s"
-msgstr "نقر لإضافة مهمّة"
+msgstr "نقرة واحدة لفتح الأيقونات"
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:155
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "بدون عنوان"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "الملخّص:"
-
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "تاريخ البدء:"
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "الوصف:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr "صفحة الإنترنت:"
+
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
+msgstr "الملخّص:"
+
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "تاريخ الإستحقاق:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:961
 msgid "Status:"
 msgstr "الحالة:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "الأولويّة:"
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "صفحة الإنترنت:"
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+msgid "Public"
+msgstr "عام"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Private"
+msgstr "خاص"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:367
+msgid "Confidential"
+msgstr "سرّي"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #, fuzzy
 msgid "End Date"
-msgstr "التّاريخ"
+msgstr "تاريخ الإنتهاء خاطئ"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "الملخّص"
 
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:439
 msgid "Free"
 msgstr "متوفّر"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:440
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:610
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6894,171 +7371,208 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:764
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "نعم"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:178
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "لا"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1330
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1764
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:710
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:926
 msgid "Recurring"
 msgstr "متكرّر"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:928
 msgid "Assigned"
 msgstr "مكلّف"
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "حفظ كـ..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#, fuzzy, c-format
+msgid "untitled_image.%s"
+msgstr "صورة الفيديو"
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
+#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "_حفظ كـ..."
+
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+msgid "Set as _Background"
+msgstr "ضبط ك_خلفية"
+
+#: ../calendar/gui/e-cal-popup.c:278
+#, fuzzy
+msgid "_Save Selected"
+msgstr "اليوم المنتقى (%a %b %d %Y)"
+
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#, c-format
+msgid "Open in %s..."
+msgstr "فتح في %s..."
+
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
-msgid "Task Table"
-msgstr "تحديث المهمّة"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
 msgid "Deleting selected objects"
 msgstr "جاري حذف الأجسام المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
 msgid "Updating objects"
 msgstr "جاري تحديث الأجسام"
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1106
+#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "حفظ كـ..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1277
+#: ../calendar/gui/e-calendar-view.c:1681
+#, fuzzy
+msgid "New _Task"
+msgstr "مهمّة جديدة"
+
+#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
 msgid "Open _Web Page"
 msgstr "فتح _صفحة الإنترنت"
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_حفظ كـ..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1123
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_طبع..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1287
+#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_قص"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "_لصق"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ت_كليف بالمهمّة"
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ت_مرير كآيكلَندر"
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1295
 msgid "_Mark as Complete"
 msgstr "_تعليم كمكتمل"
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_تعليم المهام المنتقاة كمكتملة"
 
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_حذف"
+#: ../calendar/gui/e-calendar-table.c:1297
+#, fuzzy
+msgid "_Mark as Incomplete"
+msgstr "_تعليم كمكتمل"
+
+#: ../calendar/gui/e-calendar-table.c:1298
+#, fuzzy
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "_تعليم المهام المنتقاة كمكتملة"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1303
 msgid "_Delete Selected Tasks"
 msgstr "_حذف المهام المنتقاة"
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1536
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "نقر لإضافة مهمّة"
@@ -7068,19 +7582,19 @@ msgstr "نقر لإضافة مهمّة"
 msgid "% Complete"
 msgstr "% تمة"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
 msgid "Complete"
 msgstr "تام"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
-msgstr "تاريخ الإتمام"
+msgstr "تاريخ آخر"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
-msgstr "تاريخ الإستحقاق"
+msgstr "تاريخ الإستحقاق:"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../plugins/save-calendar/csv-format.c:397
@@ -7090,111 +7604,132 @@ msgstr "الأولويّة"
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
-msgstr "تاريخ البدء"
+msgstr "تاريخ البدء:"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "ترتيب المهام"
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1367
 #, fuzzy
 msgid "Moving items"
-msgstr "جاري نقل الرّسائل"
+msgstr "إنشاء عناصر"
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1369
 #, fuzzy
 msgid "Copying items"
-msgstr "جاري نسخ الرّسائل"
+msgstr "إنشاء عناصر"
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "New _Appointment..."
 msgstr "_موعد جديد..."
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1679
 msgid "New All Day _Event"
 msgstr "_حدث جديد يستغرق يوماً كاملاً"
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "مهمّة جديدة"
+#: ../calendar/gui/e-calendar-view.c:1680
+#, fuzzy
+msgid "New _Meeting"
+msgstr "إجتماع جديد"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "المشهد الحالي"
+#: ../calendar/gui/e-calendar-view.c:1691
+msgid "_Current View"
+msgstr "المشهد ال_حالي"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
+#: ../calendar/gui/e-calendar-view.c:1693
 #, fuzzy
-msgid "Select _Today"
-msgstr "إختيار ال_شّعبة"
+msgid "Select T_oday"
+msgstr "إنتقاء ملف"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1694
 #, fuzzy
 msgid "_Select Date..."
-msgstr "إ_نتقاء..."
-
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "_نشر معلومات متوفّر/مشغول"
+msgstr "انتقِ تاريخاً"
 
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1710
 #, fuzzy
 msgid "Cop_y to Calendar..."
-msgstr "نسخ إلى مجلّد..."
+msgstr "الإشتراك في رزنامة"
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1711
 #, fuzzy
 msgid "Mo_ve to Calendar..."
-msgstr "_نقل للمجلّد..."
+msgstr "_نقل لسلة المهملات"
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1712
 #, fuzzy
 msgid "_Delegate Meeting..."
-msgstr "_جدوِلة الأجتماع"
+msgstr "إجتماع جديد"
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1713
 msgid "_Schedule Meeting..."
 msgstr "_جدوِلة الأجتماع"
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1714
 msgid "_Forward as iCalendar..."
 msgstr "ت_مرير كآيكلَندر..."
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1715
+#, fuzzy
+msgid "_Reply"
+msgstr "رد"
+
+#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "الرّد على ال_كل"
+
+#: ../calendar/gui/e-calendar-view.c:1721
 #, fuzzy
 msgid "Make this Occurrence _Movable"
-msgstr "حذف هذا الحدث"
+msgstr "_جعل هذا حسابي الإفتراضي"
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "حذف هذا ال_حدث"
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1723
 msgid "Delete _All Occurrences"
 msgstr "حذف _كل الأحداث"
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2175
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "المنظّم:"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2179
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "المنظّم:"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "الموقع"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2226
+#, fuzzy, c-format
+msgid "Time: %s %s"
+msgstr "الوقت"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7205,7 +7740,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. 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:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "أقسام بـ %02i دقيقة"
@@ -7216,542 +7755,570 @@ msgstr "أقسام بـ %02i دقيقة"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 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:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "ص"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "م"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "نعم (تكرار مركّب)"
 
-#: ../calendar/gui/e-itip-control.c:774
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:775
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
-msgstr[0] "كل يوم"
+msgstr[0] "آخر يوم"
 msgstr[1] "كل يوم"
 
-#: ../calendar/gui/e-itip-control.c:779
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
-msgstr[0] "كل أسبوع"
+msgstr[0] "مشهد الأسبوع"
 msgstr[1] "كل أسبوع"
 
-#: ../calendar/gui/e-itip-control.c:781
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:789
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
-msgstr[0] "أسبوعيّاً يوم"
+msgstr[0] "يشغل دائما كل تسجيل دخول."
 msgstr[1] "أسبوعيّاً يوم"
 
-#: ../calendar/gui/e-itip-control.c:789
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:798
 msgid " and "
 msgstr " و "
 
-#: ../calendar/gui/e-itip-control.c:796
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s day of "
 msgstr "اليوم %s من "
 
-#: ../calendar/gui/e-itip-control.c:809
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "The %s %s of "
 msgstr "ال %s %s من "
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:834
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
-msgstr[0] "كل شهر"
+msgstr[0] "مشهد الشّهر"
 msgstr[1] "كل شهر"
 
-#: ../calendar/gui/e-itip-control.c:820
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:843
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
-msgstr[0] "كل سنة"
+msgstr[0] "السّنة المنتقاة (%Y)"
 msgstr[1] "كل سنة"
 
-#: ../calendar/gui/e-itip-control.c:831
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:856
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] "إجمالي %d مرّات"
+msgstr[0] "وقت غير سليم"
 msgstr[1] "إجمالي %d مرّات"
 
-#: ../calendar/gui/e-itip-control.c:840
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:866
 msgid ", ending on "
 msgstr "، إنتهاءً عند"
 
-#: ../calendar/gui/e-itip-control.c:864
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:888
 #, fuzzy
 msgid "Starts"
-msgstr "الحالة"
+msgstr "يبدء بـ"
 
-#: ../calendar/gui/e-itip-control.c:877
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:902
+#, fuzzy
 msgid "Ends"
-msgstr ""
+msgstr "اليوم _ينتهي:"
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:936
 #: ../plugins/save-calendar/csv-format.c:395
 #, fuzzy
 msgid "Due"
-msgstr "مُستحق "
+msgstr " (مُستحق "
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
 msgid "iCalendar Information"
 msgstr "معلومات آي-كلَندر"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:993
 msgid "iCalendar Error"
 msgstr "خطأ آي-كلَندر"
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
+#: ../plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:479
 msgid "An unknown person"
 msgstr "شخص مجهول"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1116
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> الرجاء مراجعة المعلومات التّالية ثم إختيار إجراءً من القائمة أدناه."
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/itip-utils.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "مقبول"
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "مقبول مبدئيّاً"
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
+#: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "مرفوض"
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1256
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1258
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "نشر <b>%s</b> معلومات الإجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1338
 msgid "Meeting Information"
 msgstr "معلومات الإجتماع"
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "يطلب <b>%s</b>·حضور %s عند إجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "يطلب <b>%s</b> حضورك إلى إجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Proposal"
 msgstr "إقتراح إجتماع"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
 msgstr "تحديث إجتماع"
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "يود <b>%s</b> إستلام آخر معلومات الإجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Update Request"
 msgstr "طلب تحديث إجتماع"
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Reply"
 msgstr "رد اجتماع"
 
-#: ../calendar/gui/e-itip-control.c:1349
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr "ألغى <b>%s</b>· إجتماعاً."
+#: ../calendar/gui/e-itip-control.c:1374
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr "نشر <b>%s</b> معلومات الإجتماع."
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
-msgstr "إلغاء إجتماع"
+#: ../calendar/gui/e-itip-control.c:1375
+#, fuzzy
+msgid "Meeting Cancelation"
+msgstr "إجتماع جديد"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1502
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "أرسل <b>%s</b> رسالة غير مفهومة."
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Bad Meeting Message"
 msgstr "رسالة إجتماع رديئة"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "نشر <b>%s</b> معلومات مَهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Task Information"
 msgstr "معلومات المهمّة"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "يطلب <b>%s</b> من %s أن يؤدّي مهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "يطلب <b>%s</b> منك أن تؤدّي مهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Proposal"
 msgstr "إقتراح مهمّة"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "يود·<b>%s</b> أن يضيف إلى مهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
 msgstr "تحديث المهمّة"
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "يود <b>%s</b> أن يستلم آخر معلومات المهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Task Update Request"
 msgstr "طلب تحديث المهمّة"
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "ردّ على <b>%s</b> تكليفٍ بمهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Reply"
 msgstr "رد مهمّة"
 
-#: ../calendar/gui/e-itip-control.c:1426
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "ألغى <b>%s</b> مهمّة."
+#: ../calendar/gui/e-itip-control.c:1451
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr "نشر <b>%s</b> معلومات مَهمّة."
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
-msgstr "إلغاء مهمّة"
+#: ../calendar/gui/e-itip-control.c:1452
+#, fuzzy
+msgid "Task Cancelation"
+msgstr "ت_كليف بالمهمّة"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Bad Task Message"
 msgstr "رسالة مهمّة رديئة"
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1487
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "نشر <b>%s</b> معلومات متوفّر/مشغول."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Free/Busy Information"
 msgstr "معلومات متوفّر/مشغول"
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1492
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "يطلب <b>%s</b>·معلومات متوفّر/مشغول الخاصّة بك."
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1493
 msgid "Free/Busy Request"
 msgstr "طلب متوفّر/مشغول"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1497
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ردّ <b>%s</b>·على طلب متوفّر/مشغول."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1498
 msgid "Free/Busy Reply"
 msgstr "رد متفرّغ/مشغول"
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1503
 msgid "Bad Free/Busy Message"
 msgstr "رسالة متوفّر/مشغول رديئة"
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1578
 msgid "The message does not appear to be properly formed"
 msgstr "لا تبدو الرّسالة مبنيّة بشكل صحيح"
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1637
 msgid "The message contains only unsupported requests."
 msgstr "هذه الرّسالة تحتوي فقط طلبات غير مدعومة."
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment does not contain a valid calendar message"
 msgstr "لا يحتوي هذا الملحق على رسالة رُزنامة صحيحة"
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1702
 msgid "The attachment has no viewable calendar items"
 msgstr "الملحق لا يحتوي أيّة عناصر رُزنامة قابلة للعرض"
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Update complete\n"
 msgstr "تمَّ التّحديث\n"
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1964
 msgid "Object is invalid and cannot be updated\n"
 msgstr "الكائن غير صالح و لا يمكن تحديثه\n"
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "هذه الإستجابه ليست من حاضرٍٍ حالي.  هل يضاف كحاضر؟"
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "حالة الحاضر لم يمكن تحديثها بسبب حالة غير صالحة!\n"
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:2003
 msgid "Attendee status updated\n"
 msgstr "تم تحديث حالة الحاضر\n"
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:2006
+#: ../plugins/itip-formatter/itip-formatter.c:1104
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجوداً"
 
-#: ../calendar/gui/e-itip-control.c:2011
-msgid "Removal Complete"
-msgstr "تمَّ الحذف"
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
 msgid "Item sent!\n"
 msgstr "تم إرسال العنصر!\n"
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
 msgid "The item could not be sent!\n"
 msgstr "لم يمكن إرسال العنصر!\n"
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2162
 msgid "Choose an action:"
 msgstr "إختيار إجراءً:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "تحديث"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "تقبّل"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "تقبّل مبدئيّاً"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "رفض"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "إرسال معلومات متوفّر/مشغول"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "تحديث حالة المستجيب"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "إرسال آخر المعلومات"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
+#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr "%P %%"
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--إلى--"
 
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "رسالة رُزنامة"
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "التّاريخ:"
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "جاري تحميل الرُّزنامة"
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "جاري تحميل الرُّزنامة..."
 
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "رسالة النّادل:"
 
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr "تاريخ الإنتهاء"
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr "تاريخ البدء"
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "رؤساء الجلسة"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "المشاركون الإلزاميّون"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "المشاركون الإختياريّون"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "الموارد"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Individual"
 msgstr "فرد"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "مجموعة"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr "المورد"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr "الغرفة"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "الكرسي"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:761
 msgid "Required Participant"
 msgstr "مشارك إلزامي"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr "مشارك إختياري"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr "غير مشارك"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:771
 msgid "Needs Action"
 msgstr "يتطلّب إجراء"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr "مبدئي"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/itip-utils.c:696
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "مفوّض"
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:471
+#, fuzzy
+msgid "Attendee                          "
+msgstr "الحاضر"
+
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "قيد العمل"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:2113
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7759,22 +8326,14 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2146
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -7786,6 +8345,11 @@ msgstr "خارج المكتب"
 msgid "No Information"
 msgstr "لا معلومات"
 
+#: ../calendar/gui/e-meeting-time-sel.c:428
+#, fuzzy
+msgid "A_ttendees..."
+msgstr "الحاضر"
+
 #: ../calendar/gui/e-meeting-time-sel.c:445
 #, fuzzy
 msgid "O_ptions"
@@ -7794,17 +8358,17 @@ msgstr "خيارات"
 #: ../calendar/gui/e-meeting-time-sel.c:462
 #, fuzzy
 msgid "Show _only working hours"
-msgstr "عرض ساعات العمل _فقط"
+msgstr "اظهار عمود العنوان فقط"
 
 #: ../calendar/gui/e-meeting-time-sel.c:472
 #, fuzzy
 msgid "Show _zoomed out"
-msgstr "عرض _مصغّرا"
+msgstr "<b>رسالة خارج المكتب:</b>"
 
 #: ../calendar/gui/e-meeting-time-sel.c:487
 #, fuzzy
 msgid "_Update free/busy"
-msgstr "_تحديث متوفّر/مشغول"
+msgstr "معلومات متوفّر/مشغول"
 
 #: ../calendar/gui/e-meeting-time-sel.c:502
 msgid "_<<"
@@ -7821,7 +8385,7 @@ msgstr ">_>"
 #: ../calendar/gui/e-meeting-time-sel.c:552
 #, fuzzy
 msgid "_All people and resources"
-msgstr "_كل الأشخاص و الموارد"
+msgstr "و كل الورق تحتها"
 
 #: ../calendar/gui/e-meeting-time-sel.c:561
 #, fuzzy
@@ -7831,19 +8395,38 @@ msgstr "كل الأ_شخاص و مورد واحد"
 #: ../calendar/gui/e-meeting-time-sel.c:570
 #, fuzzy
 msgid "_Required people"
-msgstr "الأشخاص الإ_لزاميّون"
+msgstr "الدفع مطلوب"
 
 #: ../calendar/gui/e-meeting-time-sel.c:579
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "الأشخاص الإلزاميّون و _مورد واحد"
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, fuzzy, c-format
-msgid "Enter the password for %s"
-msgstr "ادخل كلمة السر لـ %s"
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr "زمن ال_بدء"
+
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr "زمن الإ_نتهاء:"
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-memo-table.c:919
+#, fuzzy
+msgid "_Delete Selected Memos"
+msgstr "_حذف المهام المنتقاة"
+
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#, fuzzy
+msgid "Click to add a memo"
+msgstr "نقر لإضافة مهمّة"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#, fuzzy
+msgid "Memo sort"
+msgstr "ترتيب المهام"
+
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/gnome-cal.c:2748
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7852,76 +8435,97 @@ msgstr ""
 "خطأ على %s:\n"
 "%s"
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:772
+#, fuzzy
+msgid "Loading memos"
+msgstr "تحميل \"%s\"..."
+
+#: ../calendar/gui/e-memos.c:853
+#, fuzzy, c-format
+msgid "Opening memos at %s"
+msgstr "بدء العدّاد عند:"
+
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+msgid "Deleting selected objects..."
+msgstr "جاري حذف الأجسام المنتقاة..."
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "ادخل كلمة السر لـ %s"
+
+#: ../calendar/gui/e-tasks.c:885
 #, fuzzy
 msgid "Loading tasks"
-msgstr "جاري تحميل الصّور"
+msgstr "المهام ال_فائت موعدها:"
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:972
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
-msgstr "جاري فتح المخزن %s"
+msgstr "بدء العدّاد عند:"
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1217
 msgid "Completing tasks..."
 msgstr "جاري إتمام المهام..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "جاري حذف الأجسام المنتقاة..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1267
 msgid "Expunging"
 msgstr "جاري الشطب"
 
-#: ../calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:135
 #, fuzzy
-msgid "Timezone Button"
-msgstr "المنطقة الزّمنيّة "
+msgid "Select Timezone"
+msgstr "إنتقاء ملف"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:327
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:820
 #, fuzzy
 msgid "Updating query"
-msgstr "جاري تحديث الأجسام"
+msgstr "أرسل الإستفسار"
 
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
+#: ../calendar/gui/gnome-cal.c:2409
+#, fuzzy
+msgid "_Custom View"
 msgstr "مشهد مخصّص"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
+#: ../calendar/gui/gnome-cal.c:2410
+#, fuzzy
+msgid "_Save Custom View"
 msgstr "حفظ المعرض المخصّص"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
+#: ../calendar/gui/gnome-cal.c:2415
+#, fuzzy
+msgid "_Define Views..."
 msgstr "تعريف المشاهد..."
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2579
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
-msgstr "الموعد - %s"
+msgstr "بدء العدّاد عند:"
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2598
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
-msgstr "جاري تحميل الصّور"
+msgstr "بدء العدّاد عند:"
+
+#: ../calendar/gui/gnome-cal.c:2607
+#, fuzzy, c-format
+msgid "Loading memos at %s"
+msgstr "بدء العدّاد عند:"
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2713
 #, fuzzy, c-format
 msgid "Opening %s"
-msgstr "فتح في %s..."
+msgstr "جاري فتح %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3641
 msgid "Purging"
 msgstr "التّنقية"
 
@@ -7972,7 +8576,7 @@ msgstr "أكتوبر"
 #: ../calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "Select Date"
-msgstr "إنتقاء الأسماء"
+msgstr "انتقِ تاريخاً"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -7981,63 +8585,152 @@ msgstr "سبتمبر"
 #: ../calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "_Select Today"
-msgstr "إنتقاء مجلّد"
+msgstr "اليوم عند %-I:%M %p"
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "يجب تعيين منظّم."
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr "حاضرٌ واحد على الأقل ضروري"
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "معلومات الحدث"
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "معلومات المهمّة"
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "معلومات السّجل"
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "معلومات متوفّر/مشغول"
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "معلومات الرُّزنامة"
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "حُدّث"
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "إعادة التّحميل"
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "إقتراح معاكس"
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "معلومات متوفّر/مشغول (%s إلى %s)"
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "معلومات آي-كلندر"
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "يجب أن تكون حاضراً للحدث."
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:451
+#, fuzzy
+msgid "_New Memo List"
+msgstr "قائمة مراسَلين جديدة"
+
+#: ../calendar/gui/memos-component.c:527
+#, fuzzy, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d دقائق"
+msgstr[1] "%d دقائق"
+
+#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:563
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "مُنتقى"
+msgstr[1] "مُنتقى"
+
+#: ../calendar/gui/memos-component.c:576
+#, fuzzy
+msgid "Failed upgrading memos."
+msgstr "فشل تسجيل %s إلى %s"
+
+#: ../calendar/gui/memos-component.c:874
+#, fuzzy, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: ../calendar/gui/memos-component.c:887
+#, fuzzy
+msgid "There is no calendar available for creating memos"
+msgstr "لا تتوفّر رُزنامة لإنشاء المهام"
+
+#: ../calendar/gui/memos-component.c:983
+#, fuzzy
+msgid "Memo Source Selector"
+msgstr "منتقي نظم الوسائط المتعدّدة"
+
+#: ../calendar/gui/memos-component.c:1166
+#, fuzzy
+msgid "New memo"
+msgstr "فا_صل جديد"
+
+#: ../calendar/gui/memos-component.c:1167
+msgid "Mem_o"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1168
+#, fuzzy
+msgid "Create a new memo"
+msgstr "انشاء موضوع جديد"
+
+#: ../calendar/gui/memos-component.c:1174
+#, fuzzy
+msgid "New shared memo"
+msgstr "فضاء مشارك مع ويندوز"
+
+#: ../calendar/gui/memos-component.c:1175
+#, fuzzy
+msgid "_Shared memo"
+msgstr "الذاكرة المشتركة"
+
+#: ../calendar/gui/memos-component.c:1176
+#, fuzzy
+msgid "Create a shared new memo"
+msgstr "إنشاء قائمة مراسَلين جديدة"
+
+#: ../calendar/gui/memos-component.c:1182
+#, fuzzy
+msgid "New memo list"
+msgstr "قائمة مراسَلين جديدة"
+
+#: ../calendar/gui/memos-component.c:1183
+#, fuzzy
+msgid "Memo li_st"
+msgstr "_بدأ التحريك"
+
+#: ../calendar/gui/memos-component.c:1184
+#, fuzzy
+msgid "Create a new memo list"
+msgstr "إنشاء قائمة مراسَلين جديدة"
+
+#: ../calendar/gui/memos-control.c:340
+#, fuzzy
+msgid "Print Memos"
+msgstr "معاينة الطّباعة."
+
+#: ../calendar/gui/migration.c:164
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -8049,7 +8742,7 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:168
 #, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
@@ -8062,333 +8755,337 @@ msgstr ""
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:799
 #, fuzzy, c-format
 msgid "Unable to migrate calendar `%s'"
-msgstr "فشل تنزيح `%s': %s"
+msgstr "لا يمكن تشغيل الأصوات\n"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:967
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "فشل تنزيح `%s': %s"
+msgstr "لا يمكن تشغيل الأصوات\n"
+
+#: ../calendar/gui/migration.c:1211
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
+#, fuzzy
+msgid "Notes"
+msgstr "ملاحظات"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "1st"
 msgstr "الأوّل"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "2nd"
 msgstr "الثّاني"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "3rd"
 msgstr "الثّالث"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "4th"
 msgstr "الرّابع"
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "5th"
 msgstr "الخامس"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "6th"
 msgstr "السّادس"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "7th"
 msgstr "السّابع"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "8th"
 msgstr "الثّامن"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "9th"
 msgstr "التّاسع"
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "10th"
 msgstr "العاشر"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "11th"
 msgstr "الحادي عشر"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "12th"
 msgstr "الثّاني عشر"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "13th"
 msgstr "الثّالث عشر"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "14th"
 msgstr "الرّابع عشر"
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "15th"
 msgstr "الخامس عشر"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "16th"
 msgstr "السّادس عشر"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "17th"
 msgstr "السّابع عشر"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "18th"
 msgstr "الثّامن عشر"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "19th"
 msgstr "التّاسع عشر"
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "20th"
 msgstr "العشرين"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "21st"
 msgstr "الحادي و العشرون"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "22nd"
 msgstr "الثّاني و العشرون"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "23rd"
 msgstr "الثّالث و العشرون"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "24th"
 msgstr "الرّابع و العشرون"
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "25th"
 msgstr "الخامس و العشرون"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "26th"
 msgstr "السّادس و العشرون"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "27th"
 msgstr "السّابع و العشرون"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "28th"
 msgstr "الثّامن و العشرون"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "29th"
 msgstr "التّاسع و العشرون"
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "30th"
 msgstr "الثّلاثين"
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:580
 msgid "31st"
 msgstr "الحادي و الثّلاثون"
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "الأحد"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "الإثنين"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "الثلاثاء"
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "الأربعاء"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "الخميس"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "الجمعة"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "السّبت"
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1936
 msgid "Selected day (%a %b %d %Y)"
 msgstr "اليوم المنتقى (%a %b %d %Y)"
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1962
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
+#: ../calendar/gui/print.c:1969
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1973
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "الأسبوع المنتقى (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1981
 msgid "Selected month (%b %Y)"
 msgstr "الشّهر المنتقى (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1988
 msgid "Selected year (%Y)"
 msgstr "السّنة المنتقاة (%Y)"
 
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2317
+msgid "Appointment"
+msgstr "موعد"
+
+#: ../calendar/gui/print.c:2319
+msgid "Task"
+msgstr "مهمَّة"
+
+#: ../calendar/gui/print.c:2341
 #, fuzzy, c-format
 msgid "Summary: %s"
 msgstr "الملخّص:"
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
-msgid "Location: %s"
-msgstr "الموقع:"
-
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2392
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Priority: %s"
 msgstr "الأولوية: %s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "النّسبة المكتملة: %i"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2433
 #, c-format
 msgid "URL: %s"
 msgstr "العنوان: %s"
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2447
 #, c-format
 msgid "Categories: %s"
 msgstr "الأصناف: %s"
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2458
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "معاينة للطّباعة"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2636
 msgid "Print Item"
 msgstr "طبع العنصر"
 
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr "قائمة مهام جديدة"
+#: ../calendar/gui/tasks-component.c:441
+#, fuzzy
+msgid "_New Task List"
+msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:517
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d يوم"
+msgstr[0] "المهمّة - %s"
 msgstr[1] "%d يوم"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, fuzzy, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "مُنتقى"
-msgstr[1] "مُنتقى"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:566
+#, fuzzy
 msgid "Failed upgrading tasks."
-msgstr ""
+msgstr "الرُّزنامة و المهام"
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
 msgstr "لا تتوفّر رُزنامة لإنشاء المهام"
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:987
+#, fuzzy
 msgid "Task Source Selector"
-msgstr ""
+msgstr "منتقي نظم الوسائط المتعدّدة"
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "مهمّة جديدة"
 
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "_مهمّة"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "إنشاء مهمّةً جديدة"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1178
 #, fuzzy
 msgid "New assigned task"
-msgstr "تعيين مهمّة"
+msgstr "إنشاء مهمّةً جديدة"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1179
 #, fuzzy
 msgid "Assigne_d Task"
-msgstr "تعيين مهمّة"
+msgstr "ت_كليف بالمهمّة"
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1180
 #, fuzzy
 msgid "Create a new assigned task"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1186
 #, fuzzy
 msgid "New task list"
-msgstr "قائمة مهام جديدة"
+msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1187
 #, fuzzy
-msgid "Task l_ist"
-msgstr "قائمة المهام"
+msgid "Tas_k list"
+msgstr "قائمة الحسابات"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1188
 #, fuzzy
 msgid "Create a new task list"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "إضافة قائمة مهام جديدة"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:446
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8400,11 +9097,11 @@ msgstr ""
 "\n"
 "هل تريد فعلاً حذف هذه المهام؟"
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:449
 msgid "Do not ask me again."
 msgstr "لا تسألني ثانيةً."
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:483
 msgid "Print Tasks"
 msgstr "طبع المهام"
 
@@ -8413,42 +9110,43 @@ msgstr "طبع المهام"
 msgid "SMTWTFS"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 #, fuzzy
 msgid "Appointments and Meetings"
 msgstr "تنظيف المواعيد و الاجتماعات القديمة"
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 #, fuzzy
 msgid "Opening calendar"
-msgstr "جاري فتح المجلّد"
+msgstr "خطأ أثناء فتح الرُّزنامة"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "ملفّات آي-كلندر (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "مستورد آي-كلندر لإيفُليوشِن"
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "علامة تذكير!!"
+#: ../calendar/importers/icalendar-importer.c:521
+#, fuzzy
+msgid "Reminder!"
+msgstr "إ_ظهار علامة تذكير"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr "ملفّات في-كلندر (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "مستورد في-كلندر لإيفُليوشِن"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "أحداث الرُّزنامة"
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "مستورِد رزنامة إيفُليوشِن الذّكي"
 
@@ -8982,7 +9680,7 @@ msgid "America/Nassau"
 msgstr "أمريكا/ناساو"
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr "أمريكا/نيو يورك"
 
@@ -9982,16 +10680,69 @@ msgstr "المحيط الهادي/والس"
 msgid "Pacific/Yap"
 msgstr "المحيط الهادي/ياب"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fك"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fم"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fغ"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:1017
+#, fuzzy
+msgid "Attachment Bar"
+msgstr "بار هاربور"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "لا يمكن إرفاق الملف %s: %s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
+
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "خصائص المُرفق"
+
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "إسم الملف:"
+
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "نوع MIME:"
+
+#: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "وجهة النشر"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:571
 #, fuzzy
 msgid "Choose folders to post the message to."
-msgstr "إختيار مجلّد لنشر الرّسالة فيه."
+msgstr "تعليق الرّسالة في مجلّد عام"
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:603
 msgid "Click here for the address book"
 msgstr "أُنقر هنا لدفتر العناوين"
 
@@ -10002,15 +10753,15 @@ msgstr "أُنقر هنا لدفتر العناوين"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:635
 #, fuzzy
 msgid "_Reply-To:"
-msgstr "رد-على:"
+msgstr "الرّد إلى"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:642
 #, fuzzy
 msgid "Fr_om:"
 msgstr "من:"
@@ -10018,35 +10769,35 @@ msgstr "من:"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:649
 #, fuzzy
 msgid "S_ubject:"
 msgstr "الموضوع:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:658
 #, fuzzy
 msgid "_To:"
-msgstr "إلى:"
+msgstr "إ_لى:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:659
 msgid "Enter the recipients of the message"
 msgstr "إدخال مستلِميْ الرّسالة"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:662
 #, fuzzy
 msgid "_Cc:"
-msgstr "نسخة كربونيّة:"
+msgstr "ن.ك"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "إدخال العناوين التي ستستلم نسخةً كربونيّة من الرّسالة"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:666
 #, fuzzy
 msgid "_Bcc:"
-msgstr "نسخة كربونيّة مخفيّة:"
+msgstr "ن.ك.م"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:667
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10057,17 +10808,17 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:674
 #, fuzzy
 msgid "_Post To:"
 msgstr "النشر في:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:679
 #, fuzzy
 msgid "Click here to select folders to post to"
 msgstr "<أُنقر هنا لإنتقاء مجلّد>"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:684
 msgid "Post To:"
 msgstr "النشر في:"
 
@@ -10076,68 +10827,81 @@ msgstr "النشر في:"
 msgid "A_ttach"
 msgstr "إرفاق"
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer-select-file.c:243
+#, fuzzy
+msgid "Insert Attachment"
+msgstr "خصائص المُرفق"
+
+#: ../composer/e-msg-composer.c:828
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "لا يمكن توقيع الرّسالة الخارجة: لا توجد شهادة توقيع لحساب المرسِل"
 
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-msg-composer.c:835
 #, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "لا يمكن تشفير الرّسالة الخارجة: لا توجد شهادة تشفير معيّنة لحساب المرسِل"
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2531
+#, fuzzy
+msgid "Hide _Attachment Bar"
+msgstr "شريط قوائم مخصّص"
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2534
+#: ../composer/e-msg-composer.c:3898
+#, fuzzy
+msgid "Show _Attachment Bar"
+msgstr "عرض عمود ال_قوائم"
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1402
 #, fuzzy
 msgid "Could not open file"
-msgstr "لا يمكن فتح الملف"
+msgstr "لم يمكن فتح الملف %s: %s"
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "لا يمكن جلب الرّسالة من المحرّر"
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1689
 #, fuzzy
 msgid "Untitled Message"
-msgstr "رسائل متعدّدة"
+msgstr "إر_سال رسالة"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1724
 #, fuzzy
 msgid "Open File"
 msgstr "فتح ملف"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2174 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "مولّد آليّاً"
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2277
 #, fuzzy
 msgid "Si_gnature:"
-msgstr "التّوقيع:"
+msgstr "ح_جم:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
-msgstr "تأليف رسالة"
-
-#: ../composer/e-msg-composer.c:3643
+#: ../composer/e-msg-composer.c:2545 ../composer/e-msg-composer.c:3780
+#: ../composer/e-msg-composer.c:3783
 #, fuzzy
-msgid "_Attachment Bar"
-msgstr "المُرفق"
+msgid "Compose Message"
+msgstr "تأليف رسالة _جديدة"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:5007
+#, fuzzy
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr "<b>(المؤلّف يحوي متن رسالة غير نصّي، ما لا يمكن تحريره.)<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
@@ -10162,7 +10926,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr ""
 
@@ -10176,17 +10940,17 @@ msgstr ""
 #: ../composer/mail-composer.error.xml.h:7
 #, fuzzy
 msgid "Could not create composer window."
-msgstr "لم يمكن إنشاء الأنبوب: %s"
+msgstr "لم أستطع إنشاء ذاكرة مخبئيّة لـ%s"
 
 #: ../composer/mail-composer.error.xml.h:8
 #, fuzzy
 msgid "Could not create message."
-msgstr "لم يمكن إنشاء الأنبوب: %s"
+msgstr "لم يمكن إرسال الرّسالة: %s"
 
 #: ../composer/mail-composer.error.xml.h:9
 #, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "لم يمكن فتح المجلّد المشترك: %s."
+msgstr "تعذّرت قراءة محتويات ملف القاموس '%s'\n"
 
 #: ../composer/mail-composer.error.xml.h:10
 #, fuzzy
@@ -10208,41 +10972,31 @@ msgid "Do you want to recover unfinished messages?"
 msgstr "هل تريد حفظ التّغييرات؟"
 
 #: ../composer/mail-composer.error.xml.h:14
-#, fuzzy
-msgid "Don't Recover"
-msgstr "عدم الحذف"
-
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 #, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "خطأ أثناء حفظ المختصرات."
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../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 ""
 
-#: ../composer/mail-composer.error.xml.h:18
-#, fuzzy
-msgid "Recover"
-msgstr "حذف"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 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
+#: ../composer/mail-composer.error.xml.h:19
 #, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -10255,34 +11009,40 @@ msgstr ""
 "الرجاء التأكّد من أن الإصدارة الصّحيحة\n"
 "من gtkhtml و libgtkhtml مثبّتة لديك.\n"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 #, fuzzy
 msgid "Unable to activate the address selector control."
 msgstr ""
 "لا يمكن إنشاء نافذة التّأليف:\n"
 "لم يمكن تفعيل قطعة انتقاء العناوين."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
+#, fuzzy
 msgid "Unfinished messages found"
-msgstr ""
+msgstr "لم يُعثر على أي جهاز"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "تنبيه: رسالة معدّلة"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "إرفاق ملف بالرّسالة"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "يجب أن تُعدّ حساباً قبل أن تتمكّن من كتابة البريد."
 
+#: ../composer/mail-composer.error.xml.h:28
+#, fuzzy
+msgid "_Do not Recover"
+msgstr "الرجاء عدم الإزعاج"
+
 #: ../composer/mail-composer.error.xml.h:29
 #, fuzzy
-msgid "_Discard Changes"
-msgstr "تجا_هل التّغييرات"
+msgid "_Recover"
+msgstr "_استعادة"
 
 #: ../composer/mail-composer.error.xml.h:30
 #, fuzzy
@@ -10291,14 +11051,18 @@ msgstr "حفظ الرّسالة..."
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:523
 msgid "Evolution"
 msgstr "افُليوشِن"
 
-#: ../data/evolution.desktop.in.in.h:2
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+msgid "Groupware Suite"
+msgstr ""
+
+#: ../data/evolution.desktop.in.in.h:3
 #, fuzzy
-msgid "The Evolution Groupware Suite"
-msgstr "طقم برامج مجموعات زيميان إيفُليوشِن"
+msgid "The Evolution PIM and Email Client"
+msgstr "مكوّن بريد ايفُليوشِن"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10309,6 +11073,7 @@ msgid "calendar information"
 msgstr "معلومات الرزنامة"
 
 #: ../designs/OOA/ooa.glade.h:1
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -10319,14 +11084,17 @@ msgstr ""
 "هل تريد تغييرها إلى \"في المكتب\"؟ "
 
 #: ../designs/OOA/ooa.glade.h:4
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr "<b>رسالة خارج المكتب:</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr "<b>الحالة:</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -10336,38 +11104,39 @@ msgstr ""
 "لك بريداً حين تكون خارج المكتب.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr "أنا في المكتب حاليّاً"
 
 #: ../designs/OOA/ooa.glade.h:9
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr "أنا خارج المكتب حاليّاً"
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+#, fuzzy
+msgid "No, Do not Change Status"
 msgstr "كلّا، لا تغيّر الحالة"
 
 #: ../designs/OOA/ooa.glade.h:12
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr "مساعد خارج المكتب"
 
 #: ../designs/OOA/ooa.glade.h:13
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr "نعم، غيّر الحالة"
 
 #: ../designs/read_receipts/read.glade.h:1
-msgid "      "
-msgstr "      "
-
-#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr "<b>جاري استلام البريد الإلكتروني</b>"
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Sending Email:</b>"
 msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
 
-#: ../designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:3
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -10378,32 +11147,32 @@ msgstr ""
 "قراءة رسالة لك\n"
 "و تحديد ما يفترض لإيفُليوشِن القيام به عند طلب شخص وصلا منك.</small>"
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:5
 #, fuzzy
 msgid "Always send back a read receipt"
-msgstr "إرسال وصل قراءة دائماً"
+msgstr "عدم إرسال وصل قراءة أبداً"
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Ask me if I want to send back a read receipt"
 msgstr "إسألني فيما إذا كنتُ أريد إرسال وصل قراءة"
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Never send back a read receipt"
 msgstr "عدم إرسال وصل قراءة أبداً"
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Read Receipts"
 msgstr "وصول قراءة"
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Request a read receipt for all messages I send"
 msgstr "طلب وصل قراءة لكل الرّسائل التي أُرسلها"
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "إلّا إذا كانت هذه الرّسالة مرسلةً إلى قائمة بريديّة، و ليس لي شخصيّاً"
 
-#: ../designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:11
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
@@ -10411,7 +11180,7 @@ msgstr ""
 "عندما تستلم بريداً إلكترونيّاً مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
 "إيفُليوشِن فعله؟"
 
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:283
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10419,212 +11188,112 @@ msgstr ""
 "هناك ملف موجود بهذا الاسم أصلاً.\n"
 "هل تريد تنميقه؟"
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "تنميق الملف؟"
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "خطأ إيفُليوشِن"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
 #, fuzzy
 msgid "Evolution Warning"
-msgstr "بريد إيفُليوشِن"
+msgstr "تنبيه أمني"
 
-#: ../e-util/e-error.c:124
+#: ../e-util/e-error.c:126
 #, fuzzy
 msgid "Evolution Information"
-msgstr "معلومات خياريّة"
+msgstr "بيانات سيّئة"
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:128
 #, fuzzy
 msgid "Evolution Query"
-msgstr "افُليوشِن"
+msgstr "أرسل الإستفسار"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
-#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
+#: ../e-util/e-error.c:454
+#, fuzzy, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "تنبيه: خطأ داخلي لدى أداة gconf، GConfValueType غير معروف\n"
 
 #: ../e-util/e-system.error.xml.h:2
 #, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "تعذر فتح الملف \"%s\". \n"
 
 #: ../e-util/e-system.error.xml.h:3
 #, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "لا يمكن حفظ الملف %s."
 
 #: ../e-util/e-system.error.xml.h:4
 #, fuzzy
 msgid "Do you wish to overwrite it?"
-msgstr ""
-"%s موجود\n"
-"هل تريد تنميقه؟"
+msgstr "الملف موجود. هل تريد تنميقه؟"
 
 #: ../e-util/e-system.error.xml.h:5
+#, fuzzy
 msgid "File exists &quot;{0}&quot;."
-msgstr ""
+msgstr "الملف '%s'· موجود."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 #, fuzzy
 msgid "_Overwrite"
-msgstr "تنميق"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %m/%d/%Y %I:%M %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %m/%d/%Y %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %m/%d/%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %m/%d/%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%m/%d/%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%m/%d/%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%m/%d/%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%m/%d/%Y %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%m/%d/%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%m/%d/%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
+msgstr "_تنميق"
 
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 #, fuzzy
 msgid "The orientation of the tray."
-msgstr "وصف المُرفق."
+msgstr "إتجاه الطبق."
 
 #: ../filter/filter-datespec.c:78
 #, fuzzy, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "منذ ثانية"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ ثانية"
 
 #: ../filter/filter-datespec.c:79
 #, fuzzy, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "منذ دقيقة"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ دقيقة"
 
 #: ../filter/filter-datespec.c:80
 #, fuzzy, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "منذ ساعة"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ ساعة"
 
 #: ../filter/filter-datespec.c:81
 #, fuzzy, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
-msgstr[0] "منذ يوم"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ يوم"
 
 #: ../filter/filter-datespec.c:82
 #, fuzzy, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "منذ أسبوع"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ أسبوع"
 
 #: ../filter/filter-datespec.c:83
 #, fuzzy, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
-msgstr[0] "منذ شهر"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ شهر"
 
 #: ../filter/filter-datespec.c:84
 #, fuzzy, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
-msgstr[0] "منذ سنة"
+msgstr[0] "{0} يوم مضى، {1}"
 msgstr[1] "منذ سنة"
 
 #: ../filter/filter-datespec.c:285
@@ -10644,25 +11313,24 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "إختيار وقت للمقارنة به"
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
 msgid "Choose a file"
 msgstr "إختيار ملف"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "مهم"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "للقيام به"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "لاحقاً"
 
@@ -10670,62 +11338,68 @@ msgstr "لاحقاً"
 msgid "Test"
 msgstr "إختبار"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:799
 #, fuzzy
-msgid "_Rule name:"
-msgstr "إسم القاعدة:"
+msgid "_Search name:"
+msgstr "بحث في <b>%(name)s</b> عن <i>%(text)s</i>"
 
-#: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "إذا"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr ""
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+#: ../filter/filter-rule.c:866
+#, fuzzy
+msgid "If all criteria are met"
 msgstr "إذا قوبلت جميع المحدِّدات"
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
+#: ../filter/filter-rule.c:866
+#, fuzzy
+msgid "If any criteria are met"
 msgstr "إذا قوبلت أي محدِّدة"
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "تنفيذ الإجراءات"
+#: ../filter/filter-rule.c:868
+#, fuzzy
+msgid "Find items:"
+msgstr "إنشاء عناصر"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 #, fuzzy
 msgid "All related"
-msgstr "مفوّض"
+msgstr "نسخ ال_كل"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 #, fuzzy
 msgid "Replies"
 msgstr "المستلِمون"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 #, fuzzy
 msgid "Replies and parents"
-msgstr "الرّدود على %s"
+msgstr "احفظ و اخرج"
+
+#: ../filter/filter-rule.c:889
+#, fuzzy
+msgid "No reply or parent"
+msgstr "  - موافق؟ (نعم أو لا)"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:891
 #, fuzzy
 msgid "Include threads"
-msgstr "تضمين:"
+msgstr "_تضمين الدلائل المحوية"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:328
 msgid "Incoming"
 msgstr "قادمة"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
 msgid "Outgoing"
 msgstr "الخارجة"
 
 #: ../filter/filter.error.xml.h:1
 #, fuzzy
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr ""
-"خطأ في التّعبير النّظامي '%s':\n"
-"%s"
+msgstr "فشل تجميع التّعبير النّظامي: %s: %s"
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
@@ -10739,26 +11413,27 @@ msgstr "الملف '%s' غير موجود أو أنّه ليس ملفّاً اع
 #: ../filter/filter.error.xml.h:4
 #, fuzzy
 msgid "Missing date."
-msgstr "تحديث إجتماع"
+msgstr "تاريخ آخر"
 
 #: ../filter/filter.error.xml.h:5
 #, fuzzy
 msgid "Missing file name."
-msgstr "إ_سم مميّز:"
+msgstr "<b>لمحة بأسماء الملفّات</b>"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 #, fuzzy
 msgid "Missing name."
-msgstr "مهمّة"
+msgstr "اسم الموصول"
 
 #: ../filter/filter.error.xml.h:7
+#, fuzzy
 msgid "Name &quot;{0}&quot; already used."
-msgstr ""
+msgstr "<%s>  اسم \"%s\" استعمل مرة ثانية"
 
 #: ../filter/filter.error.xml.h:8
 #, fuzzy
 msgid "Please choose another name."
-msgstr "الرجاء اختيار نادل."
+msgstr "الرجاء اختيار إسم شعار مغاير."
 
 #: ../filter/filter.error.xml.h:9
 msgid "You must choose a date."
@@ -10775,15 +11450,16 @@ msgstr "يجب تحديد اسم ملف."
 #: ../filter/filter.glade.h:1
 #, fuzzy
 msgid "<b>_Filter Rules</b>"
-msgstr "قواعد التصفية"
+msgstr "شروط عند"
 
 #: ../filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "المقارنة مع"
 
 #: ../filter/filter.glade.h:4
+#, fuzzy
 msgid "Show filters for mail:"
-msgstr ""
+msgstr "مراجعة عن بريد جديد"
 
 #: ../filter/filter.glade.h:5
 msgid ""
@@ -10821,7 +11497,7 @@ msgstr "منذ"
 msgid "months"
 msgstr "أشهر"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
 msgid "seconds"
 msgstr "ثوان"
 
@@ -10837,15 +11513,15 @@ msgstr "الوقت الذي تحدّده أنت"
 msgid "years"
 msgstr "سنوات"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "إضافة قاعدة"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "تحرير قاعدة"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "إسم القاعدة"
 
@@ -10890,16 +11566,17 @@ msgstr "قطعة إعداد مؤلّف بريد إيفُليوشِن"
 msgid "Evolution Mail preferences control"
 msgstr "قطعة تفضيلات بريد إيفُليوشِن"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:524
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:581
+#: ../mail/mail-component.c:582 ../mail/mail-component.c:723
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "بريد"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:532
 msgid "Mail Accounts"
 msgstr "حسابات البريد"
 
@@ -10911,14 +11588,14 @@ msgstr "تفضيلات البريد"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 #, fuzzy
 msgid "_Mail"
-msgstr "_بريد:"
+msgstr "بريد"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:403
 #, fuzzy, c-format
 msgid "%s License Agreement"
 msgstr "اتفاق على المفتاح"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10927,120 +11604,132 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:511
 msgid "Select Folder"
 msgstr "انتقاء المجلّد"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:778
 #, fuzzy
 msgid "Ask for each message"
-msgstr "لا رسالة بهذا الإسم"
+msgstr "العنوان الإفتراضي للرّسالة."
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "الهويّة"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "جاري تلقي البريد الإلكتروني"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:2046
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "مراجعة آ_لية عن الرسائل كل"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "جاري إرسال البريد الإلكتروني"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Defaults"
-msgstr "الإ_فتراضات"
+msgstr "الا_فتراضيّات"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 #, fuzzy
 msgid "Security"
-msgstr "_أمن"
+msgstr "أمن"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
 #, fuzzy
 msgid "Receiving Options"
-msgstr "خيارات الت_لقي"
+msgstr "<b>خيارات العرض:</b>"
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
 msgid "Checking for New Mail"
 msgstr "مراجعة عن بريد جديد"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "محرّر الحسابات"
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "مساعد حسابات إيفُليوشِن"
 
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Disable"
+msgstr "تعطيل"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:411
+msgid "Enable"
+msgstr "تفعيل"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "{الإفتراض}"
 
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
+msgid "Enabled"
+msgstr "مفعّل"
+
+#: ../mail/em-account-prefs.c:525
 msgid "Account name"
 msgstr "إسم الحساب"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:527
 msgid "Protocol"
 msgstr "البرتوكول"
 
-#: ../mail/em-account-prefs.c:517
-#, fuzzy
-msgid "Mail Accounts Table"
-msgstr "حسابات البريد"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:999
 msgid "Unnamed"
 msgstr "غير مسمّى"
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "اللّغة (أو اللّغات)"
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:979
 #, fuzzy
 msgid "Add signature script"
-msgstr "إ_ضافة توقيع"
+msgstr "تفعيل _جافاسكربت"
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "التّوقيع (أو التّواقيع)"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1665
 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:1695
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 #, fuzzy
 msgid "_Filter Rules"
-msgstr "قواعد التصفية"
+msgstr "شروط عند"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11079,6 +11768,12 @@ msgstr "تاريخ الاستلام"
 msgid "Date sent"
 msgstr "تاريخ الإرسال"
 
+#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "حذف"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "حُذف"
@@ -11175,10 +11870,9 @@ msgstr "نفاية"
 #: ../mail/em-filter-i18n.h:36
 #, fuzzy
 msgid "Junk Test"
-msgstr "يونيو"
+msgstr "تم الاختبار %d"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "علامة"
 
@@ -11189,7 +11883,7 @@ msgstr "قائمة مراسَلة"
 #: ../mail/em-filter-i18n.h:39
 #, fuzzy
 msgid "Match All"
-msgstr "نسخ احتياطي للكل"
+msgstr "نسخ ال_كل"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
@@ -11202,12 +11896,12 @@ msgstr "ترويسة الرّسالة"
 #: ../mail/em-filter-i18n.h:42
 #, fuzzy
 msgid "Message is Junk"
-msgstr "ال_رسائل"
+msgstr "تعليم ك_نفاية"
 
 #: ../mail/em-filter-i18n.h:43
 #, fuzzy
 msgid "Message is not Junk"
-msgstr "تعليم كليس _نفاية"
+msgstr "هذه الرّسالة غير متوفّرة حاليّاً"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
@@ -11216,17 +11910,17 @@ msgstr "نقل للمجلّد"
 #: ../mail/em-filter-i18n.h:45
 #, fuzzy
 msgid "Pipe to Program"
-msgstr "إنهاء البرنامج"
+msgstr "اختر برنامج لتحرير الفيديو"
 
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "عزف صوت"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "قراءة"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
 msgid "Recipients"
 msgstr "المستلِمون"
 
@@ -11253,13 +11947,13 @@ msgstr "يُرجع أصغر من"
 #: ../mail/em-filter-i18n.h:54
 #, fuzzy
 msgid "Run Program"
-msgstr "تشغيل البرنامج:"
+msgstr "تشغيل برنامج"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Score"
 msgstr "النّتيجة"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
 msgid "Sender"
 msgstr "المرسِل"
 
@@ -11291,12 +11985,12 @@ msgstr "يبدء بـ"
 msgid "Stop Processing"
 msgstr "إيقاف المعالجة"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "الموضوع"
 
@@ -11308,33 +12002,92 @@ msgstr "إلغاء ضبط الحالة"
 #: ../mail/em-filter-rule.c:488
 #, fuzzy
 msgid "<b>Then</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "ثم حسب"
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:170
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "إنشاء مجلّد ا_عتباطي من البحث..."
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: ../mail/em-folder-browser.c:192
+#, fuzzy
+msgid "All Messages"
+msgstr "إنتقاء جميع الرّسائل المرئيّة"
+
+#: ../mail/em-folder-browser.c:193
+#, fuzzy
+msgid "Unread Messages"
+msgstr "الرسائل الممرّرة"
+
+#: ../mail/em-folder-browser.c:195
+#, fuzzy
+msgid "No Label"
+msgstr "نص العلامة."
+
+#: ../mail/em-folder-browser.c:202
+#, fuzzy
+msgid "Read Messages"
+msgstr "إخفاء الرّسائل المقر_وءة"
+
+#: ../mail/em-folder-browser.c:203
+#, fuzzy
+msgid "Recent Messages"
+msgstr "الرسائل الممرّرة"
+
+#: ../mail/em-folder-browser.c:204
+#, fuzzy
+msgid "Last 5 Days' Messages"
+msgstr "جاري نقل الرسائل إلى %s"
+
+#: ../mail/em-folder-browser.c:205
+#, fuzzy
+msgid "Messages with Attachments"
+msgstr "تم الاتصال مع %s باستخدام %s"
+
+#: ../mail/em-folder-browser.c:206
+#, fuzzy
+msgid "Important Messages"
+msgstr "الرسائل الممرّرة"
+
+#: ../mail/em-folder-browser.c:207
+#, fuzzy
+msgid "Messages Not Junk"
+msgstr "تعليم كليس _نفاية"
+
+#: ../mail/em-folder-browser.c:1030
+#, fuzzy
+msgid "Account Search"
+msgstr "بحث في الويب"
+
+#: ../mail/em-folder-browser.c:1074
+#, fuzzy
+msgid "All Account Search"
+msgstr "بحث في كل الملاحظات"
 
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
 #, fuzzy
-msgid "Total message:"
+msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "رسالة مساعدة"
+msgstr[0] "الرسائل الممرّرة"
 msgstr[1] "رسالة مساعدة"
 
-#: ../mail/em-folder-properties.c:156
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
 #, fuzzy
-msgid "Unread message:"
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "الرّسالة ال_غير مقروءة التالية"
+msgstr[0] "الرسائل الممرّرة"
 msgstr[1] "الرّسالة ال_غير مقروءة التالية"
 
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../mail/em-folder-properties.c:316
+#: ../plugins/groupwise-features/properties.glade.h:2
 #, fuzzy
 msgid "Folder Properties"
-msgstr "خصائص المجلّد"
+msgstr "تغيير خواص هذا المجلّد"
 
 #: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
@@ -11343,337 +12096,380 @@ msgstr "<أُنقر هنا لإنتقاء مجلّد>"
 #: ../mail/em-folder-selector.c:261
 #, fuzzy
 msgid "Create"
-msgstr "إنشاء مجلّد"
+msgstr "إ_نشاء"
 
 #: ../mail/em-folder-selector.c:265
 msgid "Folder _name:"
 msgstr "إ_سم المجلّد:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
 #, fuzzy
 msgid "Search Folders"
-msgstr "انتقاء المجلّد"
+msgstr "بحث عن الملفات والمجلدات"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#, fuzzy
 msgid "UNMATCHED"
-msgstr ""
+msgstr "دون مطابق"
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
 #, fuzzy
 msgid "Drafts"
 msgstr "مسوّدة"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:587
 msgid "Inbox"
 msgstr "صندوق البريد الداخل"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
 msgid "Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
 #, fuzzy
 msgid "Sent"
-msgstr "إرسال"
+msgstr "أرسل:"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "جاري التّحميل..."
 
-#: ../mail/em-folder-tree.c:689
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:366
+#, fuzzy, c-format
+msgid "folder-display|%s (%u)"
+msgstr "لم يمكن عرض الدليل \"%s\""
+
+#: ../mail/em-folder-tree.c:717
 #, fuzzy
 msgid "Mail Folder Tree"
-msgstr "مصفات البريد"
+msgstr "شجرة مجلّدات الحوض %s"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:877
 #, fuzzy, c-format
 msgid "Moving folder %s"
-msgstr "جاري إزالة المجلّد %s"
+msgstr "فتح المجلد %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:879
 #, fuzzy, c-format
 msgid "Copying folder %s"
-msgstr "جاري فتح المجلّد %s"
+msgstr "فتح المجلد %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1825
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
-msgstr "جاري نقل الرسائل إلى %s"
+msgstr "لا يمكنك نقل مجلد إلى نفسه."
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1827
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
-msgstr "جاري نسخ الرسائل إلى %s"
+msgstr "لا يمكنك نقل مجلد إلى نفسه."
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:904
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "لا يمكن نسخ أو نقل رسالة إلى مجلّد إعتباطي"
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "ن_سخ إلى دليل"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_نقل للمجلّد"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "جاري مسح الرسائل في \"%s\""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:53
 msgid "_View"
 msgstr "_عرض"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2066
 msgid "Open in _New Window"
 msgstr "فتح في نافذة _جديدة"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2070
 #, fuzzy
 msgid "_Copy..."
-msgstr "_نسخ"
+msgstr "نسخ"
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2071
 #, fuzzy
 msgid "_Move..."
 msgstr "_نقل"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2075
 msgid "_New Folder..."
 msgstr "مجلّد _جديد..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
 #, fuzzy
 msgid "_Rename..."
-msgstr "إ_عادة التّسمية"
+msgstr "_اعادة التسمية..."
+
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "إ_فراغ سلة المهملات"
 
 #: ../mail/em-folder-utils.c:104
 #, fuzzy, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "جاري نسخ الرسائل إلى %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1023
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "إنتقاء مجلّد"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
 #, fuzzy
 msgid "C_opy"
 msgstr "نسخ"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "إعادة تسمية المجلّد"
-
-#: ../mail/em-folder-utils.c:511
-#, fuzzy
-msgid "Folder names cannot contain '/'"
-msgstr "لا·يمكن·أن·يحتوي·إسم·المجلّد·الرمز \"/\"."
-
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
-msgstr "جاري تخزين المجلّد '%s'"
+msgstr "خطأ \"%s\" عند إنشاء مجلد جديد."
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "إنشاء مجلّد"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "تحديد أين سيتم إنشاء المجلّد:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "الرّد على ال_كل"
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ال_رّد على المرسِل"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_تمرير"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_تحرير كرسالةٍ جديدة..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1127
 msgid "U_ndelete"
 msgstr "ترا_جع عن الحذف"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1128
 msgid "_Move to Folder..."
 msgstr "_نقل للمجلّد..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1129
 msgid "_Copy to Folder..."
 msgstr "ن_سخ للمجلّد..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1132
 msgid "Mar_k as Read"
 msgstr "تعليم على أنّها _مقروءة"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1133
 #, fuzzy
 msgid "Mark as _Unread"
-msgstr "تعليم كغير م_قروءة"
+msgstr "_تعليم كمكتمل"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1134
 msgid "Mark as _Important"
 msgstr "_تعليم على أنّها مهمّة"
 
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
-msgstr "ت_عليم على أنّها غير مهمّة"
+#: ../mail/em-folder-view.c:1135
+#, fuzzy
+msgid "Mark as Un_important"
+msgstr "تعليم كليس _نفاية"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1136
 msgid "Mark as _Junk"
 msgstr "تعليم ك_نفاية"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1137
 msgid "Mark as _Not Junk"
 msgstr "تعليم كليس _نفاية"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1138
 #, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "متا_بعة..."
+msgstr "تعليم الرسالة المنتقات للحذف"
+
+#: ../mail/em-folder-view.c:1140
+#, fuzzy
+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:1141 ../widgets/misc/e-dateedit.c:475
+#, fuzzy
+msgid "_None"
+msgstr "_لا شيء"
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1146
 msgid "Fla_g Completed"
 msgstr "تم ال_علم"
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1147
 msgid "Cl_ear Flag"
 msgstr "_مسح العلم"
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1150
 msgid "Crea_te Rule From Message"
 msgstr "إنشاء قاعدة من الرّسالة"
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1151
 #, fuzzy
 msgid "Search Folder from _Subject"
-msgstr "مجلّد إعتباطي على الموضوع"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1152
 #, fuzzy
 msgid "Search Folder from Se_nder"
 msgstr "مجلّد·إعتباطي·على·الم_رسِل"
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1153
 #, fuzzy
 msgid "Search Folder from _Recipients"
-msgstr "مجلّد·إعتباطي·على·ال_متلّقين"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1154
 #, fuzzy
 msgid "Search Folder from Mailing _List"
-msgstr "مجلّد·إعتباطي·على·القوائم البريديّة"
+msgstr "إزالة المجلّد من قائمة المجلّدات المشترِك بها"
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1158
 msgid "Filter on Sub_ject"
 msgstr "تصفية باعتبار المو_ضوع"
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1159
 msgid "Filter on Sen_der"
 msgstr "تصفية باعتبار المر_سِل"
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1160
 msgid "Filter on Re_cipients"
 msgstr "تصفية باعتبار المست_لمين"
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1161
 msgid "Filter on _Mailing List"
 msgstr "تصفية باعتبار ال_قائمة البريديّة"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:2012 ../mail/em-folder-view.c:2056
 msgid "Default"
 msgstr "الإفتراض"
 
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2155
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "طباعة الرّسالة"
 
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2315
 #, fuzzy
 msgid "Unable to retrieve message"
 msgstr "لم يمكن إستلام الرّسالة: %s"
 
-#: ../mail/em-folder-view.c:2413
-msgid "_Copy Link Location"
-msgstr "_نسخ موقع الوصلة"
-
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2513
 #, fuzzy
 msgid "Create _Search Folder"
-msgstr "إنشاء مجلّد جديد"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2514
 #, fuzzy
 msgid "_From this Address"
-msgstr "عنوان المنزل"
+msgstr "حذف من هذا الموضوع."
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2515
 #, fuzzy
 msgid "_To this Address"
-msgstr "عنوان آخر"
+msgstr "تحول لهذا السان"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2872
 #, fuzzy, c-format
 msgid "Click to mail %s"
-msgstr "نقر لإضافة مهمّة"
+msgstr "إر_سال رسالة إلى..."
+
+#: ../mail/em-folder-view.c:2877
+msgid "Click to hide/unhide addresses"
+msgstr ""
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "المطابقات: %d"
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:650
+#, fuzzy
+msgid "Fi_nd:"
+msgstr "<b>بحث عن ال_نص:</b>"
+
+#: ../mail/em-format-html-display.c:678
+#, fuzzy
+msgid "Fo_rward"
+msgstr "إنشاء _دليل"
+
+#: ../mail/em-format-html-display.c:683
+#, fuzzy
+msgid "M_atch case"
+msgstr "حالة الأحرف حساسة"
+
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:930
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "هذه الرّسالة غير موقّعة. ليست هناك أيّة ضمانات أن مرسل الرّسالة حقيقي."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:931
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -11682,252 +12478,251 @@ msgstr ""
 "هذه الرّسالة موقّعة و سليمة، من شبه المؤكّد أن مرسل هذه الرّسالة هو من يزعم أن "
 "يكون."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "توقيع غير سليم"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "توقيع سليم، تعذّر التّحقّق من المرسِل"
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:933
 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:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "غير مشفّرة"
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:939
 #, fuzzy
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 "هذه الرّسالة ليست مشفّرة. من الممكن استعراض محتوياتها أثناء نقلها عبر الإنترنت."
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "مشفّرة، ضعيفة"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:940
+#, fuzzy
 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 "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 "هذه الرّسالة مشفّرة، و لكن بلوغارذم تشفير ضعيف. سيصعب و لكن لن يستحيل على أيّ "
 "غريبٍ أن يستعرض محتويات هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "مشفّرة"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:941
 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:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "مشفّرة، بقوّة"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:942
+#, fuzzy
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 "هذه الرّسالة مشفّرة بلوغارذم تشفير قويّ. سيكون من الصّعب جدّاً على أيّ غريبٍ أن "
 "يستعرض محتويات هذه الرّسالة ضمن فترةٍ زمنيّة معقولة."
 
-#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "_View Certificate"
-msgstr "عرض الشّهادة"
+msgstr "_عرض الشهادة"
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:1058
 #, fuzzy
 msgid "This certificate is not viewable"
-msgstr "الشّهادة ليست صالحة بعد"
+msgstr "لا يمكن الكتابة على هذا المفتاح"
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1377
+#, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr ""
+msgstr "استماع على:"
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1385
 #, fuzzy
 msgid "Overdue:"
 msgstr "المهام ال_فائت موعدها:"
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1388
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "المطورون"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "_عرض ضمن السّياق"
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "إ_خفاء"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1450
 #, fuzzy
 msgid "_Fit to Width"
-msgstr "عرض القصاصة"
+msgstr "ملائمة بعرض الصفحة"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1451
 #, fuzzy
 msgid "Show _Original Size"
-msgstr "الحجم الأ_صلي"
+msgstr "عرض المحتويات بالحجم العادي"
 
-#: ../mail/em-format-html-display.c:1550
-#, fuzzy
-msgid "Attachment Button"
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr "المُرفق"
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:2093
 #, fuzzy
 msgid "Select folder to save all attachments..."
 msgstr "جاري حفظ المُرفق"
 
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1804
+#: ../mail/em-format-html-display.c:2140
 #, fuzzy
-msgid "Save Selected..."
-msgstr "مُنتقى"
+msgid "_Save Selected..."
+msgstr "اليوم المنتقى (%a %b %d %Y)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:2207
 #, fuzzy, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "مرفق %s"
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
+msgstr[0] "اليوم عند %-I:%M %p"
 msgstr[1] "مرفق %s"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
 #, fuzzy
-msgid "No Attachment"
-msgstr "المُرفق"
+msgid "S_ave"
+msgstr "حفظ"
 
-#: ../mail/em-format-html-display.c:1938
+#: ../mail/em-format-html-display.c:2225
 #, fuzzy
-msgid "Save All"
-msgstr "حفظ كـ"
+msgid "S_ave All"
+msgstr "نسخ ال_كل"
+
+#: ../mail/em-format-html-display.c:2288
+#, fuzzy
+msgid "No Attachment"
+msgstr "خصائص المُرفق"
 
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "الصّفحة %d من %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "جاري سحب `%s'"
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:621
 #, fuzzy
 msgid "Valid signature but cannot verify sender"
 msgstr "توقيع سليم، تعذّر التّحقّق من المرسِل"
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:892
 msgid "Malformed external-body part."
 msgstr "جزء متن خارجي مشوّه."
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "مؤشّر لموقع FTP (%s)"
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:933
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "مؤشّر لملفٍّ محلّي (%s) صحيح في الموقع \"%s\""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:935
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "مؤشّر لملف محلّي (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "مؤشّر لبيانات بعيدة (%s)"
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "مؤشّر لبيانات خارجيّة مجهولة (فئة \"%s\")"
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1194
 msgid "Formatting message"
 msgstr "جاري تهيئة الرسالة"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "من"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "الرّد إلى"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr "إلى"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "ن.ك"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "ن.ك.م"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr "المرسِل"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1691
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1694
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "التّاريخ"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1727 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr ""
 
@@ -11936,51 +12731,52 @@ msgstr ""
 msgid "%s attachment"
 msgstr "مرفق %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "لم يمكن ترجمة رسالة S/MIME: خطأ مجهول"
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "لم يمكن إعراب رسالة MIME. ستُعرض كمصدر."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
 msgstr "تهيئة توقيع غير مدعومة"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Every time"
-msgstr "كل سنة"
+msgstr "وقت غير سليم"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
+#, fuzzy
 msgid "Once per day"
-msgstr ""
+msgstr "إظهار يوم واحد"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 #, fuzzy
 msgid "Once per week"
-msgstr "كل أسبوع"
+msgstr "مشهد أسبوع العمل"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 #, fuzzy
 msgid "Once per month"
-msgstr "كل شهر"
+msgstr "إظهار شهر واحد"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1210
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11991,155 +12787,132 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1649
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
-msgstr ""
-"لم يمكن إنشاء ملف الإخراج: %s\n"
-"·%s"
+msgstr "تحديد أين سيتم إنشاء المجلّد:"
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1675
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
-"لا يمكن نسخ واصف الملف: %s\n"
-"%s"
+msgstr "لم يمكن فتح مجلّد البكرة"
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1860
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "لا يمكن حفظ ملف قائمة المجموعة لـ %s: %s"
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2064
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "فشل التّوثيق مع نادل POP %s: %s"
+msgstr "فشل التّوثيق مع خادم POP %s: %s"
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2078
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "فشل إنشاء المجلّد `%s': %s"
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2107
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "فشل إنشاء المجلّد `%s': %s"
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2713
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "لم يمكن إنشاء ملف الإخراج: %s\n"
 "·%s"
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2732
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "حفظ كـ..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr ""
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "ضبط ك_خلفية"
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "ال_رّد على المرسِل"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "الرّد على ال_قائمة"
 
-#: ../mail/em-popup.c:607
-msgid "_Open Link in Browser"
-msgstr "_فتح الوصلة في المتصفّح"
-
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:621
 #, fuzzy
 msgid "_Send New Message To..."
-msgstr "إر_سال الرّسالة لـ..."
-
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
-msgstr "إ_ضافة لدفتر العناوين"
+msgstr "إرسال رسالة للمراسَل"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "فتح في %s..."
+#: ../mail/em-popup.c:622
+#, fuzzy
+msgid "_Add to Address Book"
+msgstr "أضف المكالم إلى دفتر العناوين"
 
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:582
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "هذا المخزن لا يدعم الإشتراكات، أو أنّها غير مدعومة."
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "تم الإشتراك"
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "مجلّد"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:814
 msgid "Please select a server."
-msgstr "الرجاء اختيار نادل."
+msgstr "الرجاء اختيار خادم."
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:835
 msgid "No server has been selected"
-msgstr "لم يتم اختيار أي نادل"
+msgstr "لم يتم اختيار أي خادم"
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr "عدم إظهار هذه الرّسالة مجدّداً."
+#: ../mail/em-utils.c:141
+#, fuzzy
+msgid "Do not show this message again."
+msgstr "لا _تظهر هذه الرسالة مرة أخرى"
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr "مصفات"
+#: ../mail/em-utils.c:336
+#, fuzzy
+msgid "Message Filters"
+msgstr "مصفات البريد"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
 msgid "message"
 msgstr "رسالة"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:688
 msgid "Save Message..."
 msgstr "حفظ الرّسالة..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:737
 msgid "Add address"
 msgstr "إضافة عنوان"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1221
 #, fuzzy, c-format
 msgid "Messages from %s"
-msgstr "البريد من %s"
+msgstr "أخبار من %s"
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 #, fuzzy
 msgid "Search _Folders"
-msgstr "انتقاء المجلّد"
+msgstr "بحث عن الملفات والمجلدات"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:591
 #, fuzzy
 msgid "Search Folder source"
-msgstr "انتقاء المجلّد"
+msgstr "لم يمكن إغلاق المجلّد المصدر %s: %s"
 
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12156,259 +12929,299 @@ msgstr "تفقّد عن كون البريد الوارد تافه"
 #: ../mail/evolution-mail.schemas.in.in.h:4
 #, fuzzy
 msgid "Citation highlight color"
-msgstr "لون إبراز الإقتباس"
+msgstr "لون التظليل لكل النتائج"
 
 #: ../mail/evolution-mail.schemas.in.in.h:5
 #, fuzzy
 msgid "Citation highlight color."
-msgstr "لون إبراز الإقتباس."
+msgstr "لون التظليل لكل النتائج"
 
 #: ../mail/evolution-mail.schemas.in.in.h:6
+#, fuzzy
 msgid "Composer Window default height"
-msgstr ""
+msgstr "الارتفاع الافتراضي للمذكرات الجديدة"
 
 #: ../mail/evolution-mail.schemas.in.in.h:7
+#, fuzzy
 msgid "Composer Window default width"
-msgstr ""
+msgstr "العرض الافتراضي للمذكرات الجديدة"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
+msgid "Compress display of addresses in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:9
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "مجموعة المحارف الافتراضية التي ستؤلّف الرّسائل منها"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to compose messages."
 msgstr "مجموعة المحارف الإفتراضية التي ستؤلّف الرّسائل منها."
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default charset in which to display messages"
 msgstr "مجموعة المحارف الافتراضية التي ستعرض الرّسائل بها"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default charset in which to display messages."
 msgstr "مجموعة المحارف الافتراضية التي ستعرض الرّسائل بها."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default forward style"
 msgstr "أسلوب التمرير الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default height of the Composer Window"
-msgstr "العرض الإفتراضي للوح عمود المجلّد"
+msgstr "طول النّافذة التي سيتم إظهارها"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
 msgid "Default height of the Message Window"
-msgstr "العنوان الإفتراضي للرّسالة."
+msgstr "إظهار نافذة معاينة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default height of the Subscribe dialog"
-msgstr "العرض·الإفتراضي·للوح·عمود·المختصر"
+msgstr "الارتفاع الافتراضي للمذكرات الجديدة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default reply style"
 msgstr "أسلوب الرّد الإفتراضي"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "العرض الإفتراضي للوح عمود المجلّد"
+msgstr "عرض النّافذة التي سيتم إظهارها"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Default width of the Message Window"
-msgstr "العرض الإفتراضي للوح عمود المجلّد"
+msgstr "إظهار نافذة معاينة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Default width of the Subscribe dialog"
-msgstr "العرض·الإفتراضي·للوح·عمود·المختصر"
+msgstr "العرض الافتراضي للمذكرات الجديدة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Draw spelling error indicators on words as you type."
 msgstr "رسم مؤشّرات أخطاء التّهجئة على الكلمات أثناء ما تكتب."
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Empty Trash folders on exit"
 msgstr "إفراغ مجلّدات القمامة عند الإنهاء"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "إفراغ جميع مجلّدات القمامة عند الخروج من إيفُليوشِن."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "تفعيل نسق النّابض، حتّى يمكنك رؤية مؤشّر عند قراءة البريد."
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Enable or disable type ahead search feature"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
 msgid "Enable/disable caret mode"
 msgstr "تغعيل/تعطيل نسق النّابض"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Height of the message-list pane"
 msgstr "ارتفاع لوح قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "Height of the message-list pane."
 msgstr "ارتفاع لوح قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:34
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "List of Labels and their associated colors"
 msgstr "قائمة العلامات و الألوان المرتبطة بها"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "List of accepted licenses"
-msgstr "قائمة الحسابات"
+msgstr "لائحة كودكات الصوت"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "List of accounts"
 msgstr "قائمة الحسابات"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:41
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "قائمة أنواع mime للتّفقّد عن عارضات مكوّنات بونوبو"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Load images for HTML messages over http"
 msgstr "تحميل صور لرسائل HTML عبر http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Log filter actions"
 msgstr "تسجيل إجراءات المصفاة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Log filter actions to the specified log file."
 msgstr "تسجيل إجراءات المصفاة على ملف السّجل المحدّد."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Logfile to log filter actions"
 msgstr "ملف السّجل لتسجيل إجراءات المصفاة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Logfile to log filter actions."
 msgstr "ملف السّجل لتسجيل إجراءات المصفاة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Mark as Seen after specified timeout"
 msgstr "تعليم كمراجع بعد المهلة المحدّدة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Mark as Seen after specified timeout."
 msgstr "تعليم كمراجع بعد المهلة المحدّدة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Mark citations in the message \"Preview\""
 msgstr "تعليم الاقتباسات في \"معاينة\" الرّسالة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "Mark citations in the message \"Preview\"."
 msgstr "تعليم الاقتباسات في \"معاينة\" الرّسالة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "Message Window default height"
-msgstr "إرتفاع النّافذة الإفتراضي"
+msgstr "ارتفاع لوح قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:55
+#, fuzzy
 msgid "Message Window default width"
-msgstr ""
+msgstr "العنوان الإفتراضي للرّسالة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+#: ../mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "أسلوب عرض الرّسالة (عادي، ترويسات كاملة، مصدر)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "New Mail Notify sound file"
 msgstr "ملف صوت التّبليغ ببريدٍ جديد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "New Mail Notify type"
 msgstr "نوع التّبليغ ببريدٍ جديد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:61
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt on empty subject"
 msgstr "المسائلة عن موضوع خالي"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "مسائلة المستخدم عندما يحاول محو مجلّد."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "مسائلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Prompt when user expunges"
 msgstr "المسائلة حين يقوم المستخدم بالمحو"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Prompt when user only fills Bcc"
 msgstr "المسائلة حين لا يملأ المستخدم سوى حقل النّسخة الكربونيّة المخفيّة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "المسائلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة"
 "\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12416,97 +13229,108 @@ msgstr ""
 "المسائلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين قد لا يرغبون باستلام "
 "بريد HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "المسائلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة"
 "\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "المسائلة حين يحاول المستخدم إرسال HTML غير مرغوبٍ فيه"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:71
+#, fuzzy
+msgid "Prompt while marking multiple messages"
+msgstr "المسائلة حين يقوم المستخدم بالمحو"
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Recognize links in text and replace them."
 msgstr "التّعرّف على الوصلات في النّص و الاستبدال بها."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Recognize smileys in text and replace them with images."
 msgstr "التّعرّف على التّعابير في النّص و استبدال الصّور بها."
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Run junk test on incoming mail"
 msgstr "تنفيذ اختبار النفاية على البريد الوارد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Send HTML mail by default"
 msgstr "إرسال بريد HTML افتراضا"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Send HTML mail by default."
 msgstr "إرسال بريد HTML افتراضا."
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Show Animations"
 msgstr "إظهار الرّسوم المتحرّكة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Show animated images as animations."
 msgstr "إظهار الصّور المتحرّكة كرسوم متحرّكة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "إظهار الرّسائل المحذوفة (بخطٍّ يشطبها) في قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Show deleted messages in the message-list"
 msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "إظهار لوح \"المعاينة\""
+#: ../mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
+msgid ""
+"Show the email of the sender in the messages composite column in the message "
+"list"
+msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "إظهار لوح \"المعاينة\"."
+#: ../mail/evolution-mail.schemas.in.in.h:84
+#, fuzzy
+msgid "Show the sender email in the messages column in the message list"
+msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Sound file to play when new mail arrives."
 msgstr "الصّوت الذي سيُعزف عند وصول بريدٍ جديد."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "لتحديد فئة إشعار البريد الجديد التي يود المستخدم استخدامها."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Spell check inline"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:88
+#, fuzzy
 msgid "Subscribe dialog default height"
-msgstr ""
+msgstr "الارتفاع الافتراضي للمذكرات الجديدة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:89
+#, fuzzy
 msgid "Subscribe dialog default width"
-msgstr ""
+msgstr "العرض الافتراضي للمذكرات الجديدة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "Terminal font"
 msgstr "خط الشاشة الطرفيّة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "The terminal font for mail display"
 msgstr "خط الشاشة الطرفيّة لعرض البريد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "The variable width font for mail display"
 msgstr "الخط المتغيّر العرض لعرض البريد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:94
 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;"
@@ -12514,173 +13338,189 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:95
+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.in.h:96
 msgid "Thread the message list."
 msgstr "تشعيب قائمة الرّسائل."
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
 msgstr "تشعيب قائمة الرّسائل"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Thread the message-list based on Subject"
 msgstr "تشعيب قائمة الرّسائل حسب الموضوع"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "Timeout for marking message as Seen"
 msgstr "مهلة قبل تعليم الرسالة كمراجَعة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "Timeout for marking message as Seen."
 msgstr "مهلة·قبل·تعليم·الرسالة·كمراجَعة."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "UID string of the default account."
 msgstr "سلسلة هويّة المستخدم للحساب الإفتراضي."
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "Use Spamassassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "Use custom fonts"
 msgstr "إستعمال خطوط مخصّصة"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "Use custom fonts for displaying mail"
 msgstr "إستعمال خطوط مخصّصة لعرض البريد"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "Variable width font"
 msgstr "خط متغير العرض"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:111
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:112
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:113
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:114
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:115
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:116
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:117
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:118
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:119
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:120
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/evolution-mail.schemas.in.in.h:121
+#, fuzzy
+msgid "Width of the message-list pane"
+msgstr "ارتفاع لوح قائمة الرّسائل"
+
+#: ../mail/evolution-mail.schemas.in.in.h:122
+#, fuzzy
+msgid "Width of the message-list pane."
+msgstr "ارتفاع لوح قائمة الرّسائل"
+
+#: ../mail/importers/elm-importer.c:192
 #, fuzzy
 msgid "Importing Elm data"
-msgstr "جاري إستيراد الملفات"
+msgstr "مرجع بيانات كائن"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "مستورد elm لإيفُليوشِن"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 #, fuzzy
 msgid "Import mail from Elm."
-msgstr "بريد مهم (محلّي)"
+msgstr "إستيراد علامات المواقع من ملف"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 #, fuzzy
 msgid "Destination folder:"
-msgstr "مجلّد ال_مسوّدات:"
+msgstr "المجلّد المقصود:"
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 #, fuzzy
 msgid "Select folder to import into"
-msgstr "إنتقاء شهادة لإستيرادها..."
+msgstr "اختر برنامج لاستيراد الصور"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
+#, fuzzy
 msgid "Berkeley Mailbox (mbox)"
-msgstr ""
+msgstr "لا يمكن فتح صندوق البريد %s: %s\n"
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
 #, fuzzy, c-format
 msgid "Importing `%s'"
-msgstr "جاري استيراد"
-
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
 msgstr "جاري الاستيراد..."
 
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:536
 msgid "Please wait"
 msgstr "الرجاء الإنتظار"
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 #, fuzzy
 msgid "Importing mailbox"
-msgstr "جاري إستيراد الملفات"
+msgstr "موقع صندوق البريد"
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "جاري مسح %s"
 
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "مصفاة ذات الأولويّة \"%s\""
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12695,7 +13535,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12703,7 +13543,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12712,24 +13552,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr "إيفُليوشِن بصدد استيراد ملفّات نتْسكيب القديمة الخاصّة بك"
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 #, fuzzy
 msgid "Importing Netscape data"
-msgstr "إيفُليوشِن بصدد استيراد ملفّات نتْسكيب القديمة الخاصّة بك"
+msgstr "مرجع بيانات كائن"
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr "التعيينات"
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr "مصفات البريد"
 
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12737,380 +13577,408 @@ msgstr ""
 "عثر إيفُليوشِن على ملفّات بريد نتْسكيب\n"
 "هل تريد استيرادها لإيفُليوشِن؟"
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 #, fuzzy
 msgid "Importing Pine data"
-msgstr "جاري إستيراد الملفات"
+msgstr "مرجع بيانات كائن"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "مستورد pine لإيفُليوشِن"
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 #, fuzzy
 msgid "Import mail from Pine."
-msgstr "إستيراد ملف _وحيد"
+msgstr "إستيراد علامات المواقع من ملف"
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "البريد إلى %s"
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "البريد من %s"
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "الموضوع هو %s"
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "قائمة %s البريديّة"
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "إضافة قاعدة مصفاة"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:524
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "حُذف"
 msgstr[1] "حُذف"
 
-#: ../mail/mail-component.c:511
-#, c-format
+#: ../mail/mail-component.c:526
+#, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] ""
+msgstr[0] "نفاية"
 msgstr[1] ""
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:549
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
-msgstr[0] "%d يوم"
+msgstr[0] "مسوّدة"
 msgstr[1] "%d يوم"
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:551
 #, fuzzy, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "%d ثواني"
+msgstr[0] "أرسل:"
 msgstr[1] "%d ثواني"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:553
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d ثواني"
 msgstr[1] "%d ثواني"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
-msgstr[0] "%d مراسَلين"
+msgstr[0] "المجموع:"
 msgstr[1] "%d مراسَلين"
 
-#: ../mail/mail-component.c:544
-#, c-format
+#: ../mail/mail-component.c:559
+#, fuzzy, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] ""
+msgstr[0] "الرّسالة ال_غير مقروءة التالية"
 msgstr[1] ""
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:841
 msgid "New Mail Message"
 msgstr "رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:842
 msgid "_Mail Message"
 msgstr "_رسالة بريديّة"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:843
 msgid "Compose a new mail message"
 msgstr "تأليف رسالة بريديّة جديدة"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:849
 #, fuzzy
 msgid "New Mail Folder"
-msgstr "مجلّد _جديد..."
+msgstr "اسم دليل جديد"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:850
 #, fuzzy
 msgid "Mail _Folder"
-msgstr "مصفات البريد"
+msgstr "فتح المجلد %s"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:851
 #, fuzzy
 msgid "Create a new mail folder"
-msgstr "إنشاء رزنامة جديدة"
+msgstr "انشاء مجلد جديد فارغ داخل هذا المجلد"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../mail/mail-config.c:85
 #, fuzzy
-msgid "    "
-msgstr "      "
+msgid "I_mportant"
+msgstr "مهم"
 
-#: ../mail/mail-config.glade.h:2
+#. red
+#: ../mail/mail-config.c:86
+#, fuzzy
+msgid "_Work"
+msgstr "عمل"
+
+#. orange
+#: ../mail/mail-config.c:87
+#, fuzzy
+msgid "_Personal"
+msgstr "شخصي"
+
+#. forest green
+#: ../mail/mail-config.c:88
+#, fuzzy
+msgid "_To Do"
+msgstr "للقيام به"
+
+#. blue
+#: ../mail/mail-config.c:89
+#, fuzzy
+msgid "_Later"
+msgstr "لاحقاً"
+
+#: ../mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _مراجعة عن الأنواع المدعومة "
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "(SSL ليس مدعوماً في هذا المركّب من إيفُليوشِن)"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 #, fuzzy
-msgid "<b>S_ignatures</b>"
+msgid "<b>Sig_natures</b>"
 msgstr "<b>الحالة:</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>_Languages</b>"
-msgstr "<b>الحالة:</b>"
+msgstr "لغات"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
+#, fuzzy
 msgid "<span weight=\"bold\">Account Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">معلومات المراسَل</span>"
 
 #: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:10
+#, fuzzy
 msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
+#, fuzzy
 msgid "<span weight=\"bold\">Authentication</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
+#, fuzzy
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
+#, fuzzy
 msgid "<span weight=\"bold\">Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
+#, fuzzy
 msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr ""
+msgstr "<span·weight=\"bold\">المشهد الإفتراضي</span>"
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
+#, fuzzy
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
+#, fuzzy
 msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
+#, fuzzy
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
+#, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
+#, fuzzy
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "الرسائل المبعوثة و المسودّات"
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "التّبليغ بالبريد الجديد"
+msgstr "<span·weight=\"bold\"·size=\"larger\">هل أطبق الخط الجديد؟</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+#, fuzzy
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">معلومات المراسَل</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
+#, fuzzy
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "أمن طيب جدا (PGP/GPG)"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
+#, fuzzy
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
+#, fuzzy
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">معلومات المراسَل</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
+#, fuzzy
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
+#, fuzzy
 msgid "<span weight=\"bold\">Security</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "الرسائل المبعوثة و المسودّات"
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
+#, fuzzy
 msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "إدارة الحسابات"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
 #, fuzzy
 msgid "Add Ne_w Signature..."
-msgstr "إضافة توقيع جديد..."
+msgstr "تهيئة توقيع غير مدعومة"
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Add _Script"
-msgstr "إضافة مخطو_ط"
+msgstr "حوا _سكريبت"
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
 #, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "توقيع الرسائل الخارجة _دائما عند إستعمال هذا الحساب"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr "_تشفير للذات كذلك عند إرسال البريد المشفّر"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "إرسال نسخة _كربونيّة دائماً إلى:"
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "إرسال نسخة كربونيّة _مخفيّة دائماً إلى:"
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "وثوق دائم لمفاتيحي عند التشفير"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "تشفير _دائم لي عند إرسال البريد"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "إرفاق الرّسالة الأصليّة"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "المُرفق"
-
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
 #, fuzzy
-msgid "Automatically _insert smiley images"
+msgid "Automatically insert _smiley images"
 msgstr "إدراج آ_لي للتعابير المرسومة"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
 msgstr "بلطيق (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr "بلطيق (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
-msgstr "_رنّة عند مجيء بريد جديد"
+msgstr "ينبهك عند وصول بريد جديد"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "ال_محرف:"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _مراجعة عن الأنواع المدعومة "
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:51
 #, fuzzy
-msgid "Check _incoming mail for junk"
+msgid "Check in_coming mail for junk"
 msgstr "تفقّد عن كون البريد الوارد تافه"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr "مراجعة التّهجئة أثناء ال_كتابة"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr "مراجعة رسائل البريد الداخلة فيما إذا كانت نفاية"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Cle_ar"
 msgstr "_مسح"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Clea_r"
 msgstr "_مسح"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr "لون الكلمات المت_هجّأة خطأً:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Colors"
-msgstr "الأ_لوان"
+msgstr "الألوان"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "تأ_كيد عند شطب مجلّد"
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13126,90 +13994,102 @@ msgstr ""
 "\n"
 "الرجاء نقر \"تطبيق\" لحفظ تعييناتك."
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "الإ_فتراض"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default character e_ncoding:"
-msgstr "_تشفير الحروف الإفتراضي:"
+msgstr "مجموعة رموز مجهولة: %s"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr "ت_وقيع الرسائل الخارجة رقميّا (إفتراضا)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "عدم اقتباس الرّسالة الأصليّة"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
 msgid "Done"
 msgstr "تم"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Drafts _Folder:"
-msgstr "مجلّد ال_مسوّدات:"
+msgstr "فتح المجلد %s"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:73
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_تفعيل"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "حسابات البريد الإلكتروني"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Email _Address:"
-msgstr "_عنوان البريد الإلكتروني:"
+msgstr "عنوان البريد الإلكتروني"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Empty trash folders on e_xit"
-msgstr "إفراغ _مجلّدات المهملات عند الإنهاء"
+msgstr "إفراغ مجلّدات القمامة عند الإنهاء"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr "شهادة الت_شفير:"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
 msgstr "_تشفير الرسائل الخارجة (إفتراضا)"
 
-#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "تنفيذ الأمر..."
+#: ../mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Fi_xed width Font:"
+msgstr "إنتقاء خط HTML الثّابت العرض"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed-width:"
-msgstr "_ثابت العرض:"
+msgstr "ملائمة بعرض الصفحة"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "خصائص الخط"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr "تهيئة الملفّات ب_تهيئة HTML"
 
+#: ../mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Full Nam_e:"
+msgstr "الفيتنام"
+
 #: ../mail/mail-config.glade.h:86
 #, fuzzy
 msgid "HTML Mail"
-msgstr "_بريد HTML"
+msgstr "كتابةال_بريد الالكتروني"
 
 #: ../mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Headers"
-msgstr "التّرويسة"
+msgstr "<b>الترويسات</b>"
 
 #: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
 msgstr "إبراز الإ_قتباسات بـ"
 
 #: ../mail/mail-config.glade.h:89
+#, fuzzy
 msgid "I_nclude remote tests"
-msgstr ""
+msgstr "قيمة التكبير البعيد"
 
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
@@ -13218,15 +14098,16 @@ msgstr "ضمن السّياق"
 #: ../mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Languages Table"
-msgstr "اللّغة"
+msgstr "جسم الجدول"
 
 #: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "إعدادات البريد"
 
 #: ../mail/mail-config.glade.h:97
+#, fuzzy
 msgid "Mail Headers Table"
-msgstr ""
+msgstr "محوّل جدول الشّجرة الالكترونيّة"
 
 #: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
@@ -13253,7 +14134,7 @@ msgstr "هوية _مفتاح PGP/GPG:"
 #: ../mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
-msgstr "_عزف ملف صوتي عند تلقي رسالة جديدة"
+msgstr "الصّوت الذي سيُعزف عند وصول بريدٍ جديد."
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -13293,7 +14174,7 @@ msgstr "مقتبس"
 #: ../mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Re_member password"
-msgstr "_تذكر كلمة السر هذه"
+msgstr "تغيير كلمة المرور..."
 
 #: ../mail/mail-config.glade.h:116
 msgid "Re_ply-To:"
@@ -13302,7 +14183,7 @@ msgstr "رد على:"
 #: ../mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Remember _password"
-msgstr "تذكر كلمة ال_سر هذه"
+msgstr "تذكّر كلمة المرور هذه"
 
 #: ../mail/mail-config.glade.h:119
 #, fuzzy
@@ -13311,90 +14192,90 @@ msgstr "إ_نتقاء..."
 
 #: ../mail/mail-config.glade.h:120
 #, fuzzy
-msgid "S_tandard Font:"
-msgstr "خط _قياسي:"
+msgid "S_end message receipts:"
+msgstr "رسالة إجتماع رديئة"
 
 #: ../mail/mail-config.glade.h:121
 #, fuzzy
+msgid "S_tandard Font:"
+msgstr "<b>خط داشر:</b>"
+
+#: ../mail/mail-config.glade.h:122
+#, fuzzy
 msgid "Se_lect..."
-msgstr "إ_نتقاء..."
+msgstr "الغاء اخت_يار الكل"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "إنتقاء خط HTML الثّابت العرض"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "إنتقاء خط HTML الثّابت العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "إنتقاء خط HTML المتغيّر العرض"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "إنتقاء خط HTML المتغيّر العرض للطّباعة"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 #, fuzzy
-msgid "Send message receipts:"
-msgstr "إر_سال الرّسالة لـ..."
+msgid "Select sound file"
+msgstr "انتقاء ملف الصوت"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "جاري إرسال البريد"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sent _Messages Folder:"
-msgstr "مجلّد ال_رسائل المرسلة:"
+msgstr "كمجلّد _مُرسلات"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
-msgstr "يتطلب ال_نادل التوثّق"
+msgstr "يتطلب ال_خادم التوثّق"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "_نوع النّادل:"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 #, fuzzy
 msgid "Sig_ning certificate:"
-msgstr "شهادة ال_توقيع:"
+msgstr "الشهادة موجودة مسبقا."
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "التّوقيع:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Signatures"
 msgstr "ت_وقيعات"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signatures Table"
-msgstr "ت_وقيعات"
+msgstr "جسم الجدول"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "تحديد إسم _ملف:"
 
-#: ../mail/mail-config.glade.h:138
-#, fuzzy
-msgid "Spell Checking"
-msgstr "مراجعة الت_هجأة"
-
 #: ../mail/mail-config.glade.h:139
 #, fuzzy
-msgid "T_erminal Font:"
-msgstr "خط الشاشة ال_طّرفيّة:"
+msgid "Spell Checking"
+msgstr "إكمال التثبت من التهجئة"
 
 #: ../mail/mail-config.glade.h:140
 #, fuzzy
 msgid "T_ype: "
-msgstr "النّوع:"
+msgstr "بحسب الن_وع"
 
 #: ../mail/mail-config.glade.h:141
 msgid ""
@@ -13417,7 +14298,7 @@ msgstr ""
 "اكتب الإسم الذي تريد به الإشارة إلى هذا الحساب.\n"
 "\"عمل\" أو \"شخصي\" مثلا"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "إ_سم المستخدم:"
 
@@ -13450,7 +14331,7 @@ msgstr "لا ت_بلغني عند مجيء بريد جديد"
 
 #: ../mail/mail-config.glade.h:157
 #, fuzzy
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "لا توقيع لطلبات المقابلة (للتوافق مع آوتلوك)"
 
 #: ../mail/mail-config.glade.h:159
@@ -13458,469 +14339,473 @@ msgid "_Forward style:"
 msgstr "أسلوب الت_مرير:"
 
 #: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "الإسم ال_كامل:"
-
-#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
 msgid "_Make this my default account"
 msgstr "_جعل هذا حسابي الإفتراضي"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
 msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_لا تحميل للصور خارج الإنترنت بتاتا"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "ال_مسار:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
+#: ../mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr ""
+"المسائلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين قد لا يرغبون باستلام "
+"بريد HTML."
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr "أسلوب ال_رد:"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Script:"
 msgstr "_مخطوط:"
 
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "إ_ظهار الصور المتحركة"
+#, fuzzy
+msgid "_Show image animations"
+msgstr "إظهار الصّور المتحرّكة كرسوم متحرّكة."
 
 #: ../mail/mail-config.glade.h:173
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Use Secure Connection:"
-msgstr "إ_ستعمال إتصال آمن (SSL):"
+msgstr "ال_اسم المستخدم للاتصال:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
+#, fuzzy
+msgid "addresses"
+msgstr "العنوان"
+
+#: ../mail/mail-config.glade.h:177
 msgid "color"
 msgstr "اللّون"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "description"
 msgstr "الوصف"
 
+#: ../mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid "    "
+msgstr "    "
+
 #: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "موارد المجلّدات الاعتباطية"
+msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
 
 #: ../mail/mail-dialogs.glade.h:3
+#, fuzzy
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">اسم الملف</span>"
 
 #: ../mail/mail-dialogs.glade.h:4
+#, fuzzy
 msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">ألوان</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
 #, fuzzy
-msgid "Case _Sensitive"
-msgstr "حسّاس للحالة"
+msgid "All active remote folders"
+msgstr "ضبط كخلفية ل_جميع المجلدات"
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
 #, fuzzy
-msgid "Co_mpleted"
-msgstr "مُنجز"
+msgid "All local and active remote folders"
+msgstr "مع كل المجلّدات المحلّية و النّشطة عن بعد"
+
+#: ../mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "All local folders"
+msgstr "غل_ق جميع المجلّدات"
 
 #: ../mail/mail-dialogs.glade.h:8
 #, fuzzy
+msgid "Case _sensitive"
+msgstr "حساس لل_حالة"
+
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#, fuzzy
+msgid "Co_mpleted"
+msgstr "ات_صال"
+
+#: ../mail/mail-dialogs.glade.h:11
+#, fuzzy
 msgid "F_ind:"
-msgstr "إيجاد:"
+msgstr "ب_حث:"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:12
+#, fuzzy
 msgid "Find in Message"
-msgstr ""
+msgstr "ليس ثمّة رسالة %s في %s"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:2
+#, fuzzy
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "بحسب _علامة المتابعة"
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Folder Subscriptions"
 msgstr "إشتراكات المجلّدات"
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:15
 #, fuzzy
 msgid "License Agreement"
 msgstr "اتفاق على المفتاح"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:16
+#, fuzzy
 msgid "None Selected"
-msgstr ""
+msgstr "اليوم المنتقى (%a %b %d %Y)"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:17
 msgid "S_erver:"
 msgstr "النّا_دل:"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Security Information"
 msgstr "معلومات الأمن"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "Specific folders"
+msgstr "مجلّدات محلّيّة"
+
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:23
 #, fuzzy
 msgid "_Accept License"
-msgstr "مقبول"
+msgstr "تقبل الكوكي"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
 #, fuzzy
 msgid "_Due By:"
-msgstr "تاريخ الإ_ستحقاق:"
+msgstr "المطورون"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
 msgid "_Flag:"
 msgstr "ال_علم:"
 
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr "_اشتراك"
-
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:26
 msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "إل_غاء الإشتراك"
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr "مجلّدات محدّدة فقط"
-
-#: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr "مع كل المجلّدات النّشطة عن بعد"
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr "مع كل المجلّدات المحلّية و النّشطة عن بعد"
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
-msgstr "مع كل المجلّدات المحلّيّة"
-
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:105
 msgid "Filtering Folder"
 msgstr "جاري تصفية الدّليل"
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "جاري سحب البريد"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:566
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "فشل تطبيق مصفات الإخراج: %s"
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:624
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "جاري إرسال الرسالة %d من %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:761
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "فشل عند الرّسالة %d من أصل %d"
+msgstr "فشل الإرسال لتكلّم السلسلة التالية \"%s\""
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#, fuzzy
+msgid "Canceled."
 msgstr "ألغي."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765
 msgid "Complete."
 msgstr "تم."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "جاري حفظ الرّسالة في المجلّد"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
 msgstr "جاري نقل الرسائل إلى %s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
 msgstr "جاري نسخ الرسائل إلى %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1170
 msgid "Forwarded messages"
 msgstr "الرسائل الممرّرة"
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1213
 #, c-format
 msgid "Opening folder %s"
 msgstr "جاري فتح المجلّد %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr "جاري فتح المخزن %s"
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1363
 #, c-format
 msgid "Removing folder %s"
 msgstr "جاري إزالة المجلّد %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "جاري تخزين المجلّد '%s'"
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1523
 #, fuzzy, c-format
 msgid "Storing account '%s'"
-msgstr "جاري تخزين المجلّد '%s'"
+msgstr "إسم الحساب:"
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr "جاري تحديث المجلّد"
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr "جاري شطب المجلّد"
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "جاري إفراغ سلة المهملات في '%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1663
 msgid "Local Folders"
 msgstr "مجلّدات محلّيّة"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
 msgstr "جاري سحب الرسالة %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1856
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "جاري سحب %d رسائل"
+msgstr[0] "جاري سحب الرسالة %s"
 msgstr[1] "جاري سحب %d رسائل"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1942
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] "جاري حفظ %d رسائل"
+msgstr[0] "جاري حفظ الرّسالة في المجلّد"
 msgstr[1] "جاري حفظ %d رسائل"
 
-#: ../mail/mail-ops.c:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-"لم يمكن إنشاء ملف الإخراج: %s\n"
-"·%s"
-
-#: ../mail/mail-ops.c:2017
-#, c-format
+#: ../mail/mail-ops.c:2013
+#, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
-msgstr ""
+msgstr "خطأ حفظ شجرة GConf إلى '%s': %s\n"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2085
 msgid "Saving attachment"
 msgstr "جاري حفظ المُرفق"
 
-#: ../mail/mail-ops.c:2100
-#, c-format
+#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
-msgstr ""
+msgstr "لا يمكن انشاء اخراج ملف GStreamer"
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2114
 #, c-format
 msgid "Could not write data: %s"
 msgstr "لم يمكن كتابة البيانات: %s"
 
-#: ../mail/mail-ops.c:2260
-#, c-format
+#: ../mail/mail-ops.c:2263
+#, fuzzy, c-format
 msgid "Disconnecting from %s"
-msgstr ""
+msgstr "أخبار من %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "جاري إعادة الإتصال بـ %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2379
 msgid "Checking Service"
 msgstr "جاري فحص الخدمة"
 
-#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+#: ../mail/mail-send-recv.c:159
+#, fuzzy
+msgid "Canceling..."
 msgstr "جاري الإلغاء..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "النادل: %s، النوع: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "المسار: %s، النوع: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr "النوع: %s"
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:349
 msgid "Send & Receive Mail"
 msgstr "إرسال و تلقي البريد"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:356
 msgid "Cancel _All"
 msgstr "إلغاء ال_كل"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:453
 msgid "Updating..."
 msgstr "جاري التّحديث..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
 msgid "Waiting..."
 msgstr "جاري الإنتظار..."
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:738
 #, fuzzy
 msgid "Checking for new mail"
-msgstr "مراجعة عن بريد جديد"
+msgstr "جاري التّفقّد عن وصول بريد جديد"
+
+#: ../mail/mail-session.c:205
+#, fuzzy, c-format
+msgid "Enter Passphrase for %s"
+msgstr "ادخل كلمة السر لـ %s"
 
 #: ../mail/mail-session.c:207
+#, fuzzy
+msgid "Enter Passphrase"
+msgstr "أدخل كلمة المرور"
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ادخل كلمة السر لـ %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "أدخل كلمة السّر"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:250
+#, fuzzy
 msgid "User canceled operation."
-msgstr ""
+msgstr "تم إلغاء العملية من طرف المستخدم."
 
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "تحرير التّوقيع"
 
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "ادخل إسما لهذا التوقيع."
 
-#: ../mail/mail-signature-editor.c:415
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "الإسم:"
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr ""
-"لم يمكن إنشاء المجلّد `%s':\n"
-"%s"
+msgstr "لم يمكن إنشاء دليل مفاتيح الاختصار لجنوم `%s': %s\n"
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:242
-#, c-format
+#: ../mail/mail-tools.c:256
+#, fuzzy, c-format
 msgid "Forwarded message - %s"
-msgstr ""
+msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
+#, fuzzy
 msgid "Forwarded message"
-msgstr ""
+msgstr "-------- رسالة ممرّرة -------- "
 
-#: ../mail/mail-tools.c:284
-#, c-format
+#: ../mail/mail-tools.c:298
+#, fuzzy, c-format
 msgid "Invalid folder: `%s'"
-msgstr ""
+msgstr "فتح المجلد %s"
 
 #: ../mail/mail-vfolder.c:91
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "جاري تخزين المجلّد '%s'"
+msgstr "إعداد غوغل مباشر"
 
 #: ../mail/mail-vfolder.c:240
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "جاري تخزين المجلّد '%s'"
+msgstr "_تصفّح لأدلّة أخرى"
 
 #: ../mail/mail-vfolder.c:247
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "جاري تخزين المجلّد '%s'"
+msgstr "_تصفّح لأدلّة أخرى"
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1023
 #, fuzzy
 msgid "Edit Search Folder"
-msgstr "انتقاء المجلّد"
+msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1107
 #, fuzzy
 msgid "New Search Folder"
-msgstr "انتقاء المجلّد"
+msgstr "اسم دليل جديد"
 
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
@@ -13933,15 +14818,22 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:6
+#, fuzzy
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr "هناك مجلّد بالإسم \"%s\" موجود أصلاً. الرجاء استعمال إسم آخر."
+
 #: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
@@ -13958,266 +14850,286 @@ msgstr ""
 #: ../mail/mail.error.xml.h:9
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
+msgstr "هل أنت متأكدٌ أنّك تريد حذف البند المنتقى نهائيّاً؟"
+
+#: ../mail/mail.error.xml.h:10
+#, fuzzy
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "هل أنت متأكّد أنّك تريد\n"
 "حذف هذا المراسَل؟"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 #, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 #, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "هل تريد فعلاً حذف هذا الحساب؟"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 #, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "مسائلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
+#, fuzzy
+msgid "Blank Signature"
+msgstr "توقيع سليم"
+
+#: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "لا يمكن فتح الملف"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot create folder &quot;{0}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "لا يمكن إنشاء قفل المجلّد على %s: %s"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 #, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr "لم يمكن إنشاء الدليل المؤقّت: %s"
+msgstr "فشل إنشاء مجلد مؤقت"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 #, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "لا يمكن إنشاء الدّليل `%s': %s"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 #, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
-"لا يمكن حذف المجلّد:\n"
-"%s"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 #, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 #, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "الملف `%s' غير موجود."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "لم يمكن إلحاق الرّسالة بدليل maildir: %s: %s"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 #, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr "لا يمكن فتح الملف"
+msgstr "تعذر فتح الملف \"%s\". \n"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 #, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "تعذر فتح الملف \"%s\". \n"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 #, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "تعذر فتح الملف \"%s\". \n"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 #, fuzzy
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "عفوا، لم يمكن إعادة تسمية \"%s\" إلى \"%s\"."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 #, fuzzy
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "لا يمكن إعادة تسمية الدّليل: %s: لا مجلّد بهذا الإسم"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 #, fuzzy
 msgid "Cannot save changes to account."
-msgstr "و مراسَل آخر."
+msgstr "هل تريد حفظ التّغييرات في المستند \"%s\" قبل غلقه؟"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "لا يمكن فتح الملف"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "لا يمكن فتح الملف"
+msgstr "الملف الذي فيه سيحفظ تقرير الخلال"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 #, fuzzy
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "لم يمكن فتح المجلّد المشترك: %s."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 #, fuzzy
 msgid "Could not save signature file."
-msgstr "لم يمكن فتح المجلّد المشترك: %s."
+msgstr "لم يمكن حفظ ملف الإعدادات.\n"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 #, fuzzy
 msgid "Delete &quot;{0}&quot;?"
-msgstr "حذف \"%s\""
+msgstr "_حذف شريط الأدوات"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 #, fuzzy
 msgid "Delete account?"
-msgstr "حذف المراسَلين المنتقَيين"
+msgstr "إسم الحساب:"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 #, fuzzy
-msgid "Discard changed?"
-msgstr "تجا_هل التّغييرات"
+msgid "Discard changes?"
+msgstr "التراجع عن التغييرات؟"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Do not delete"
+msgstr "لم يمكن حذف \"%s\"."
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Do not disable"
+msgstr "الرجاء عدم الإزعاج"
+
+#: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "ليس لديك التصريح لفتح المجلّد في `%s'"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:48
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "هل تريد حفظ التّغييرات؟"
+msgid "Do you want to mark all messages as read?"
+msgstr "تعليم جميع الرسائل المرئيّة كمقروءة"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:49
 #, fuzzy
-msgid "Don't delete"
-msgstr "_تراجع عن الحذف"
+msgid "Do you wish to save your changes?"
+msgstr "هل تريد حفظ التّغييرات؟"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 #, fuzzy
 msgid "Enter password."
-msgstr "أدخل كلمة السّر"
+msgstr "أدخل كلمة المرور"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 #, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
-"خطأ أثناء تحميل معلومات المصفاة:\n"
-"%s"
+msgstr "خطأ أثناء تنفيذ بحث المصفات: %s: %s"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 #, fuzzy
 msgid "Error while performing operation."
 msgstr "خطأ أثناء فتح الرُّزنامة"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 #, fuzzy
 msgid "Error while {0}."
-msgstr ""
-"خطأ أثناء '%s':\n"
-"%s"
+msgstr "حدث خطأ خلال فتح %s."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 #, fuzzy
 msgid "File exists but cannot overwrite it."
-msgstr "الملف موجود أصلاً، هل أنمقه؟"
+msgstr "الملف موجود. هل تريد تنميقه؟"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 #, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "الملف '%s' غير موجود أو أنّه ليس ملفّاً اعتياديّاً."
+msgstr "الملف '%s' ليس ملفا أو مجلدا اعتياديين."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:63
+#, fuzzy
 msgid "Ignore"
-msgstr ""
+msgstr "تجاهل"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:64
 #, fuzzy
 msgid "Invalid authentication"
-msgstr "توثّق SMTP"
+msgstr "شاشة الدخول:"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14225,41 +15137,50 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:67
 #, fuzzy
 msgid "Mark all messages as read"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
+
+#: ../mail/mail.error.xml.h:68
+#, fuzzy
+msgid "Mark all messages in subfolders as read?"
 msgstr "تعليم جميع الرسائل المرئيّة كمقروءة"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:69
 #, fuzzy
-msgid "Mark all messages as read in the selected folder"
+msgid "Mark as _Read"
 msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:70
 #, fuzzy
 msgid "Missing folder."
-msgstr "تحديث إجتماع"
+msgstr "فتح المجلد %s"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 #, fuzzy
 msgid "No sources selected."
-msgstr "لم يتم اختيار أي نادل"
+msgstr "لم يتم انتقاء أيّة تطبيقات"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14267,50 +15188,62 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
+#, fuzzy
+msgid "Please provide an unique name to identify this signature."
+msgstr "ادخل إسما لهذا التوقيع."
+
+#: ../mail/mail.error.xml.h:81
 #, fuzzy
 msgid "Please wait."
-msgstr "الرجاء الإنتظار"
+msgstr "الرجاء الإنتظار..."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:83
+#, fuzzy
 msgid "Querying server"
-msgstr ""
+msgstr "خادم STUN"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
 #, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "مطلوب التّشفير لآليّة التّوثيق المطلوبة"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:85
 #, fuzzy
 msgid "Read receipt requested."
-msgstr "وصول قراءة"
+msgstr "عدم إرسال وصل قراءة أبداً"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:86
 #, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "هل تريد فعلاً حذف المجلّد \"%s\" و كل مجلّداته الفرعيّة؟"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:87
+#, fuzzy
 msgid "Search Folders automatically updated."
-msgstr ""
+msgstr "بحث عن الملفات والمجلدات"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Send Receipt"
-msgstr "وصول قراءة"
+msgstr "إر_سال رسالة"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Signature Already Exists"
+msgstr "الشهادة موجودة مسبقا."
+
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14320,7 +15253,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:94
 #, fuzzy
 msgid ""
 "The following Search Folder(s):\n"
@@ -14333,7 +15266,7 @@ msgstr ""
 "····'%s'\n"
 "و تم تحديثه."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:99
 #, fuzzy
 msgid ""
 "The following filter rule(s):\n"
@@ -14346,37 +15279,35 @@ msgstr ""
 "····'%s'\n"
 "و تم تحديثه."
 
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:108
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
 #, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "نادل SMTP %s لا يدعم فئة التّوثّق المطلوبة %s."
+msgstr "خادم SMTP %s لا يدعم فئة التّوثّق المطلوبة %s."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:110
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -14384,173 +15315,175 @@ msgstr ""
 "\n"
 "هل تود حفظ تغييراتك؟"
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:111
+#, fuzzy
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
+
+#: ../mail/mail.error.xml.h:112
 #, fuzzy
 msgid "Unable to connect to the GroupWise server."
-msgstr "فشل الإتّصال بنادل LDAP"
+msgstr "لا يمكن الإتصال للخادم عن بعد"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:113
 #, fuzzy
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 "لم يمكن فتح مجلّد المسوّدات لهذا الحساب.\n"
 "هل تود استخدام مجلّد المسوّدات الافتراضي؟"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:114
 #, fuzzy
 msgid "Unable to read license file."
-msgstr ""
-"لا يمكن البحث على الملف: %s\n"
-"%s"
+msgstr "فشلت القراءة من الملف '%s': %s"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:115
 #, fuzzy
 msgid "Use _Default"
-msgstr "الإفتراض"
+msgstr "استخدم الألوان الإفتراضية"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:116
 #, fuzzy
 msgid "Use default drafts folder?"
-msgstr "مسار مجلّد المراسَلين الإفتراضي"
+msgstr "_استخدام تيمة الخط الإفتراضية"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "لم تكتب جميع المعلومات المطلوبة."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "لا يمكنك إنشاء حسابين بالإسم ذاته."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:120
 #, fuzzy
 msgid "You must name this Search Folder."
 msgstr "يجب ان تسمي المجلدا الاعتباطي هذا."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "يجب تحديد مجلّد."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:125
 #, fuzzy
 msgid "_Append"
-msgstr "_فتح"
+msgstr "إ_لحاق للملف"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:126
 #, fuzzy
 msgid "_Discard changes"
-msgstr "تجا_هل التّغييرات"
+msgstr "التراجع عن التغييرات؟"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:127
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "إفراغ _سلّة المهملات"
+msgid "_Do not Mark as Read"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:129
 #, fuzzy
 msgid "_Expunge"
 msgstr "_شطب"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:130
 #, fuzzy
 msgid "_Open Messages"
-msgstr "_فتح الرسالة"
+msgstr "الرسائل الممرّرة"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1020
 msgid "Unseen"
 msgstr "غير مراجع"
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1021
 msgid "Seen"
 msgstr "روجع"
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1022
 msgid "Answered"
 msgstr "مجاب"
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1023
 msgid "Multiple Unseen Messages"
 msgstr "رسائل غير مراجعة متعدّد"
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1024
 msgid "Multiple Messages"
 msgstr "رسائل متعدّدة"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1028
 msgid "Lowest"
 msgstr "الأدنى"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1029
 msgid "Lower"
 msgstr "أدنى"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1033
 msgid "Higher"
 msgstr "أعلى"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1034
 msgid "Highest"
 msgstr "الأعلى"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "؟"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1474 ../plugins/itip-formatter/itip-view.c:202
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "اليوم %l:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1483 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "الأمس %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1495 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1503 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2042
+#: ../mail/message-list.c:2261 ../mail/message-list.etspec.h:9
 #, fuzzy
-msgid "Message List"
+msgid "Messages"
 msgstr "ال_رسائل"
 
-#: ../mail/message-list.c:3387
+#: ../mail/message-list.c:3652
 msgid "Generating message list"
 msgstr "جاري إنشاء قائمة الرسائل"
 
 #: ../mail/message-list.etspec.h:3
+#, fuzzy
 msgid "Due By"
-msgstr ""
+msgstr "المطورون"
 
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
@@ -14561,56 +15494,61 @@ msgid "Flagged"
 msgstr "معلّم"
 
 #: ../mail/message-list.etspec.h:6
+#, fuzzy
 msgid "Follow Up Flag"
-msgstr ""
-
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "الموقع الأصلي"
+msgstr "بحسب _علامة المتابعة"
 
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:10
+#, fuzzy
 msgid "Received"
-msgstr ""
+msgstr "تلقى:"
 
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:14
+#, fuzzy
+msgid "Sent Messages"
+msgstr "الرسائل الممرّرة"
+
+#: ../mail/message-list.etspec.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "الحجم"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "نداء"
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "لا تمرير"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr "متابعة"
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "لمعلوماتك"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "تمرير"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr "لا داعي للرّد"
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "رد"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "رد على الجميع"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
+#, fuzzy
 msgid "Review"
-msgstr ""
+msgstr "معاينة بسيطة"
 
 #: ../mail/searchtypes.xml.h:1
 msgid "Body contains"
@@ -14637,6 +15575,15 @@ msgstr "الموضوع يحتوي"
 msgid "Subject or Sender contains"
 msgstr "الموضوع يحتوي"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Local Address Books"
+msgstr "عنوان البريد الالكتروني للموصول"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14644,12 +15591,14 @@ msgid ""
 msgstr ""
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+#, fuzzy
 msgid "Audio inline plugin"
-msgstr ""
+msgstr "لم يتم العثور على مدير صوت قابل للاستخدام"
 
 #: ../plugins/backup-restore/backup-restore.c:51
+#, fuzzy
 msgid "Select name of Evolution archive"
-msgstr ""
+msgstr "يجب تحديد إسم محفوظة."
 
 #: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
@@ -14666,22 +15615,22 @@ msgstr ""
 #: ../plugins/backup-restore/backup.c:109
 #, fuzzy
 msgid "Backup Evolution directory"
-msgstr "خطأ إيفُليوشِن"
+msgstr "ليس دليل مستخدمين صحيح"
 
 #: ../plugins/backup-restore/backup.c:111
 #, fuzzy
 msgid "Restore Evolution directory"
-msgstr "خطأ إيفُليوشِن"
+msgstr "ليس دليل مستخدمين صحيح"
 
 #: ../plugins/backup-restore/backup.c:113
 #, fuzzy
 msgid "Check Evolution archive"
-msgstr "طقم برامج مجموعات زيميان إيفُليوشِن"
+msgstr "استخراج من المحفوظة المختارة."
 
 #: ../plugins/backup-restore/backup.c:115
 #, fuzzy
 msgid "Restart Evolution"
-msgstr "لم يمكن تشغيل نادل وُمْبَت"
+msgstr "خطأ إيفُليوشِن"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
@@ -14689,13 +15638,14 @@ msgstr ""
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
 msgid "Backup and restore plugin"
-msgstr ""
+msgstr "إظهار الملفّات المخفية و ملفّات الإسناد"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 #, fuzzy
 msgid "Backup Settings..."
-msgstr "الإ_عدادات..."
+msgstr "اختر الإعدادات"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 #, fuzzy
@@ -14705,69 +15655,94 @@ msgstr "تغيير تعيينات ايفُليوشِن"
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 #, fuzzy
 msgid "Restore Settings..."
-msgstr "إعدادات الحاسوب اليدوي..."
+msgstr "اختر الإعدادات"
 
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 #, fuzzy
 msgid "Automatic Contacts"
-msgstr "المراسَلون المهمّون"
-
-#: ../plugins/bbdb/bbdb.c:413
-#, fuzzy
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "التّبليغ بالبريد الجديد"
+msgstr "مراسَلين بعيدين"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
+#: ../plugins/bbdb/bbdb.c:471
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:444
+#: ../plugins/bbdb/bbdb.c:477
 #, fuzzy
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "الرسائل المبعوثة و المسودّات"
+msgid "Select Address book for Automatic Contacts"
+msgstr "المراسَلون المهمّون"
+
+#: ../plugins/bbdb/bbdb.c:492
+#, fuzzy
+msgid "Instant Messaging Contacts"
+msgstr "المراسلون القريبون مني"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
+#: ../plugins/bbdb/bbdb.c:507
 msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:513
+msgid "Select Address book for Gaim buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:524
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
-msgid "Automatic contacts"
-msgstr "لا مراسَلين"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr ""
 
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+#, fuzzy
+msgid "CalDAV"
+msgstr "نداء"
+
+#: ../plugins/caldav/caldav-source.c:269
+#, fuzzy
+msgid "Use _SSL"
+msgstr "SSL غير متوفّر"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+#, fuzzy
+msgid "CalDAV Calendar sources"
+msgstr "المراسلون المحليون"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+#, fuzzy
+msgid "CalDAV sources"
+msgstr "إفتراض الحروف"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
 msgid "Local Calendars"
-msgstr "جاري تحميل الرُّزنامة"
+msgstr "المراسلون المحليون"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Provides core functionality for local calendars."
 msgstr ""
 
+#: ../plugins/calendar-http/calendar-http.c:339
+#, fuzzy
+msgid "_Secure connection"
+msgstr "تم إلغاء الإتّصال"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 #, fuzzy
 msgid "HTTP Calendars"
-msgstr "الرزنامات"
+msgstr "WebDAV (HTTP)"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Provides core functionality for webcal and http calendars."
@@ -14775,42 +15750,49 @@ msgstr ""
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
+#, fuzzy
 msgid "Weather: Cloudy"
-msgstr ""
+msgstr "تقرير عن حالة الطقس"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
+#, fuzzy
 msgid "Weather: Fog"
-msgstr ""
+msgstr "ضباب خفيف جدا"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
+#, fuzzy
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "_قم بزيارة Weather.com"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
+#, fuzzy
 msgid "Weather: Rain"
-msgstr ""
+msgstr "مطر خفيف"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
+#, fuzzy
 msgid "Weather: Snow"
-msgstr ""
+msgstr "ثلوج خفيفة"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
+#, fuzzy
 msgid "Weather: Sunny"
-msgstr ""
+msgstr "تقرير عن حالة الطقس"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
+#, fuzzy
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "تقرير عن حالة الطقس"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
 #, fuzzy
 msgid "Select a location"
-msgstr "إختيار عمل"
+msgstr "_اختر موقعا:"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
 #, fuzzy
 msgid "_Units:"
-msgstr "الوحدة"
+msgstr "الوحدات"
 
 #: ../plugins/calendar-weather/calendar-weather.c:661
 msgid "Metric (Celsius, cm, etc)"
@@ -14827,7 +15809,7 @@ msgstr ""
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 #, fuzzy
 msgid "Weather Calendars"
-msgstr "الرزنامات"
+msgstr "تقرير عن حالة الطقس"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
 msgid ""
@@ -14835,15 +15817,10 @@ msgid ""
 "things to the clipboard."
 msgstr ""
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
-msgid "Copy _Email Address"
-msgstr "_عنوان البريد الإلكتروني:"
-
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 #, fuzzy
 msgid "Copy tool"
-msgstr "نسخ للمجلّد"
+msgstr "الأداة المشغلة:"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 #, fuzzy
@@ -14862,7 +15839,7 @@ msgstr ""
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 #, fuzzy
 msgid "Default Mail Client "
-msgstr "أسلوب الرّد الإفتراضي"
+msgstr "إرسال بريد HTML افتراضا"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
@@ -14871,8 +15848,19 @@ msgstr ""
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 #, fuzzy
-msgid "Mark as default folder"
-msgstr "مسار مجلّد المراسَلين الإفتراضي"
+msgid "Mark as _default folder"
+msgstr "فتح سطح المكتب كمجلد"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
+msgid "Default Sources"
+msgstr "إفتراض الحروف"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr ""
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14881,7 +15869,7 @@ msgstr "فتح مجلّدات مستخدمين آخرين"
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
 #, fuzzy
 msgid "_Account:"
-msgstr "إسم الحساب"
+msgstr "الحساب"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
 msgid "_Folder Name:"
@@ -14890,13 +15878,13 @@ msgstr "إ_سم المجلّد:"
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
 #, fuzzy
 msgid "_User:"
-msgstr "إ_سم المستخدم:"
+msgstr "مستخدم:"
 
 #. i18n: "Secure Password Authentication" is an Outlookism
 #: ../plugins/exchange-operations/exchange-account-setup.c:63
 #, fuzzy
 msgid "Secure Password"
-msgstr "أدخل كلمة السّر"
+msgstr "كلمة مرور آمنة"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
@@ -14904,26 +15892,26 @@ msgstr "أدخل كلمة السّر"
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr "سيتصل هذا الخيار بالنّادل بإستخدام توثيق كرْبِروس 5."
+msgstr "سيتّصل هذا الخيار بخادم إكستشينج باستخدام توثّق كلمة مرور آمنة (NTLM)."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 #, fuzzy
 msgid "Plaintext Password"
-msgstr "أدخل كلمة السّر"
+msgstr "كلمة مرور نصّيّة"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
 #, fuzzy
 msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
-msgstr "سيتّصل·هذا الخيار بنادل IMAP باستخدام كلمة سر نصٍّ بسيط."
+msgstr "سيتّصل هذا الخيار بخادم إكستشينج باستخدام توثّق كلمة مرور نصّّيّّة."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 #, fuzzy
 msgid "Out Of Office"
 msgstr "خارج المكتب"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 #, fuzzy
 msgid ""
 "The message specified below will be automatically sent to \n"
@@ -14932,124 +15920,151 @@ msgstr ""
 "<small>الرّسالة المحدّدة أدناه سترسل تلقائيّاً لكل شخص يرسل\n"
 "لك بريداً حين تكون خارج المكتب.</small>"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 #, fuzzy
 msgid "I am out of the office"
 msgstr "أنا خارج المكتب حاليّاً"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 #, fuzzy
 msgid "I am in the office"
 msgstr "أنا في المكتب حاليّاً"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #, fuzzy
 msgid "Change the password for Exchange account"
-msgstr "ادخل كلمة السر لـ %s"
+msgstr "تغيير كلمة مرور إكستشينج"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #, fuzzy
 msgid "Change Password"
-msgstr "أدخل كلمة السّر"
+msgstr "تغيير كلمة المرور"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 #, fuzzy
 msgid "Delegation Assitant"
-msgstr "مساعد إنشاء دفاتر العناوين"
+msgstr "مساعد الا_نتداب"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 #, fuzzy
 msgid "Miscelleneous"
 msgstr "<b>قيمة الحقل</b>"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 #, fuzzy
 msgid "View the size of all Exchange folders"
 msgstr "مع كل المجلّدات المحلّيّة"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 #, fuzzy
 msgid "Folders Size"
-msgstr "إسم المجلّد"
+msgstr "اجلب حجم المجلدات الخاصة"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 #, fuzzy
 msgid "Exchange Settings"
-msgstr "التعيينات"
+msgstr "اختر الإعدادات"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#, fuzzy
+msgid "_OWA URL:"
+msgstr "عنوان OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "فشل التّوثيق"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 #, fuzzy
 msgid "Authentication Type"
-msgstr "نوع ال_تّوثق:"
+msgstr "نوع التّنبيه"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr " _مراجعة عن الأنواع المدعومة "
 
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:115
+#, fuzzy
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
 msgstr ""
+"كلمة المرور الحالية لا تتطابق مع كلمة مرور حسابك الموجودة. الرجاء إدخال كلمة "
+"المرور الصحيحة"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
+#, fuzzy
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
+msgstr "كلمتا المرور غير متطابقتين. الرجاء إعادة إدخال كلمتي المرور."
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 #, fuzzy
 msgid "Confirm Password:"
-msgstr "أدخل كلمة السّر"
+msgstr "تأكيد كلمة المرور:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 #, fuzzy
 msgid "Current Password:"
-msgstr "أدخل كلمة السّر"
+msgstr "كلمة المرور الحالية:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 #, fuzzy
 msgid "New Password:"
-msgstr "كلمة السّر"
+msgstr "كلمة المرور الجديدة:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#, fuzzy
 msgid "Your current password has expired. Please change your password now."
+msgstr "انتهت صلاحيّة كلمة مرورك الحاليّة. الرجاء تغيير كلمة مرورك الآن."
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
 msgstr ""
 
+#. Custom
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1572
 #, fuzzy
 msgid "Custom"
-msgstr "مشهد مخصّص"
+msgstr "مخصص"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#, fuzzy
+msgid "Delegate Permissions"
+msgstr "أذون المندوبين"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, fuzzy, c-format
 msgid "Permissions for %s"
-msgstr "رُفض التّصريح"
+msgstr "الأذون لـ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 #, fuzzy
@@ -15057,102 +16072,104 @@ msgid "Delegate To"
 msgstr "تفويض لـ:"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
-#, c-format
+#, fuzzy, c-format
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "تفويض لـ:"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 #, fuzzy
 msgid "Could not access Active Directory"
-msgstr ""
-"لم يمكن إنشاء الدّليل %s:\n"
-"%s"
+msgstr "لم يمكن فتح دليل الذّاكرة المخبّأة: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 #, fuzzy
 msgid "Could not find self in Active Directory"
 msgstr "لم يمكن فتح دليل الذّاكرة المخبّأة: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, fuzzy, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "لم يمكن فتح دليل الذّاكرة المخبّأة: %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, fuzzy, c-format
 msgid "Could not remove delegate %s"
-msgstr "لم يمكن كتابة البيانات: %s"
+msgstr "لم يمكن حذف الملف %s: %s\n"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 #, fuzzy
 msgid "Could not update list of delegates."
-msgstr "لم يمكن تحديث الجسم"
+msgstr "لم يمكن إعراب قائمة المستلِمين"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
-msgstr "لم يمكن حذف المجلّد: %s"
+msgstr "تعذّرت إضافة التّطبيق"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 #, fuzzy
 msgid "Error reading delegates list."
-msgstr "خطأ أثناء إضافة القائمة"
+msgstr "خطأ أثناء قراءة ملف البريد: %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#, fuzzy
 msgid "Author (read, create)"
-msgstr ""
+msgstr "المؤلّف (قراءة، إنشاء)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 #, fuzzy
 msgid "C_alendar:"
-msgstr "الر_زنامة:"
+msgstr "ال_تّقويم:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 #, fuzzy
 msgid "Co_ntacts:"
-msgstr "المراسَلون: "
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-#, fuzzy
-msgid "Delegate Permissions"
-msgstr "مفوّض"
+msgstr "الاتّ_صالات:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #, fuzzy
 msgid "Delegates"
-msgstr "مفوّض"
+msgstr "المندوبون"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#, fuzzy
 msgid "Editor (read, create, edit)"
-msgstr ""
+msgstr "المحرّر (قراءة، إنشاء، تحرير)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 #, fuzzy
 msgid "Permissions for"
-msgstr "رُفض التّصريح"
+msgstr "الأذون لـ"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 #, fuzzy
 msgid "Reviewer (read-only)"
-msgstr "الخدمة جاهزة"
+msgstr "المراجع (قراءة فقط)"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#, fuzzy
 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:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 #, fuzzy
 msgid "_Delegate can see private items"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "يمكن للمندوب أن يرى العناصر الخاصًة"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 #, fuzzy
 msgid "_Inbox:"
-msgstr "صندوق البريد الداخل"
+msgstr "_صندوق الوارد:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 msgid "_Tasks:"
 msgstr "_مهام:"
 
@@ -15160,143 +16177,187 @@ msgstr "_مهام:"
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
 #, fuzzy
 msgid "Permissions..."
-msgstr "رُفض التّصريح"
+msgstr "<b>الأذون</b>"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "إسم المجلّد"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 #, fuzzy
 msgid "Folder Size"
-msgstr "إسم المجلّد"
+msgstr "ح_جم المجلد"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#, fuzzy
+msgid "Subscribe to Other User's Folder"
+msgstr "اشتراك بدليل مستخدم آ_خر..."
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 #, fuzzy
 msgid "Exchange Folder Tree"
-msgstr "مصفات البريد"
+msgstr "شجرة مجلّدات الحوض"
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 #, fuzzy
 msgid "Unsubscribe Folder..."
-msgstr "الإ_شتراك في المجلّدات..."
+msgstr "فتح المجلد %s"
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:459
+#: ../plugins/exchange-operations/exchange-folder.c:514
 #, fuzzy, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+msgstr "إلغاء الاشتراك بدليل مستخدم آخر"
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:471
+#: ../plugins/exchange-operations/exchange-folder.c:526
 #, fuzzy, c-format
 msgid "Unsubscribe from \"%s\""
-msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+msgstr "أخبار من %s"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+#, fuzzy
+msgid "Password Expiry Warning..."
+msgstr "تنبيه نهاية صلاحية كلمة السر..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+#, fuzzy
+msgid "Your password will expire in 7 days..."
+msgstr "ستنتهي كلمة السر الخاصة بك في 7 أيام..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+#, fuzzy
+msgid "_Change Password"
+msgstr "ت_غيير كلمة المرور"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+#, fuzzy
+msgid "ok_button"
+msgstr "زر المواف_قة"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 #, fuzzy
 msgid "(Permission denied.)"
 msgstr "رُفض التّصريح"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+#, fuzzy
 msgid "Add User:"
-msgstr ""
+msgstr "إضافة مفتاح معرّف من طرف المستخدم"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 #, fuzzy
 msgid "Add User"
-msgstr "إ_ضافة"
+msgstr "إضافة مفتاح معرّف من طرف المستخدم"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Permissions</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgstr "<b>الأذون</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 #, fuzzy
 msgid "Cannot Delete"
-msgstr "إدراج المفوَّض"
+msgstr "لا أستطيع الحذف"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 #, fuzzy
 msgid "Cannot Edit"
-msgstr "محرّر المراسَلين"
+msgstr "لا أستطيع التّحرير"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 #, fuzzy
 msgid "Create items"
-msgstr "إنشاء مجلّد"
+msgstr "إنشاء عناصر"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 #, fuzzy
 msgid "Create subfolders"
-msgstr "إنشاء مجلّد"
+msgstr "إنشاء أدلّة فرعيّة"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 #, fuzzy
 msgid "Delete Any Items"
-msgstr "مفوّض"
+msgstr "حذف أيّ عناصر"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 #, fuzzy
 msgid "Delete Own Items"
-msgstr "مفوّض"
+msgstr "حذف عناصري"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 #, fuzzy
 msgid "Edit Any Items"
-msgstr "تحرير المصفات"
+msgstr "تحرير أيّ عناصر"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 #, fuzzy
 msgid "Edit Own Items"
-msgstr "تحرير المصفات"
+msgstr "تحرير عناصري"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Folder contact"
-msgstr "%d مراسَلين"
+msgstr "اتّصال الدّليل"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
 msgid "Folder owner"
-msgstr "مجلّد·إعتباطي·على·الم_رسِل"
+msgstr "مالك الدليل"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 #, fuzzy
 msgid "Folder visible"
-msgstr "مصدر المجلّد الاعتباطي"
+msgstr "الدّليل مرئي"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 #, fuzzy
 msgid "Read items"
-msgstr "وصول قراءة"
+msgstr "قراءة العناصر"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Role: "
-msgstr "الدّور"
+msgstr "الدور: "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+#, fuzzy
+msgid "No, Don't Change Status"
+msgstr "لا، لا تغيّر الحالة"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 #, fuzzy
 msgid "Select User"
-msgstr "انتقاء المجلّد"
+msgstr "الرجاء انتقاء مستخدم."
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 #, fuzzy
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "دفتر العناوين"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Contacts"
-msgstr ""
+msgstr "اشتراك بدليل مستخدم آ_خر..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
 #, fuzzy
 msgid "Subscribe to Other User's Calendar"
-msgstr "فتح مجلّدات مستخدمين آخرين"
+msgstr "اشتراك بدليل مستخدم آ_خر..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+#, fuzzy
+msgid "Exchange Operations"
+msgstr "مايكروسوفت إكستشينج"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15305,200 +16366,225 @@ msgstr ""
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 #, fuzzy
 msgid "Cannot display folders."
-msgstr "لا يمكن نسخ المجلّد: %s"
+msgstr "%s: لا يمكن فتح الشاشة %s"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#, fuzzy
+msgid "Cannot perform the operation."
+msgstr "لم يمكن القيام بالعملية"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 #, fuzzy
 msgid "Could not authenticate to server."
-msgstr "فشل التّوثيق مع نادل POP %s: %s"
+msgstr ""
+"لم أستطع التوثّق للخادم. (كلمة المرور غير صحيحة؟)\n"
+"\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not change password."
-msgstr "إنّك لم تُدخل كلمة سر."
+msgstr "تعذّر تشغيل التّطبيق"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
+msgid "Could not connect to Exchange server."
+msgstr "لم يمكن الإتّصال بخادم البروكسي"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 #, fuzzy
 msgid "Could not connect to server {0}."
-msgstr "لم يمكن الإتّصال بنادل POP %s"
+msgstr "لم يمكن الإتّصال بالخادم"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 #, fuzzy
 msgid "Could not determine folder permissions for delegates."
 msgstr "لم يمكن جلب قائمة المجموعات من النّادل."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 #, fuzzy
 msgid "Could not locate server {0}."
-msgstr "لم يمكن إنشاء الأنبوب: %s"
+msgstr "%s: لم يمكن تلقي اسم مضيف الخادم: %s!"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#, fuzzy
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "%s:لا يمكن انشاء محجر "
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 #, fuzzy
 msgid "Could not read folder permissions"
-msgstr "لم يمكن إعادة تسمية المجلّد: %s"
+msgstr "لم يمكن تغيير التصاريح."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 #, fuzzy
 msgid "Could not read folder permissions."
-msgstr "لم يمكن إعادة تسمية المجلّد: %s"
+msgstr "لم يمكن تغيير التصاريح."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 #, fuzzy
 msgid "Could not read out-of-office state"
 msgstr "لم يمكن إنشاء الأنبوب: %s"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 #, fuzzy
 msgid "Could not update folder permissions."
-msgstr "لم يمكن حذف المجلّد: %s"
+msgstr "لم يمكن تغيير التصاريح."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 #, fuzzy
 msgid "Could not update out-of-office state"
 msgstr "لم يمكن تحديث الجسم"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#, fuzzy
 msgid "Exchange Account is offline."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr ""
+msgstr "المستخدم البعيد ليس على الخط"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 #, fuzzy
 msgid "Failed to update delegates:"
-msgstr "فشل التّوثيق.\n"
+msgstr "فشل فتح الجهاز"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 #, fuzzy
 msgid "Folder already exists"
-msgstr "الشّهادة موجودة أصلاً"
+msgstr "المجلّد موجود أصلاً"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder does not exist"
-msgstr "الملف `%s' غير موجود."
+msgstr "الدّليل `%s/%s' غير موجود."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder offline"
-msgstr "إ_سم المجلّد:"
+msgstr "جاري تحضير المجلّد '%s' لنسق عدم الإتّصال"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr "خطأ عام"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#, fuzzy
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "لايوجد ملف شخصي للمستخدم '%s'\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 #, fuzzy
 msgid "No such user {0}"
-msgstr "لا مجلّد بهذا الإسم %s"
+msgstr "لا رسالة بهذا الإسم"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#, fuzzy
 msgid "Password successfully changed."
 msgstr ""
+"\n"
+"\n"
+"\n"
+"==== تغيرت القائمة, إعادة التحميل ====\n"
+"\n"
+"\n"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please make sure the Global Catalog Server name is correct."
+msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 #, fuzzy
-msgid "Please restart Evolution"
-msgstr "لم يمكن تشغيل نادل وُمْبَت"
+msgid "Please restart Evolution for changes to take effect"
+msgstr "لم يمكن تشغيل خادم وُمْبَت"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please select a user."
 msgstr "الرجاء انتقاء مستخدم."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15507,109 +16593,114 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 #, fuzzy
 msgid "Unable to add user to access control list:"
 msgstr "لم يمكن معالجة مجلّد البكرة"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 #, fuzzy
 msgid "Unable to edit delegates."
-msgstr "لم يمكن التّحقّق من توقيع الورقة"
+msgstr "لا يمكن تشغيل الأصوات\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 #, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "خطأ مجهول"
+msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 #, fuzzy
 msgid "Unknown error."
 msgstr "خطأ مجهول"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unknown type"
-msgstr "مجهول"
+msgstr "نوع غير معروف"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 #, fuzzy
 msgid "Unsupported operation"
-msgstr "تهيئة توقيع غير مدعومة"
+msgstr "عمليّة غير مدعومة"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 #, fuzzy
-msgid "You are nearing your quota available for storing mails on this server."
-msgstr "لقراءة و تخزين البريد على نوادل IMAP."
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr "لقراءة و تخزين البريد على خوادم IMAP."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
-msgstr ""
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#, fuzzy
+msgid "You have exceeded your quota for storing mail on this server."
+msgstr "لقراءة و تخزين البريد على خوادم IMAP."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#, fuzzy
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "يمكن أن تعدّ حساب إكستشينج واحد فقط"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"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 ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#, fuzzy
 msgid "Your password has expired."
-msgstr ""
+msgstr "الرجاء إدخال كلمة المرور:"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#, fuzzy
 msgid "{0} is already a delegate"
 msgstr ""
+"الإختصار \"%s\" مستخدم لـ:\n"
+" \"%s\"\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#, fuzzy
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "توثيق المفتاح (%s) مستعمَل\n"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Tasks"
-msgstr ""
+msgstr "اشتراك بدليل مستخدم آ_خر..."
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 #, fuzzy
 msgid "Check folder permissions"
-msgstr "جاري تفقّد تجانس المجلّد"
-
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-#, fuzzy
-msgid "Subscribe to Other User's Folder"
-msgstr "فتح مجلّدات مستخدمين آخرين"
+msgstr "لا يمكن تفقّد المجلّد: %s: %s"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
-msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
@@ -15618,46 +16709,51 @@ msgstr ""
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 #, fuzzy
 msgid "Unsubscribe Folders"
-msgstr "الإ_شتراك في المجلّدات..."
+msgstr "مجلّدات محلّيّة"
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr "إل_غاء الإشتراك"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:422
 #, fuzzy
 msgid "Checklist"
 msgstr "سرد"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+#, fuzzy
 msgid "Groupwise Account Setup"
-msgstr ""
+msgstr "مساعد ضبط افُليوشِن"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 #, fuzzy
 msgid "Junk Settings"
-msgstr "التعيينات"
+msgstr "اختر الإعدادات"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 #, fuzzy
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgstr "تفقّد عن كون البريد الوارد تافه"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 #, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "إعدادات الحاسوب ال_يدوي..."
+msgstr "تفقّد عن كون البريد الوارد تافه"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
-msgid "<b>Junk List :</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgid "<b>Junk List:</b>"
+msgstr "قائمة الحسابات"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 #, fuzzy
 msgid "Email:"
-msgstr "البريد الإلكتروني"
+msgstr "البريد ا?لكتروني:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 #, fuzzy
 msgid "Junk Mail Settings"
-msgstr "التعيينات"
+msgstr "تفقّد عن كون البريد الوارد تافه"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -15672,643 +16768,880 @@ msgstr "_تفعيل"
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 #, fuzzy
 msgid "_Junk List"
-msgstr "يونيو"
+msgstr "قائمة الحسابات"
+
+#: ../plugins/groupwise-features/mail-retract.c:53
+#, fuzzy
+msgid "Message retracted successfully"
+msgstr "تمت تهيئة القرص المرن بنجاح."
+
+#: ../plugins/groupwise-features/mail-retract.c:60
+#, fuzzy
+msgid "Retract Mail"
+msgstr "كتابةال_بريد الالكتروني"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:19
 #, fuzzy
 msgid "Send Options"
-msgstr "خيارات"
+msgstr "<b>خيارات العرض:</b>"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
+#, fuzzy
 msgid "Groupwise Features"
-msgstr ""
+msgstr "_تفعيل ميزات الإعانة للوحة المفاتيح"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 #, fuzzy
 msgid "Accept Tentatively"
-msgstr "مبدئي"
+msgstr "تقبّل مبدئيّاً"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:1
 #, fuzzy
-msgid "<b>Users :</b>"
-msgstr "<b>يبدء:</b> "
+msgid "<b>Users:</b>"
+msgstr "مستخدمون"
 
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "رسالة"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
+#, fuzzy
 msgid "Shared Folder Notification"
-msgstr ""
+msgstr "تبليغ عند الشحن الكامل للبطارية"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "المراسَلون"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.glade.h:11
 #, fuzzy
-msgid "_Cutomize notification message"
-msgstr "لم يمكن إنشاء الأنبوب: %s"
+msgid "_Customize notification message"
+msgstr "رسالة إجتماع رديئة"
 
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:12
 #, fuzzy
 msgid "_Not Shared"
-msgstr "لم يباشَر"
+msgstr "الذاكرة المشتركة"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:14
+#, fuzzy
 msgid "_Shared With ..."
-msgstr ""
+msgstr "الفتح بـاستخدام"
 
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
 #, fuzzy
 msgid "_Sharing"
-msgstr "تظليل"
+msgstr "<b>المشاركة</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Name</b>"
-msgstr "<b>مستحَق:</b> "
+msgstr "اسم"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#, fuzzy
 msgid "Access Rights"
-msgstr ""
+msgstr "السماح بالنفاذ"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 #, fuzzy
 msgid "Add/Edit"
-msgstr "تحرير"
+msgstr "ت_حرير الخط"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
 #, fuzzy
 msgid "Con_tacts"
-msgstr "المراسَلون"
+msgstr "إ_عداد"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
 msgid "Modify _folders/options/rules/"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#, fuzzy
 msgid "Read items marked _private"
-msgstr ""
+msgstr "يمكن للمندوب أن يرى العناصر الخاصًة"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 #, fuzzy
 msgid "Reminder Notes"
-msgstr "علامات التّذكير"
+msgstr "مذكرات لاصقة"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
 #, fuzzy
 msgid "Subscribe to my _alarms"
-msgstr "_اشتراك"
+msgstr "الرزنامات التي ستشغل المنبّهات لها"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
 #, fuzzy
 msgid "Subscribe to my _notifications"
-msgstr "_اشتراك"
+msgstr "اشتراك بدليل مستخدم آ_خر..."
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Read"
-msgstr "قراءة"
+msgstr "_قراءة"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 #, fuzzy
 msgid "_Write"
-msgstr "_طباعة"
+msgstr "_كتابة"
 
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 #, fuzzy
 msgid "Proxy"
-msgstr "الأولويّة"
-
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "حوار1"
+msgstr "بروكسي الجهة الخارجية"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Account Name</b>"
-msgstr "إسم الحساب"
+msgstr "إسم الحساب:"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 #, fuzzy
 msgid "Proxy Login"
-msgstr "إسم التسجيل"
+msgstr "شاشة الدخول:"
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#. 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:517
 #, fuzzy
 msgid "_Proxy Login..."
-msgstr "_طبع..."
+msgstr "شاشة الدخول:"
+
+#: ../plugins/groupwise-features/proxy.c:697
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 #, fuzzy
 msgid "Users"
-msgstr "ال_مستخدم:"
+msgstr "مستخدمون"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 #, fuzzy
 msgid "New _Shared Folder..."
-msgstr "مجلّد _جديد..."
+msgstr "اسم دليل جديد"
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:450
 #, fuzzy
 msgid "Sharing"
-msgstr "تظليل"
+msgstr "<b>المشاركة</b>"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
 #, fuzzy
 msgid "Track Message Status..."
-msgstr "حفظ الرّسالة..."
+msgstr ""
+"قوبلت رسالة حالة GnuPG غير متوقعة:\n"
+"\n"
+"%s"
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+#, fuzzy
+msgid "Hula Account Setup"
+msgstr "مساعد ضبط افُليوشِن"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+#, fuzzy
+msgid "_Import to Calendar"
+msgstr "الإشتراك في رزنامة"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+#, fuzzy
+msgid "_Import to Tasks"
+msgstr "اختر برنامج لاستيراد الصور"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+#, fuzzy
+msgid "Import ICS"
+msgstr "_استيراد مؤشّرات..."
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+#, fuzzy
+msgid "Select Task List"
+msgstr "<b>خيارات قائمة المهام</b>"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+#, fuzzy
+msgid "Select Calendar"
+msgstr "انتقِ تاريخاً من التقويم"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:714
+msgid "_Import"
+msgstr "إ_ستيراد"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+#, fuzzy
+msgid "Import to Calendar"
+msgstr "الإشتراك في رزنامة"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+#, fuzzy
+msgid "Imports ICS attachments to calendar."
+msgstr "مُرفق للإضافة."
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:149
+#, fuzzy
+msgid "iCalendar format (.ics)"
+msgstr "ملفّات آي-كلندر (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#, fuzzy
+msgid "Synchronize to iPod"
+msgstr "تشغيل برنامج ل iPod "
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+#, fuzzy
+msgid "iPod Synchronization"
+msgstr "خدمة تزامن الساعة"
+
+#: ../plugins/ipod-sync/sync.c:158
+#, fuzzy
+msgid "No output directory!"
+msgstr "%s: لا دليل جلسات معين."
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
+msgid "Could not export data!"
+msgstr "لم يمكن كتابة البيانات: %s"
+
+#: ../plugins/ipod-sync/sync.c:203
+#, fuzzy
+msgid "Exporting data failed."
+msgstr "فشل ضبط البيانات"
+
+#: ../plugins/ipod-sync/sync.c:231
+#, fuzzy
+msgid "Could not open addressbook!"
+msgstr "لم يمكن تحميل دفتر العناوين"
+
+#: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "عارض عناوين دفتر عناوين إيفُليوشِن"
+
+#: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
+msgid "Could not open calendar/todo!"
+msgstr "لم يمكن فتح القناة المحددة."
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:274
+#: ../plugins/itip-formatter/itip-formatter.c:395
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "لم يمكن تحميل البريمج %s"
+
+#: ../plugins/itip-formatter/itip-formatter.c:415
+#, fuzzy, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: ../plugins/itip-formatter/itip-formatter.c:441
+#, fuzzy, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "إظهار أرقام الأسابيع في الرزنامة"
+
+#: ../plugins/itip-formatter/itip-formatter.c:517
+#, fuzzy
+msgid "Unable to find any calendars"
+msgstr "عجز في إيجاد شاشة X متاحة"
+
+#: ../plugins/itip-formatter/itip-formatter.c:524
+#, fuzzy
+msgid "Unable to find this meeting in any calendar"
+msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: ../plugins/itip-formatter/itip-formatter.c:528
+#, fuzzy
+msgid "Unable to find this task in any task list"
+msgstr "لم يمكن معالجة مجلّد البكرة"
+
+#: ../plugins/itip-formatter/itip-formatter.c:532
+msgid "Unable to find this journal entry in any journal"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:605
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
 #, fuzzy
 msgid "Unable to parse item"
 msgstr "لم يمكن ترجمة محتويات الرّسالة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:857
 #, fuzzy, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:868
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:872
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:877
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:882
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
-#, c-format
+#: ../plugins/itip-formatter/itip-formatter.c:975
+#, fuzzy, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
-msgstr ""
+#: ../plugins/itip-formatter/itip-formatter.c:982
+#, fuzzy
+msgid "Sent a cancelation notice to the delegate"
+msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:984
 #, fuzzy
-msgid "Could not send the cancellation notice to the delegate"
+msgid "Could not send the cancelation notice to the delegate"
 msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:1069
 #, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "حالة الحاضر لم يمكن تحديثها بسبب حالة غير صالحة!\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1096
 #, fuzzy, c-format
 msgid "Unable to update attendee. %s"
-msgstr "فشل تنزيح `%s': %s"
+msgstr "لا يمكن تشغيل الأصوات\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 #, fuzzy
 msgid "Attendee status updated"
 msgstr "تم تحديث حالة الحاضر\n"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 #, fuzzy
 msgid "The calendar attached is not valid"
-msgstr "تاريخ التّكرار غير صحيح"
+msgstr "الموقع المدخل ليس سليماً."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1228
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1359
 #, fuzzy
 msgid "The item in the calendar is not valid"
 msgstr "المشهد الذي يُظهر متى تبدأ الرُّزنامة"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1360
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-#, fuzzy
-msgid "Meetings and Tasks"
-msgstr "الرُّزنامة و المهام"
-
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2067
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
+#: ../plugins/itip-formatter/itip-formatter.c:2077
+#: ../plugins/itip-formatter/itip-formatter.c:2109
 #, fuzzy
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "مراجعة عن بريد جديد"
+msgid "Conflict Search"
+msgstr "بحث في الويب"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2092
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr ""
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr "اليوم"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:193
 msgid "Today %H:%M"
-msgstr "اليوم %l:%M %p"
+msgstr "اليوم %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M:%S"
-msgstr "اليوم %l:%M %p"
+msgstr "اليوم %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:206
 msgid "Today %l:%M:%S %p"
-msgstr "اليوم %l:%M %p"
+msgstr "اليوم %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow"
-msgstr "جزر القمر"
+msgstr "غدا"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "غدا %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M %p"
-msgstr "اليوم %l:%M %p"
+msgstr "غدا %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "اليوم %l:%M %p"
+msgstr "غدا %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:253
 #, c-format
 msgid "%A"
 msgstr ""
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M"
-msgstr "%H:%M"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M:%S"
-msgstr "%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:263
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M %p"
-msgstr "%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:267
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M:%S %p"
-msgstr "%I:%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:276
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:280
 msgid "%A, %B %e"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %d, %Y"
+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:286
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%m/%d/%Y %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:291
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M %p"
-msgstr "%b %d %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:295
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %d, %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:306
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %d, %Y"
+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:310
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %m/%d/%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:315
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%b %d %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:319
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:348
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "نشر <b>%s</b> معلومات الإجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:350
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr "نشر <b>%s</b> معلومات الإجتماع."
+msgstr "نشر <b>%s</b> معلومات متوفّر/مشغول."
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:355
 #, fuzzy, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:358
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "يطلب <b>%s</b> حضورك إلى إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:360
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "يطلب <b>%s</b> حضورك إلى إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:366
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#, fuzzy, c-format
+#: ../plugins/itip-formatter/itip-view.c:368
+#, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
+msgstr "يود <b>%s</b> الإضافة إلى إجتماع موجود."
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:371
 #, fuzzy, 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:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "أرسل <b>%s</b> رسالة غير مفهومة."
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:378
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "ألغى <b>%s</b>· إجتماعاً."
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
-msgstr "ألغى <b>%s</b>· إجتماعاً."
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr "نشر <b>%s</b> معلومات الإجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:383
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:387
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:389
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:416
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "نشر <b>%s</b> معلومات مَهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:418
 #, fuzzy, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "نشر <b>%s</b> معلومات مَهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:423
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr "يطلب <b>%s</b>·حضور %s عند إجتماع."
+msgstr "ردّ على <b>%s</b> تكليفٍ بمهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:426
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "ألغى <b>%s</b> مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:428
 #, fuzzy, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "ألغى <b>%s</b> مهمّة."
+msgstr "يطلب <b>%s</b> منك أن تؤدّي مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:434
 #, fuzzy, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "يود·<b>%s</b> أن يضيف إلى مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:436
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "يود·<b>%s</b> أن يضيف إلى مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:439
 #, fuzzy, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "يود <b>%s</b> أن يستلم آخر معلومات المهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:442
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "أرسل <b>%s</b> رسالة غير مفهومة."
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:446
 #, fuzzy, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "ألغى <b>%s</b> مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:448
 #, fuzzy, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "ألغى <b>%s</b> مهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:451
 #, fuzzy, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "ردّ على <b>%s</b> تكليفٍ بمهمّة."
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, fuzzy, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "ردّ على <b>%s</b> تكليفٍ بمهمّة."
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:484
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr "نشر <b>%s</b> معلومات مَهمّة."
+
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr "نشر <b>%s</b> معلومات الإجتماع."
+
+#: ../plugins/itip-formatter/itip-view.c:491
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
+
+#: ../plugins/itip-formatter/itip-view.c:493
+#, fuzzy, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
+
+#: ../plugins/itip-formatter/itip-view.c:497
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr "ألغى <b>%s</b>· إجتماعاً."
+
+#: ../plugins/itip-formatter/itip-view.c:499
+#, fuzzy, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr "ألغى <b>%s</b> مهمّة."
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:755
 #, fuzzy
+msgid "_Open Calendar"
+msgstr "رزنامة جنوم"
+
+#: ../plugins/itip-formatter/itip-view.c:761
+#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:771
+#: ../plugins/itip-formatter/itip-view.c:788
+#: ../plugins/itip-formatter/itip-view.c:793
+#, fuzzy
+msgid "_Decline"
+msgstr "رفض"
+
+#: ../plugins/itip-formatter/itip-view.c:762
+#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:790
+#: ../plugins/itip-formatter/itip-view.c:795
+#, fuzzy
+msgid "_Accept"
+msgstr "ت_قبل"
+
+#: ../plugins/itip-formatter/itip-view.c:765
+#, fuzzy
+msgid "_Decline all"
+msgstr "نسخ ال_كل"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+#, fuzzy
+msgid "_Tentative all"
+msgstr "نسخ ال_كل"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:794
+#, fuzzy
+msgid "_Tentative"
+msgstr "مبدئي"
+
+#: ../plugins/itip-formatter/itip-view.c:767
+msgid "_Accept all"
+msgstr "اقبل ال_كل"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:778
+msgid "_Send Information"
+msgstr "إر_سال المعلومات"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:782
+#, fuzzy
+msgid "_Update Attendee Status"
+msgstr "تم تحديث حالة الحاضر\n"
+
+#: ../plugins/itip-formatter/itip-view.c:785
+msgid "_Update"
+msgstr "_تحديث"
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:944
 msgid "Start time:"
-msgstr "زمن ال_بدء"
+msgstr "زمن ال_بدء:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:953
 msgid "End time:"
 msgstr "زمن الإ_نتهاء:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:969
+#: ../plugins/itip-formatter/itip-view.c:1019
 msgid "Comment:"
-msgstr "الأمر:"
+msgstr "تعليق:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:1033
+#, fuzzy
 msgid "Send u_pdates to attendees"
-msgstr ""
+msgstr "إرسال بريد إلكتروني إلى <b>%(name)s</b> (%(email)s)"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:1042
 #, fuzzy
 msgid "A_pply to all instances"
-msgstr "كل الأنمذجة"
+msgstr "استرجاع كافة القوائم إلى الإعدادات الأصلية؟"
+
+#: ../plugins/itip-formatter/itip-view.c:1711
+msgid "_Tasks :"
+msgstr "ال_مهام :"
+
+#: ../plugins/itip-formatter/itip-view.c:1713
+msgid "Memos :"
+msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 #, fuzzy
@@ -16318,12 +17651,12 @@ msgstr "عرض الرسالة المهمة التالية"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 #, fuzzy
 msgid "Itip Formatter"
-msgstr "المستوردين"
+msgstr "مهيىء الأقراص المرنة"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16338,37 +17671,38 @@ msgid ""
 msgstr "هذه الإستجابه ليست من حاضرٍٍ حالي.  هل يضاف كحاضر؟"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
+#, fuzzy
 msgid "Proxy _Logout"
-msgstr ""
+msgstr "إ_لغاء الخروج"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
 #, fuzzy
 msgid "Allows disabling of accounts."
-msgstr "قائمة الحسابات"
+msgstr "تحرير حساباتك"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 #, fuzzy
 msgid "Disable Account"
-msgstr "حسابات البريد"
+msgstr "إسم الحساب:"
 
 #: ../plugins/mail-remote/client.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "System error: %s"
-msgstr "خطأ في التّصديق: %s"
+msgstr "خطأ في النظام: %s"
 
 #: ../plugins/mail-remote/client.c:32
 #, fuzzy, c-format
 msgid "Camel error: %s"
-msgstr "خطأ في التّصديق: %s"
+msgstr "حدث خطأ"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
+#, fuzzy
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "إرسال بريد HTML افتراضا"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:605
-#, fuzzy
 msgid "No store available"
-msgstr "لا وجود لوصف."
+msgstr "لا وجود لمخزن."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid ""
@@ -16378,7 +17712,7 @@ msgstr ""
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 #, fuzzy
 msgid "Mail Remote"
-msgstr "مصفات البريد"
+msgstr "مراسَلين بعيدين"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16389,12 +17723,12 @@ msgstr ""
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 #, fuzzy
 msgid "Con_vert to Meeting"
-msgstr "إلغاء الإ_جتماع"
+msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
 #, fuzzy
 msgid "Mail to meeting"
-msgstr "البريد إلى %s"
+msgstr "إر_سال رسالة إلى..."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
@@ -16403,35 +17737,40 @@ msgid ""
 msgstr ""
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
+#, fuzzy
 msgid "Con_vert to Task"
-msgstr ""
+msgstr "نقر لإضافة مهمّة"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 #, fuzzy
 msgid "Mail to task"
-msgstr "البريد إلى %s"
+msgstr "إر_سال رسالة إلى..."
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
+msgid "Convert the selected message to a new task"
+msgstr "افتح الرسالة المحدّدة في نافذة جديدة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 #, fuzzy
 msgid "Contact list _owner"
-msgstr "محرّر قائمة المراسَلين"
+msgstr "قائمة مراسَلين جديدة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+#, fuzzy
 msgid "Get list _archive"
-msgstr ""
+msgstr "قائمة محفوظات منفصلة بحيز"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 #, fuzzy
 msgid "Get list _usage information"
-msgstr "معلومات الإجتماع"
+msgstr "%s.اذهب إلى --help للمزيد من المعلومات.\n"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
 #, fuzzy
 msgid "Mailing List Actions"
-msgstr "قائمة مراسَلة"
+msgstr "تصفية باعتبار ال_قائمة البريديّة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
@@ -16446,27 +17785,24 @@ msgid ""
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 #, fuzzy
 msgid "_Post message to list"
-msgstr "إرسال ال_رّسالة للقائمة..."
+msgstr "تعليق الرّسالة في مجلّد عام"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 #, fuzzy
 msgid "_Subscribe to list"
-msgstr "_اشتراك"
+msgstr "الرّد على ال_قائمة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 #, fuzzy
 msgid "_Un-subscribe to list"
-msgstr "إل_غاء الإشتراك"
+msgstr "مفتاح GConf '%s' محدد بالقائمة '%s'"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 #, fuzzy
 msgid "Action not available"
-msgstr "TLS غير متوفر"
+msgstr "الخيار غير متوفّر."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
@@ -16480,17 +17816,17 @@ msgstr ""
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 #, fuzzy
 msgid "Malformed header"
-msgstr "إمضاء مشوّه"
+msgstr "التّرويسة/الهامش"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 #, fuzzy
 msgid "No e-mail action"
-msgstr "تسجيل إجراءات المصفاة"
+msgstr "لا عمل إفتراضي مربوط"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 #, fuzzy
 msgid "Posting not allowed"
-msgstr "فشلت العمليّة: %s"
+msgstr "العنصر <%s> غير مسموح به تحت <%s>"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
 msgid ""
@@ -16501,7 +17837,7 @@ msgstr ""
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 #, fuzzy
 msgid "Send e-mail message to mailing list?"
-msgstr "إرسال ال_رّسالة للقائمة..."
+msgstr "تأليف رد إلى القائمة البريديّة للرّسالة المنتقاة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -16527,22 +17863,37 @@ msgstr ""
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 #, fuzzy
 msgid "_Edit message"
-msgstr "جاري إرسال الرّسالة"
+msgstr "_تحرير كرسالةٍ جديدة..."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 #, fuzzy
 msgid "_Send message"
-msgstr "جاري إرسال الرّسالة"
+msgstr "إر_سال رسالة"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact List _Owner"
+msgstr "قائمة مراسَلين جديدة"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+#, fuzzy
+msgid "Get List _Archive"
+msgstr "قائمة محفوظات منفصلة بحيز"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
+msgid "Get List _Usage Information"
+msgstr "%s.اذهب إلى --help للمزيد من المعلومات.\n"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
 msgstr ""
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
@@ -16561,9 +17912,39 @@ msgstr "تأليف رد إلى القائمة البريديّة للرّسال�
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "تأليف رد إلى القائمة البريديّة للرّسالة المنتقاة"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post Message to List"
+msgstr "تعليق الرّسالة في مجلّد عام"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to List"
+msgstr "الرّد على ال_قائمة"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Unsubscribe from List"
+msgstr "_حذف من القائمة"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+#, fuzzy
+msgid "Mark All Read"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#, fuzzy
+msgid "Mark Me_ssages as Read"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
+#, fuzzy
 msgid "Mark calendar offline"
-msgstr ""
+msgstr "خطأ: مستخدم غير متصل"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 #, fuzzy
@@ -16571,8 +17952,9 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "تعليم الرسالة المنتقات للحذف"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+#, fuzzy
 msgid "_Do not make this available offline"
-msgstr ""
+msgstr "هذه الرسالة غير متوفّرة بالوضع دون اتّصال."
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
@@ -16595,7 +17977,7 @@ msgstr "_رنّة عند مجيء بريد جديد"
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 #, fuzzy
 msgid "New Mail Notification"
-msgstr "نوع التّبليغ ببريدٍ جديد"
+msgstr "رسالة بريديّة جديدة"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 #, fuzzy
@@ -16606,73 +17988,58 @@ msgstr "نوع التّبليغ ببريدٍ جديد"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr ""
+#: ../plugins/plugin-manager/plugin-manager.c:180
+#, fuzzy
+msgid "Plugin Manager"
+msgstr "مدير المحفوظات"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+#, fuzzy
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "تغعيل/تعطيل نسق النّابض"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 #, fuzzy
-msgid "Plugins"
-msgstr "التّنقية"
+msgid "_Plugins"
+msgstr "ملحقات"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
-msgstr "ساعات"
-
-#: ../plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
-msgid "Id"
-msgstr "I"
+msgstr "المؤلف(ون)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
-msgid "Path"
-msgstr "ال_مسار:"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "الوصف"
 
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
-msgid "Plugin Manager"
-msgstr "المدير"
-
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
 msgstr ""
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
-msgstr "التّنقية"
+msgstr "ملحق"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
-#, fuzzy
 msgid "Plain Text Mode"
-msgstr "نموذج النّص"
+msgstr "نص عادي"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "افضل نصا عاديا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
@@ -16680,43 +18047,143 @@ msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
-msgstr ""
+msgstr "افضل نصا عاديا"
 
 #: ../plugins/prefer-plain/prefer-plain.c:107
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "اظهر نص عادي فقط"
 
 #: ../plugins/prefer-plain/prefer-plain.c:150
-#, fuzzy
 msgid "HTML Mode"
-msgstr "_بريد HTML"
+msgstr "نسق HTML"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
 msgstr ""
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_معاينة قبل الطّباعة"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 #, fuzzy
 msgid "Prints the message"
-msgstr "طبع هذه الرسالة"
+msgstr "إر_سال رسالة"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+#, fuzzy
+msgid "Evolution Profiler"
+msgstr "خطأ إيفُليوشِن"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Calendar Publishing"
+msgstr "رزنامة جنوم"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "المواقع"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "جاري جلب معلومات على %s"
+
+#: ../plugins/publish-calendar/publish-calendar.c:399
+#, fuzzy
+msgid "Are you sure you want to remove this URL?"
+msgstr "هل تريد فعلاً حذف هذا الحساب؟"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">ألوان</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+#, fuzzy
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">ألوان</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#, fuzzy
+msgid "P_ort:"
+msgstr "تر_تيب..."
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#, fuzzy
+msgid "Publishing Location"
+msgstr "فتح الموقع %s"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#, fuzzy
+msgid "Publishing _Frequency:"
+msgstr "أزرق بنفسجي"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#, fuzzy
+msgid "Service _type:"
+msgstr "_نوع الخدمة:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#, fuzzy
+msgid "_File:"
+msgstr "ال_ملف:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
+msgid "_Publish as:"
+msgstr "ك_خلفية"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "العب نغمة المشغول"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
 msgid "Spamassassin (built-in)"
 msgstr "سبام-أساسن (مضمّن)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr ""
+#, fuzzy
+msgid "Spamassassin junk plugin"
+msgstr "إعداد الملحق المنتقى"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -16726,30 +18193,29 @@ msgstr ""
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 #, fuzzy
 msgid "Save attachments"
-msgstr "جاري حفظ المُرفق"
+msgstr "لا تحفظ"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 #, fuzzy
 msgid "Save Attachments ..."
-msgstr "_مُرفق..."
+msgstr "لا تحفظ"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 #, fuzzy
 msgid "Save all attachments"
-msgstr "جاري حفظ المُرفق"
+msgstr "حفظ جميع الملفات المفتوحة"
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:340
 #, fuzzy
 msgid "Select save base name"
-msgstr "اختر منطقة زمنيّة"
+msgstr "انتقي اسم ملف للحفظ"
 
-#: ../plugins/save-attachments/save-attachments.c:351
-#, fuzzy
+#: ../plugins/save-attachments/save-attachments.c:359
 msgid "MIME Type"
-msgstr "نوع MIME:"
+msgstr "نوع MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:367
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "حفظ"
 
@@ -16762,106 +18228,97 @@ msgid "%F %T"
 msgstr ""
 
 #: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr ""
+msgid "UID"
+msgstr "هوية المستخدم (UID)"
 
 #: ../plugins/save-calendar/csv-format.c:387
 #, fuzzy
 msgid "Description List"
-msgstr "الوصف"
+msgstr "وصف القائمة"
 
 #: ../plugins/save-calendar/csv-format.c:388
 #, fuzzy
 msgid "Categories List"
-msgstr "الأصناف: %s"
+msgstr "قائمة الحسابات"
 
 #: ../plugins/save-calendar/csv-format.c:389
 #, fuzzy
 msgid "Comment List"
-msgstr "_قائمة مراسَلين"
+msgstr "قائمة الحسابات"
 
 #: ../plugins/save-calendar/csv-format.c:391
-#, fuzzy
 msgid "Created"
-msgstr "إنشاء مجلّد"
+msgstr "تاريخ الإنشاء"
 
 #: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
 msgid "Contact List"
-msgstr "_قائمة مراسَلين"
+msgstr "قائمة المراسَلين"
 
 #: ../plugins/save-calendar/csv-format.c:393
-#, fuzzy
 msgid "Start"
-msgstr "الحالة"
+msgstr "إبدأ"
 
 #: ../plugins/save-calendar/csv-format.c:394
-#, fuzzy
 msgid "End"
-msgstr "الثّاني"
+msgstr "اَنْهِ"
 
 #: ../plugins/save-calendar/csv-format.c:396
 msgid "percent Done"
-msgstr ""
+msgstr "نسبة مكملة"
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr ""
+msgid "URL"
+msgstr "العنوان"
 
 #: ../plugins/save-calendar/csv-format.c:399
-#, fuzzy
 msgid "Attendees List"
-msgstr "الحاضر"
+msgstr "قائمة الحضور"
 
 #: ../plugins/save-calendar/csv-format.c:401
-#, fuzzy
 msgid "Modified"
-msgstr "ت_عديل"
+msgstr "مغيَّر"
 
 #: ../plugins/save-calendar/csv-format.c:552
 msgid "Advanced options for the CSV format"
 msgstr ""
 
 #: ../plugins/save-calendar/csv-format.c:559
+#, fuzzy
 msgid "Prepend a header"
-msgstr ""
+msgstr "التّرويسة/الهامش"
 
 #: ../plugins/save-calendar/csv-format.c:568
+#, fuzzy
 msgid "Value delimiter:"
-msgstr ""
+msgstr "قيمة التحجيم"
 
 #: ../plugins/save-calendar/csv-format.c:574
+#, fuzzy
 msgid "Record delimiter:"
-msgstr ""
+msgstr "تسجيل صوت"
 
 #: ../plugins/save-calendar/csv-format.c:580
+#, fuzzy
 msgid "Encapsulate values with:"
-msgstr ""
+msgstr "تم الاتصال مع %s باستخدام %s"
 
 #: ../plugins/save-calendar/csv-format.c:602
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:137
-#, fuzzy
-msgid "iCalendar format (.ics)"
-msgstr "ملفّات آي-كلندر (.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Save Selected"
-msgstr "مُنتقى"
+msgstr "احفظ المنتقى"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 #, fuzzy
-msgid "Save to _Disk"
-msgstr "حفظ كـ"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "حفظ المراسَلين المنتقين كفيكارد."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "احف_ظ للقرص"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
@@ -16871,27 +18328,21 @@ msgstr "حفظ المراسَلين المنتقين كفيكارد."
 msgid "%FT%T"
 msgstr ""
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:397
+#, fuzzy
 msgid "RDF format (.rdf)"
-msgstr ""
+msgstr "تنسيق الفيديو"
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:180
 #, fuzzy
 msgid "Select destination file"
-msgstr "إنتقاء مصدر الوجهة"
-
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
+msgstr "انتقي ملف صوت"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 #, fuzzy
 msgid "Select one source"
-msgstr "نمط الانتقاء"
+msgstr "عنوان مصدر POP"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
 msgid "Selects a single calendar or task source for viewing."
@@ -16899,17 +18350,23 @@ msgstr ""
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 #, fuzzy
-msgid "_Show only this Calendar"
-msgstr "طباعة هذه الرزنامة"
+msgid "Show _only this Calendar"
+msgstr "عر_ض الإطار الحالي فقط"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
-msgstr ""
+#, fuzzy
+msgid "Show _only this Task List"
+msgstr "عرض مجموعة الخط هذه فقط"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Startup wizard"
+msgid "A plugin that handles the Startup wizard."
 msgstr ""
 
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#, fuzzy
+msgid "Startup wizard"
+msgstr "برامج بدء التشغيل"
+
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "مساعد ضبط افُليوشِن"
@@ -16926,22 +18383,22 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:138
+#: ../shell/e-shell-importer.c:149
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../shell/e-shell-importer.c:411
 #, c-format
 msgid "From %s:"
 msgstr "من %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
 #, fuzzy
 msgid "Importing data."
-msgstr "جاري إستيراد الملفات"
+msgstr "البيانات الشخصية"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
@@ -16950,7 +18407,7 @@ msgstr ""
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 #, fuzzy
 msgid "Subject Threading"
-msgstr "إختيار ال_شّعبة"
+msgstr "الموضوع هو %s"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 #, fuzzy
@@ -16972,14 +18429,12 @@ msgid "Evolution Shell Config factory"
 msgstr "هيكل إفُليوشِن"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
 msgid "Evolution Test"
-msgstr "افُليوشِن"
+msgstr "إختبار إيفُليوشِن"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
 msgid "Evolution Test component"
-msgstr "مكوّن مهام إيفُليوشِن"
+msgstr "مكوّن إختبار إيفُليوشِن"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
@@ -16988,7 +18443,7 @@ msgstr ""
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Configuration version"
-msgstr "الإعدادات"
+msgstr "اصدارة الرزمة"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
@@ -17000,102 +18455,130 @@ msgid "Default window height"
 msgstr "إرتفاع النّافذة الإفتراضي"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Default window state"
+msgstr "إرتفاع النّافذة الإفتراضي"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "عرض النّافذة الإفتراضي"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 #, fuzzy
 msgid "Last upgraded configuration version"
-msgstr "قطعة إعداد رُزنامة إيفُليوشِن"
+msgstr "آخر إصدارة من GST تم تنفيذها"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
-msgstr "إعدادات الحاسوب اليدوي..."
+msgstr "تعيينات الطابعة"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Sidebar is visible"
+msgstr "العمود الجانبي مرئي"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#, fuzzy
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "عرض حوار تنبيه عند إخفاء عمليات"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:471
 msgid "Start in offline mode"
 msgstr "بدأ دون اتصال بالإنترنت"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Statusbar is visible"
+msgstr "شريط الحالة مرئي"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 #, fuzzy
 msgid "The default height for the main window, in pixels."
-msgstr "العنوان الإفتراضي للرّسالة."
+msgstr "الارتفاع الافتراضي للمذكرات اللاصقة الجديدة بالبكسلات."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 #, fuzzy
 msgid "The default width for the main window, in pixels."
-msgstr "العرض الإفتراضي للوح عمود المجلّد"
+msgstr "العرض الافتراضي لمذكرة لاصقة جديدة بالبكسلات."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 #, fuzzy
 msgid "The default width for the sidebar, in pixels."
-msgstr "العرض الإفتراضي للوح عمود المجلّد"
+msgstr "العرض الافتراضي لمذكرة لاصقة جديدة بالبكسلات."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "عمود الأدوات مرئي"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether or not the window should be maximized."
+msgstr "فيما إذا "
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+msgid "Whether the sidebar should be visible."
+msgstr "فيما اذا وجب اظهار العمود الجانبي."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the status bar should be visible."
+msgstr "فيما اذا وجب اظهار عمود الحالة."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#, fuzzy
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "فيما اذا وجب استخدام لوحة ألوان"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#, fuzzy
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "ما إذا وجب أن تكون نافذة تصفّح الملفات سائدة."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#, fuzzy
 msgid "Window button style"
-msgstr ""
+msgstr "أسلوب الميل حول الزر النابض"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:30
 msgid "Window buttons are visible"
 msgstr ""
 
 #: ../shell/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "الإتّصالات النّشطة"
+msgstr "<b>الإتّصالات النّشطة</b>"
 
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
@@ -17105,16 +18588,16 @@ msgstr "الإتّصالات النّشطة"
 msgid "Click OK to close these connections and go offline"
 msgstr "انقر موافق لغلق هذه الإتصلات و لتكون غير متصل بالإنترنت"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(بدون عنوان)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:137
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "انقر لإختيار نوع المستورد:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:140
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17123,12 +18606,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:142
-#, fuzzy
+#: ../shell/e-shell-importer.c:146
 msgid "Choose the destination for this import"
-msgstr "إلغاء الإجتماع لهذا العنصر"
+msgstr "اخ"
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:152
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17136,34 +18618,29 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:283
-#, fuzzy
+#: ../shell/e-shell-importer.c:291
 msgid "F_ilename:"
-msgstr "إسم الملف:"
+msgstr "إسم ال_ملف:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "إنتقاء ملف"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:313
 msgid "File _type:"
 msgstr "_نوع الملف:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:349
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:352
 msgid "Import a _single file"
 msgstr "إستيراد ملف _وحيد"
 
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "إ_ستيراد"
-
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "إعدادات إيفُليوشِن"
+msgid "Evolution Preferences"
+msgstr "تفضيلات إيفُليوشِن"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17185,11 +18662,11 @@ msgstr "لا يمكن أن يحتوي إسم المجلّد الرمز·\"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.'·و '..'·أسماء مجلّدات محجوزة."
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: ../shell/e-shell-window-commands.c:78
+#: ../shell/e-shell-window-commands.c:79
 #, c-format
 msgid "Error executing %s."
 msgstr "خطأ تنفيذ %s."
@@ -17198,100 +18675,94 @@ msgstr "خطأ تنفيذ %s."
 msgid "Bug buddy is not installed."
 msgstr "باك بدي ليس مثبّتاً"
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:130
 msgid "Bug buddy could not be run."
 msgstr "لم يمكن تشغيل باك بدي."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:532
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
+"Djihed Afifi جهاد عفيفي (djihed@gmail.com)\n"
+"Yousef Raffah يوسف رفه (yousef@raffah.com) "
 
-#: ../shell/e-shell-window-commands.c:546
-msgid "Groupware Suite"
-msgstr ""
-
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
-msgstr ""
+msgstr "ا_عمل باتّصال"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
 msgid "_Work Offline"
-msgstr ""
+msgstr "ا_عمل دون اتّصال"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
-msgstr ""
+msgstr "اعمل دون اتّصال"
 
-#: ../shell/e-shell-window.c:343
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
+#: ../shell/e-shell-window.c:381
+msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
-"زيميان افليوشن غير متصل بالانترنت حاليا.  انقر هذا الزر للعمل على اتصال "
-"بالإنترنت."
+"افليوشن متصل بالانترنت حاليا.  انقر هذا الزر للعمل دون اتصال بالإنترنت."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: ../shell/e-shell-window.c:358
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
+#: ../shell/e-shell-window.c:396
+msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "زيميان افليوشن غير متصل بالانترنت حاليا.  انقر هذا الزر للعمل على اتصال "
 "بالإنترنت."
 
-#: ../shell/e-shell-window.c:724
-#, fuzzy, c-format
+#: ../shell/e-shell-window.c:796
+#, c-format
 msgid "Switch to %s"
-msgstr "البريد إلى %s"
+msgstr "تبديل إلى %s"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:634
 #, fuzzy
 msgid "Uknown system error."
-msgstr "خطأ مجهول"
+msgstr "خطأ في الرسم"
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
-#, fuzzy, c-format
+#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
+#, c-format
 msgid "%ld KB"
-msgstr "%d %B"
+msgstr "%ld ك.بايت"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "موافق"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "معطيات غير سليمة"
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
 msgstr "لم يمكن تسجيل OAF"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "لم يعثر على قاعدة بيانات الإعداد"
 
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../shell/e-user-creatable-items-handler.c:678
+#: ../shell/e-user-creatable-items-handler.c:688
+#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "جديد"
 
 #: ../shell/evolution-test-component.c:140
-#, fuzzy
 msgid "New Test"
-msgstr "مهمّة جديدة"
+msgstr "إختبار جديد"
 
 #: ../shell/evolution-test-component.c:141
-#, fuzzy
 msgid "_Test"
-msgstr "إختبار"
+msgstr "اخ_تبار"
 
 #: ../shell/evolution-test-component.c:142
-#, fuzzy
 msgid "Create a new test item"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "إنشاء عنصر اختبار جديد"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -17302,29 +18773,24 @@ msgid "Evolution Import Assistant"
 msgstr "مساعد الإستيراد لافُليوشِن"
 
 #: ../shell/import.glade.h:3
-#, fuzzy
 msgid "Import File"
-msgstr "جاري إستيراد الملفات"
+msgstr "إستيراد ملف"
 
 #: ../shell/import.glade.h:4
-#, fuzzy
 msgid "Import Location"
-msgstr "جاري استيراد"
+msgstr "إستيراد موقع"
 
 #: ../shell/import.glade.h:5
-#, fuzzy
 msgid "Importer Type"
-msgstr "المستوردين"
+msgstr "نوع المستورد"
 
 #: ../shell/import.glade.h:6
-#, fuzzy
 msgid "Select Importers"
-msgstr "انتقي المستورد"
+msgstr "إنتقاء المستوردين"
 
 #: ../shell/import.glade.h:7
-#, fuzzy
 msgid "Select a File"
-msgstr "إنتقاء ملف"
+msgstr "إنتقِ ملفًّا"
 
 #: ../shell/import.glade.h:8
 msgid ""
@@ -17334,7 +18800,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17346,7 +18812,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -17354,45 +18820,51 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:254
-#, fuzzy
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
-"شكراً\n"
-"فريق زيميان إيفُليوشِن\n"
+"شكرا\n"
+"فريق إيفُليوشِن\n"
 
-#: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr "لا تُخبرني مجدّداً"
+#: ../shell/main.c:264
+#, fuzzy
+msgid "Do not tell me again"
+msgstr "لا تسألني ثانيةً."
 
-#: ../shell/main.c:466
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
 msgstr "بدأ افليوشن بتنشيط المكوّن المحدّد"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:473
 msgid "Start in online mode"
 msgstr "بدأ على اتصال بالإنترنت"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:476
 #, fuzzy
 msgid "Forcibly shut down all Evolution components"
 msgstr "إجبار غلق جميع مكونات افُليوشِن"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: ../shell/main.c:480
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
 msgstr "إرسال معلومات إخراج التنقيح لجميع المكوّنات لملف."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:485
+#, fuzzy
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "هوية الواجهة للبريمج لتعطيله عن التحميل"
 
-#: ../shell/main.c:513
+#: ../shell/main.c:516
+#, fuzzy
+msgid "- The Evolution PIM and Email Client"
+msgstr "مكوّن بريد ايفُليوشِن"
+
+#: ../shell/main.c:527
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17409,7 +18881,7 @@ msgstr "هل تريد فعلاً حذف المهمّة `%s'؟"
 #: ../shell/shell.error.xml.h:2
 #, fuzzy
 msgid "Continue"
-msgstr "جاري الإتّصال"
+msgstr "استمر"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
@@ -17418,13 +18890,13 @@ msgstr ""
 #: ../shell/shell.error.xml.h:4
 #, fuzzy
 msgid "Evolution can not start."
-msgstr "مساعد حسابات إيفُليوشِن"
+msgstr "لا يمكن تشغيل الهيكل الإحتياطي"
 
 #: ../shell/shell.error.xml.h:5
 #, fuzzy
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr "نسيان كلمات السّر المتذكّرة حتّى يُطلب منك إدخالها من جديد"
 
 #: ../shell/shell.error.xml.h:7
@@ -17432,12 +18904,13 @@ msgid "Insufficient disk space for upgrade."
 msgstr ""
 
 #: ../shell/shell.error.xml.h:8
+#, fuzzy
 msgid "Really delete old data?"
-msgstr ""
+msgstr "هل تريد حقا حذف هذه الملاحظة؟"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -17453,8 +18926,8 @@ msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
@@ -17464,7 +18937,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -17493,13 +18966,14 @@ msgid "_Forget"
 msgstr "الأ_ولويّة:"
 
 #: ../shell/shell.error.xml.h:32
+#, fuzzy
 msgid "_Keep Data"
-msgstr ""
+msgstr "البيانات الشخصية"
 
 #: ../shell/shell.error.xml.h:33
 #, fuzzy
 msgid "_Remind Me Later"
-msgstr "علامة تذكير"
+msgstr "المراسلون القريبون مني"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -17509,7 +18983,7 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -17517,77 +18991,77 @@ msgid ""
 "Edit trust settings:"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 #, fuzzy
 msgid "Select a certificate to import..."
-msgstr "إنتقاء شهادة لإستيرادها..."
+msgstr "اختر برنامج لاستيراد الصور"
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
 msgstr "إسم الشّهادة"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "الأغراض"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "الرّقم التّسلسلي"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
 msgstr "تنتهي صلاحيتها"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "عنوان البريد الالكتروني"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "عارض الشهادات: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, fuzzy, c-format
 msgid "Enter the password for `%s'"
 msgstr "ادخل كلمة السر لـ %s"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 #, fuzzy
 msgid "Enter new password for certificate database"
 msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 #, fuzzy
 msgid "Enter new password"
-msgstr "أدخل كلمة السّر"
+msgstr "إدخل كلمة سر يونكس جديدة:"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -17596,7 +19070,7 @@ msgstr ""
 "أصدر لـ:\n"
 "  الموضوع: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -17605,10 +19079,10 @@ msgstr ""
 "صادر من طرف:\n"
 "  الموضوع: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 #, fuzzy
 msgid "Select certificate"
-msgstr "شهادة عميل SSL"
+msgstr "ا_نتقاء الشهادة"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
@@ -17664,7 +19138,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "شهادة"
 
@@ -17679,7 +19153,7 @@ msgstr "تفاصيل الشّهادات"
 #: ../smime/gui/smime-ui.glade.h:17
 #, fuzzy
 msgid "Certificates Table"
-msgstr "إسم الشّهادة"
+msgstr "جسم الجدول"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
@@ -17704,7 +19178,7 @@ msgstr "تحرير"
 #: ../smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "سلطة شهادة البريد الإلكتروني"
+msgstr "هل تريد الوثوق بسلطة الشهادة؟"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
@@ -17742,17 +19216,18 @@ msgstr "وحدة المنظّمة (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "بصمة SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "شهادة عميل SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
-msgstr "شهادة نادل SSL"
+msgstr "شهادة خادم SSL"
 
 #: ../smime/gui/smime-ui.glade.h:38
+#, fuzzy
 msgid "Trust the authenticity of this certificate"
-msgstr ""
+msgstr "هل تريد الوثوق بسلطة الشهادة؟"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
@@ -17763,8 +19238,9 @@ msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:41
+#, fuzzy
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "هل تريد الوثوق بالشهادة “%s” لتمييز المواقع؟"
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
@@ -17788,252 +19264,216 @@ msgid "Your Certificates"
 msgstr "شهاداتك"
 
 #: ../smime/gui/smime-ui.glade.h:47
+#, fuzzy
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr "إتّحاد سلطات الشّهادات"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:676
 msgid "Certificate already exists"
 msgstr "الشّهادة موجودة أصلاً"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
 #, fuzzy
 msgid "Sign"
-msgstr "التّوقيع"
+msgstr "توقيع باستعمال PGP"
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
 #, fuzzy
 msgid "Encrypt"
-msgstr "مشفّرة"
+msgstr "تشفير باستعمال PGP"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
 msgstr "النّسخة"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
 msgstr "النّسخة 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
 msgstr "النّسخة 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
 msgstr "النّسخة 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 بتشفير·RSA"
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS·#1·MD5·بتشفير RSA"
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS·#1·SHA-1·بتشفير RSA"
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr "تشفير PKCS·#1·RSA"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr "إستخدام مفتاح الشّهادة"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr "نوع شهادة نتْسكيب"
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr "مميّز مفتاح سلطة الشّهادة"
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "هوية المستخدم (UID)"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "شرق"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "مميّز الجسم (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr "مميّز الألغورذم"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr "معطيات الألغورذم"
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr "معلومات مفتاح الموضوع العام"
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr "ألغورذم مفتاح الموضوع العام"
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "مفتاح الموضوع العام"
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "خطأ: لم يمكن معالجة الإمتداد"
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "موقّع الجسم"
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr "سلطة شهادة SSL"
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr "سلطة شهادة البريد الإلكتروني"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "التّوقيع"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
+#, fuzzy
 msgid "Non-repudiation"
-msgstr ""
+msgstr "غير مشارك"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
+#, fuzzy
 msgid "Key Encipherment"
-msgstr ""
+msgstr "اتفاق على المفتاح"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
+#, fuzzy
 msgid "Data Encipherment"
-msgstr ""
+msgstr "البيانات الشخصية"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr "اتفاق على المفتاح"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr "مُوقّع الشّهادة"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr "موقّع CRL"
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
 msgstr "حرِج"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "غير حرِج"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
 msgstr "امتدادات"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "ألغورذم توقيع الشّهادة"
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "المُصدر"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr "الهويّة الفريدة للمُصدر"
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "الهويّة الفريدة للموضوع"
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr "قيمة توقيع الشّهادة"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "كلمة سر ملف PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "إدخال كلمة السّر لملف PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "شهادة مستوردة"
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "مُرفق للإضافة."
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "نوع محتوى المُرفق."
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "إسم الملف الذي سيُعرض في البريد."
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "وصف المُرفق."
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "تعليم المرفق الذي سيظهر داخليا افتراضا."
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "العنوان الإفتراضي للرّسالة."
 
@@ -18050,113 +19490,242 @@ msgstr "لم يمكن تنفيذ '%s': %s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "جاري إطفاء %s (%s)\n"
 
+#: ../ui/evolution-addressbook.xml.h:1
+#, fuzzy
+msgid "Address _Book Properties"
+msgstr "بريد (دفتر العناوين)"
+
 #: ../ui/evolution-addressbook.xml.h:3
 #, fuzzy
+msgid "Change the properties of the selected folder"
+msgstr "تغيير خواص هذا المجلّد"
+
+#: ../ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Co_py All Contacts To..."
+msgstr "نسخ المراسَلين إلى"
+
+#: ../ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Contact _Preview"
+msgstr "استعراض الفيديو"
+
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "نسخ"
+
+#: ../ui/evolution-addressbook.xml.h:7
+#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "نسخ المراسَل (أو المراسَلين) لمجلّد آخر..."
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+#, fuzzy
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "نسخ المنتقى"
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "نسخ للمجلّد..."
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new addressbook folder"
+msgstr "انشاء مجلد جديد فارغ داخل هذا المجلد"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "قص"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "قص المنتقى"
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Del_ete Address Book"
+msgstr "حجم نافذة دفتر العناوين"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "حذف المراسَلين المنتقَيين"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Delete the selected folder"
+msgstr "_حذف المهام المنتقاة"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "تمرير المراسَل"
+
+#: ../ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Mo_ve All Contacts To..."
+msgstr "نقل المراسَلين إلى"
+
+#: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "نقل المراسَل (أو المراسَلين) لمجلّد آخر..."
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "نقل الرسائل المنتقات إلى مجلّد آخر"
+
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "نقل للمجلّد..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "لصق"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "لصق الحافظة الوسيطة"
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "معاينة المراسَلين الذين سيُطبعون"
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "طباعة المراسَلين المنتقَيين"
 
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "Rename the selected folder"
+msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
+
+#: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "S_ave Address Book As VCard"
+msgstr "دفتر عناوين جديد"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "حفظ المراسَلين المنتقين كفيكارد."
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
 msgid "Select All"
 msgstr "إنتقاء الكل"
 
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "إنتقاء ال_كل"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "إنتقاء جميع المراسَلين"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
 msgid "Send a message to the selected contacts."
-msgstr "إرسال رسالة للمراسَلين المنتقَيين."
+msgstr "إرسال المراسَلين المختارين لشخص آخر."
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "إرسال رسالة للمراسَل"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "إرسال المراسَلين المختارين لشخص آخر."
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 #, fuzzy
 msgid "Show contact preview window"
 msgstr "إظهار نافذة معاينة الرّسائل"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "St_op"
+msgstr "_إيقاف التحريك"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "توقّف"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "إيقاف التّحميل"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "عرض المراسَل الحالي"
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "إ_جراءات"
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+#, fuzzy
+msgid "_Copy Contact to..."
+msgstr "نسخ المراسَل إلى"
+
+#: ../ui/evolution-addressbook.xml.h:48
+#, fuzzy
+msgid "_Copy Folder Contacts To"
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
+
+#: ../ui/evolution-addressbook.xml.h:50
+#, fuzzy
+msgid "_Delete Contact"
+msgstr "اسم الموصول"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_تمرير المراسَل..."
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "لوح ال_معاينة"
+#: ../ui/evolution-addressbook.xml.h:53
+#, fuzzy
+msgid "_Move Contact to..."
+msgstr "نقل المراسَل إلى"
 
-#: ../ui/evolution-addressbook.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:54
 #, fuzzy
-msgid "_Save as VCard..."
-msgstr "_حفظ كفِيكارد"
+msgid "_Move Folder Contacts To"
+msgstr "جاري حفظ الرّسالة في المجلّد"
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "إ_ختيار الكل"
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+msgid "_New"
+msgstr "_جديد"
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:60
+#, fuzzy
+msgid "_Rename"
+msgstr "ا_عادة التسمية"
+
+#: ../ui/evolution-addressbook.xml.h:61
+#, fuzzy
+msgid "_Save Contact as VCard..."
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
+
+#: ../ui/evolution-addressbook.xml.h:62
+#, fuzzy
+msgid "_Save Folder Contacts As VCard"
+msgstr "حفظ المراسَلين المنتقين كفيكارد."
+
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "إرسال _رسالة للمراسَل..."
 
@@ -18165,61 +19734,61 @@ msgid "Day"
 msgstr "اليوم"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "حذف كل الأحداث"
+#, fuzzy
+msgid "Delete _all Occurrences"
+msgstr "حذف _كل الأحداث"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr "حذف هذا الموعد"
+#, fuzzy
+msgid "Delete all occurrences"
+msgstr "حذف _كل الأحداث"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "حذف هذا الحدث"
+msgid "Delete the appointment"
+msgstr "حذف هذا الموعد"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "حذف هذا الحدث"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "إذهب إلى"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "تراجُع إلى الخلف"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "تقدُّم إلى الأمام"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "قائمة"
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "الشهر"
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "التّالي"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "معاينة الرزنامة التي ستطبع"
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "السابق"
 
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "طباعة هذه الرزنامة"
 
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "نشر معلومات متوفر/مشغول لهذه الرزنامة"
-
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "تنظ_يف"
@@ -18231,17 +19800,22 @@ msgstr "تنظيف المواعيد و الاجتماعات القديمة"
 #: ../ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Select _Date"
-msgstr "إنتقاء الأسماء"
+msgstr "انتقِ تاريخاً"
+
+#: ../ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "اليوم عند %-I:%M %p"
 
 #: ../ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Select a specific date"
-msgstr "إذهب للتاريخ المحدّد"
+msgstr "انتق تاريخ من الأسفل."
 
 #: ../ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Select today"
-msgstr "إنتقاء مجلّد"
+msgstr "اليوم عند %-I:%M %p"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -18279,35 +19853,261 @@ msgstr "أسبوع عمل"
 #: ../ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
-msgstr "_موعد"
+msgstr "موعد جديد"
 
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "_قص"
-
 #: ../ui/evolution-composer-entries.xml.h:3
+#, fuzzy
+msgid "Copy selection to clipboard"
+msgstr "انسخ المختار إلى الحافظة"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "قص النّص المنتقى للحافظة الوسيطة"
 
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:7
+#, fuzzy
+msgid "Cut selection to clipboard"
+msgstr "قص الإختيار وضعه في الحافطة"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+#, fuzzy
+msgid "Paste from clipboard"
+msgstr "لصق من الحافظة"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
 msgid "Paste text from the clipboard"
 msgstr "لصق نص من الحافظة الوسيطة"
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "إنتقاء ال_كل"
-
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
 msgid "Select all text"
 msgstr "إنتقاء كامل النّص"
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "تخصيص إيفُليوشِن"
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "إرفاق"
+
+#: ../ui/evolution-editor.xml.h:2
+#, fuzzy
+msgid "Click here to attach a file"
+msgstr "أُنقر هنا لإضافة حاضر"
+
+#: ../ui/evolution-editor.xml.h:3
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "غلق الملف الحالي"
+
+#: ../ui/evolution-editor.xml.h:4
+#, fuzzy
+msgid "Click here to save the current window"
+msgstr "غلق الملف الحالي"
+
+#: ../ui/evolution-editor.xml.h:5
+#, fuzzy
+msgid "Click here to view help available"
+msgstr "<أنقر هنا لاختيار تاريخ>"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "غلق"
+
+#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "I_nsert"
+msgstr "أ_درج"
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr "_مُرفق..."
+
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_غلق"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_ملف"
+
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+msgid "_Help"
+msgstr "_مساعدة"
+
+#: ../ui/evolution-editor.xml.h:21
+#, fuzzy
+msgid "_Options"
+msgstr "_خيارات"
+
+#: ../ui/evolution-event-editor.xml.h:2
+#, fuzzy
+msgid "All Day Event"
+msgstr "_حدث جديد يستغرق يوماً كاملاً"
+
+#: ../ui/evolution-event-editor.xml.h:3
+#, fuzzy
+msgid "All _Day Event"
+msgstr "_حدث جديد يستغرق يوماً كاملاً"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+#, fuzzy
+msgid "Classify as Confidential"
+msgstr "حفظ الملف كـ"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Classify as Private"
+msgstr "جاري احداث مفتاح خاص."
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Classify as public"
+msgstr "مفتاح الموضوع العام"
+
+#: ../ui/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "Click here to set or unset alarms for this event"
+msgstr "<أُنقر هنا لإنتقاء مجلّد>"
+
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "إخفاء خيارات القرص المتقدّمة"
+
+#: ../ui/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "Make this a recurring event"
+msgstr "تم حذف هذا الحدث."
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+#, fuzzy
+msgid "Pu_blic"
+msgstr "عام"
+
+#: ../ui/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Query free / busy information for the attendees"
+msgstr "نشر معلومات متوفر/مشغول لهذه الرزنامة"
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "R_ole Field"
+msgstr "حقل ال_قيمة"
+
+#: ../ui/evolution-event-editor.xml.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "اظهار وقت آخر _وصول"
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#, fuzzy
+msgid "Time _Zone"
+msgstr "المنطقة ال_زّمنيّة:"
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+#, fuzzy
+msgid "Toggles whether to display categories"
+msgstr "ما اذا ستعرض أرقام السطور"
+
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "_Alarms"
+msgstr "المنبّهات"
+
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+#, fuzzy
+msgid "_Categories"
+msgstr "الفئات"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+#, fuzzy
+msgid "_Classification"
+msgstr "التّصنيف"
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+#, fuzzy
+msgid "_Confidential"
+msgstr "سرّي"
+
+#: ../ui/evolution-event-editor.xml.h:30
+#, fuzzy
+msgid "_Free/Busy"
+msgstr "معلومات متوفّر/مشغول"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+#, fuzzy
+msgid "_Private"
+msgstr "خاص"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#, fuzzy
+msgid "_RSVP"
+msgstr "تأكيد الحضور"
+
+#: ../ui/evolution-event-editor.xml.h:33
+#, fuzzy
+msgid "_Recurrence"
+msgstr "التّكرار"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#, fuzzy
+msgid "_Status Field"
+msgstr "حقل ال_قيمة"
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#, fuzzy
+msgid "_Type Field"
+msgstr "حقل ال_قيمة"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -18321,7 +20121,7 @@ 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
 #, fuzzy
@@ -18336,67 +20136,92 @@ msgstr "إنشاء أو تحرير قواعد لتصفية البريد الجد
 msgid "Empty _Trash"
 msgstr "إفراغ _سلّة المهملات"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "ال_مجلّد"
 
 #: ../ui/evolution-mail-global.xml.h:9
 #, fuzzy
-msgid "Message F_ilters"
-msgstr "خطوط الرّسائل"
-
-#: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
-msgid "Message _Preview"
-msgstr "ترويسة الرّسالة"
-
-#: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr "نقل الرسائل المنتقات إلى مجلّد آخر"
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Search F_olders"
-msgstr "انتقاء المجلّد"
+msgstr "بحث في الويب"
+
+#: ../ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Show Message _Preview"
+msgstr "إظهار نافذة معاينة الرّسائل"
+
+#: ../ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Show message preview below the message list"
+msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
 #: ../ui/evolution-mail-global.xml.h:15
+#, fuzzy
+msgid "Show message preview side-by-side with the message list"
+msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
+
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "إظهار نافذة معاينة الرّسائل"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "الإشتراك أو إلغاء الاشتراك في المجلّدات على النّوادل البعيدة"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "_Classic View"
+msgstr "إعرض لوح الاتصال"
+
+#: ../ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Copy Folder To..."
-msgstr "ن_سخ للمجلّد..."
+msgstr "نسخ للمجلّد"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:20
+#, fuzzy
+msgid "_Message Filters"
+msgstr "مصفات البريد"
+
+#: ../ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Move Folder To..."
-msgstr "_نقل للمجلّد..."
+msgstr "نقل للمجلّد"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:22
 #, fuzzy
 msgid "_New..."
-msgstr "_جديد"
+msgstr "جديد"
+
+#: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Preview"
+msgstr "_معاينة"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:27
 #, fuzzy
 msgid "_Subscriptions"
 msgstr "إشتراكات المجلّدات"
 
+#: ../ui/evolution-mail-global.xml.h:28
+#, fuzzy
+msgid "_Vertical View"
+msgstr "إعرض لوح الاتصال"
+
 #: ../ui/evolution-mail-list.xml.h:1
 #, fuzzy
 msgid "Change the name of this folder"
@@ -18406,112 +20231,133 @@ msgstr "تغيير خواص هذا المجلّد"
 msgid "Change the properties of this folder"
 msgstr "تغيير خواص هذا المجلّد"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Collapse All _Threads"
+msgstr "إنهيار كل الأعمدة"
+
+#: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Collapse all message threads"
+msgstr "تعليم جميع الرسائل المرئيّة كمقروءة"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "نسخ الرّسائل المنتقاة إلى الحافظة الوسيطة"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "قص الرّسائل المنتقاة إلى الحافظة الوسيطة"
 
-#: ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-list.xml.h:8
+#, fuzzy
+msgid "E_xpand All Threads"
+msgstr "عرض مسارات الأعمال"
+
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "_شطب"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:10
 #, fuzzy
-msgid "Group By _Threads"
-msgstr "ترتيب حسب هذا الحقل"
+msgid "Expand all message threads"
+msgstr "تعليم جميع الرسائل المرئيّة كمقروءة"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:12
 #, fuzzy
 msgid "Hide S_elected Messages"
 msgstr "إخفاء الرّسائل ال_محذوفة"
 
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
 msgstr "إخفاء الرّسائل ال_محذوفة"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
 msgstr "إخفاء الرّسائل المقر_وءة"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "إخفاء الرّسائل المحذوفة عوضاً عن إظهارها بخطٍّ يشطبها"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
-msgid "Mark Me_ssages as Read"
+msgid "Mar_k All Messages as Read"
 msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "لصق رسالة (أو رسائل) من الحافظة"
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
 #, fuzzy
 msgid "Permanently remove this folder"
-msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
+msgstr "تغيير خواص هذا المجلّد"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Select Message _Thread"
-msgstr "إخفاء الرّسائل المنتقا_ة"
+msgstr "تشعيب قائمة الرّسائل."
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Select _All Messages"
 msgstr "إنتقاء جميع الرّسائل المرئيّة"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr "إنتقاء جميع الرّسائل الغير منتقاة حاليّاً و تلك الرّسائل فقط"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr "إنتقاء جميع الرّسائل في نفس شعبة الرّسالة المنتقاة"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
 msgstr "إنتقاء جميع الرّسائل المرئيّة"
 
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Sh_ow Hidden Messages"
-msgstr "إ_ظهار الرّسائل المخفيّة"
+#: ../ui/evolution-mail-list.xml.h:25
+#, fuzzy
+msgid "Show Hidde_n Messages"
+msgstr "جاري نقل الرسائل إلى %s"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr "إظهار الرّسائل المخفيّة مؤقّتاً"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr "إخفاء جميع الرّسائل المقروءة مؤقّتاً"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr "إخفاء الرسائل المنتقاة مؤقتاً"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr "قائمة رسائل مشعّبة"
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-list.xml.h:31
+#, fuzzy
+msgid "_Group By Threads"
+msgstr "ترتيب حسب الصّندوق"
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 #, fuzzy
 msgid "_Message"
-msgstr "ال_رسائل"
+msgstr "رسالة"
 
 #: ../ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
-msgstr "إ_ضافة مرسِل إلى دفتر العناوين"
+msgstr "أضف المكالم إلى دفتر العناوين"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
@@ -18521,12 +20367,12 @@ msgstr "ت_طبيق المصفاة"
 #: ../ui/evolution-mail-message.xml.h:4
 #, fuzzy
 msgid "Add Sender to Address Book"
-msgstr "إضافة المرسِل إلى دفتر العناوين"
+msgstr "أضف المكالم إلى دفتر العناوين"
 
 #: ../ui/evolution-mail-message.xml.h:5
 #, fuzzy
 msgid "All Message _Headers"
-msgstr "ترويسة الرّسالة"
+msgstr "_طبع ترويسات الصفحات"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
@@ -18535,7 +20381,7 @@ msgstr "تطبيق قواعدة التصفية على الرسائل المنت�
 #: ../ui/evolution-mail-message.xml.h:7
 #, fuzzy
 msgid "Check for _Junk"
-msgstr "جاري التّفقّد عن وصول بريد جديد"
+msgstr "ت_ثبّت من التحديثات"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -18553,83 +20399,99 @@ msgstr "تأليف رد إلى القائمة البريديّة للرّسال�
 msgid "Compose a reply to the sender of the selected message"
 msgstr "تأليف رد إلى مرسِل الرّسالة المنتقاة"
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Copy selected messages to the clipboard"
+msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
+
+#: ../ui/evolution-mail-message.xml.h:14
 #, fuzzy
 msgid "Create R_ule"
 msgstr "إنشاء مجلّد"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a Search Folder for these recipients"
 msgstr "إنشاء مجلّد اعتباطي لهؤلاء المرسَل إليهم"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
 msgstr "إنشاء مجلّد اعتباطي لقائمة المراسلة هذه"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a Search Folder for this sender"
 msgstr "إنشاء مجلّد اعتباطي لهذا المرسِل"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a Search Folder for this subject"
 msgstr "إنشاء مجلّد اعتباطي لهذا الموضوع"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "إنشاء قانون لتصفية الرّسائل من هذا المرسِل"
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "إنشاء قانون لتصفية الرّسائل إلى هؤلاء المرسَل إليهم"
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "إنشاء قانون لتصفية الرّسائل إلى هذه القائمة البريدية"
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "إنشاء قانون لتصفية الرّسائل التي لها هذا العنوان"
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Cut selected messages to the clipboard"
+msgstr "قص النّص المنتقى للحافظة الوسيطة"
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "خفض حجم النص"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "عرض الرسالة المهمة التالية"
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "عرض الرسالة التالية"
 
+#: ../ui/evolution-mail-message.xml.h:28
+#, fuzzy
+msgid "Display the next thread"
+msgstr "عرض الرسالة التالية"
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "عرض الرسالة الغير مقروءة التالية"
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
-msgstr "عرض النقاش الغير مقروء السابق"
-
-#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous important message"
 msgstr "عرض الرسالة المهمة السابقة"
 
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "عرض الرسالة السابقة"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "عرض الرسالة الغير مقروءة السابقة"
 
+#: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "F_orward As..."
+msgstr "ك_خلفية"
+
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "تصفية بناءً على ال_قائمة البريدية..."
@@ -18652,7 +20514,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "تعليم الرسائل المنتقات على أنها نفاية"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
+#, fuzzy
+msgid "Flag selected messages for follow-up"
 msgstr "تعليم الرسالة المنتقاة للمتابعة"
 
 #: ../ui/evolution-mail-message.xml.h:40
@@ -18689,28 +20552,34 @@ msgid "Mar_k as"
 msgstr "تعليم على أنّها _مقروءة"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
+#, fuzzy
+msgid "Mark the selected messages as having been read"
 msgstr "تعليم الرسائل المنتقات كمقروءة"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "تعليم الرسائل المنتقات كمُهمّة"
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "تعليم الرسائل المنتقات على أنها نفاية"
+#, fuzzy
+msgid "Mark the selected messages as junk"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
+#, fuzzy
+msgid "Mark the selected messages as not being junk"
 msgstr "تعليم·الرسائل·المنتقات·على·أنها ليست·نفاية"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
+#, fuzzy
+msgid "Mark the selected messages as not having been read"
 msgstr "تعليم الرسائل المنتقات كلم تقرأ بعد"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "تعليم الرسائل المنتقات كغير مهمّة"
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
@@ -18718,462 +20587,523 @@ msgstr "تعليم الرسالة المنتقات للحذف"
 
 #: ../ui/evolution-mail-message.xml.h:57
 #, fuzzy
-msgid "Message Source"
-msgstr "تخزين الرّسائل"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "نقل"
+msgid "Move selected messages to another folder"
+msgstr "نسخ الرّسالة المنتقاة إلى مجلّد آخر"
 
 #: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
-msgstr "نقل الرسائل المنتقات إلى مجلّد آخر"
-
-#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Important Message"
 msgstr "الرسالة ال_مهمّة التالية"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "ال_نّقاش التالي"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "الرّسالة ال_غير مقروءة التالية"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "ليس نفاية"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "فتح نافذة جديدة لتأليف رسالة بريديّة"
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
-msgstr "افتح الرسالة المحدّدة في نافذة جديدة"
+#: ../ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Open the selected messages in a new window"
+msgstr "فتح المؤشّر المنتقى في نافذة جديدة"
 
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
-msgid "Open the selected message in the composer for editing"
+msgid "Open the selected messages in the composer for editing"
 msgstr "فتح الرسالة المحدّدة في المُؤلّف لإعادة إرسالها"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "الرسالة الغير مقروءة ال_سابقة"
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Paste messages from the clipboard"
+msgstr "لصق نص من الحافظة الوسيطة"
+
+#: ../ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Pos_t New Message to Folder"
-msgstr "إرسال رسالة جد_يدة"
+msgstr "تعليق الرّسالة في مجلّد عام"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "إرسال _رد"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "تعليق الرّسالة في مجلّد عام"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "إرسال رد على رسالة في مجلّد عمومي"
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "الرسالة المهمّة ال_سابقة"
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "تعيين الرسالة قبل طبعها"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "طبع هذه الرسالة"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "إ_عادة توجيه"
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "إعادة توجيه (bounce) الرسالة المحدّدة إلى أحد ما"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "إعادة ضبط النّص لحجمه الأصلي"
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
+#: ../ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "Save the selected messages as a text file"
 msgstr "حفظ الرّسالة كملف نصّي"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "Search Folder from Mailing _List..."
-msgstr "تصفية بناءً على ال_قائمة البريدية..."
+msgstr "إزالة المجلّد من قائمة المجلّدات المشترِك بها"
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Search Folder from Recipients..."
-msgstr "مجلّد·إعتباطي·على·ال_متلّقين"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Search Folder from S_ubject..."
-msgstr "مجلّد إعتباطي على الموضوع"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 #, fuzzy
 msgid "Search Folder from Sen_der..."
 msgstr "مجلّد·إعتباطي·على·الم_رسِل"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "بحث عن النّص في الرسالة المعروضة"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Select _All Text"
 msgstr "إنتقاء كامل النّص"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:92
 #, fuzzy
 msgid "Select all the text in a message"
-msgstr "إنتقاء جميع الرّسائل المرئيّة"
+msgstr "انتقاء كامل النص في خانة نص"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "ضبط تعيينات الصّفحة لطابعتك الحاليّة"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "إظهار مؤشّر وامض في متن الرّسائل المعروضة"
 
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
-msgstr "إظهار الرّسالة بالأسلوب العادي"
+#: ../ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "Show messages in the normal style"
+msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
+#: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
+msgid "Show messages with all email headers"
 msgstr "إظهار الرّسالة مع كل ترويسات البريد الإلكتروني"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "إظهار مصدر البريد الإلكتروني الخام للرّسالة"
 
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
-msgstr "تراجع عن حذف الرسائل المنتقات"
+#: ../ui/evolution-mail-message.xml.h:98
+#, fuzzy
+msgid "Undelete the selected messages"
+msgstr "إخفاء الرسائل المنتقاة مؤقتاً"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "Uni_mportant"
 msgstr "مهم"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
+#, fuzzy
 msgid "Zoom _Out"
-msgstr ""
+msgstr "ت_صغير"
+
+#: ../ui/evolution-mail-message.xml.h:101
+#, fuzzy
+msgid "_Attached"
+msgstr "إرفاق"
 
 #: ../ui/evolution-mail-message.xml.h:102
 #, fuzzy
 msgid "_Caret Mode"
-msgstr "_نسق الوامض"
+msgstr "تغعيل/تعطيل نسق النّابض"
+
+#: ../ui/evolution-mail-message.xml.h:103
+#, fuzzy
+msgid "_Clear Flag"
+msgstr "حالة العلم"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:106
 #, fuzzy
 msgid "_Delete Message"
-msgstr "إخفاء الرّسائل ال_محذوفة"
+msgstr "إر_سال رسالة"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Find in Message..."
-msgstr "_بحث في رسالة..."
+msgstr "ليس ثمّة رسالة %s في %s"
 
 #: ../ui/evolution-mail-message.xml.h:109
+#, fuzzy
+msgid "_Flag Completed"
+msgstr "إنتهت المكالمة"
+
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "إ_ذهب إلى"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:112
 #, fuzzy
 msgid "_Important"
 msgstr "مهم"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
+#, fuzzy
+msgid "_Inline"
+msgstr "ضمن السّياق"
+
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr "_نفاية"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Load Images"
-msgstr "تحميل ال_صور"
+msgstr "كل الصّور"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:117
+#, fuzzy
+msgid "_Message Source"
+msgstr "_مصدر الصفحة"
+
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "الرّسالة ال_تّالية"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Normal Size"
-msgstr "عادي"
+msgstr "حجم _عادي"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:121
 #, fuzzy
 msgid "_Not Junk"
 msgstr "ليس نفاية"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:122
 #, fuzzy
 msgid "_Open in New Window"
-msgstr "فتح في نافذة _جديدة"
+msgstr "فتح في نافذة جديدة"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "ال_رّسالة السابقة"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:125
+#, fuzzy
+msgid "_Quoted"
+msgstr "مقتبس"
+
+#: ../ui/evolution-mail-message.xml.h:128
 #, fuzzy
 msgid "_Save Message..."
 msgstr "حفظ الرّسالة..."
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:129
 #, fuzzy
 msgid "_Undelete Message"
-msgstr "الرّسالة ال_تّالية"
+msgstr "إر_سال رسالة"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:130
 #, fuzzy
 msgid "_Unread"
-msgstr "تعليم على أنّها _غير مقروءة"
+msgstr "الرّسالة ال_غير مقروءة التالية"
 
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Zoom In"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:131
+#, fuzzy
+msgid "_Zoom"
+msgstr "التكبير"
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
-msgstr "غلق"
+#: ../ui/evolution-mail-message.xml.h:132
+#, fuzzy
+msgid "_Zoom In"
+msgstr "ت_كبير"
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "غلق هذه النافذة"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "عمود الأدوات الرّئيسي"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_غلق"
+#: ../ui/evolution-memos.xml.h:3
+#, fuzzy
+msgid "Copy selected memo"
+msgstr "نسخ السّطور المنتقاة"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_ملف"
+#: ../ui/evolution-memos.xml.h:5
+#, fuzzy
+msgid "Cut selected memo"
+msgstr "قص النّص المنتقى للحافظة الوسيطة"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "إرفاق"
+#: ../ui/evolution-memos.xml.h:7
+#, fuzzy
+msgid "Delete selected memos"
+msgstr "_حذف المهام المنتقاة"
+
+#: ../ui/evolution-memos.xml.h:9
+#, fuzzy
+msgid "Paste memo from the clipboard"
+msgstr "لصق نص من الحافظة الوسيطة"
+
+#: ../ui/evolution-memos.xml.h:10
+#, fuzzy
+msgid "Previews the list of memos to be printed"
+msgstr "استعراض قائمة المهام التي ستطبع"
+
+#: ../ui/evolution-memos.xml.h:13
+#, fuzzy
+msgid "Print the list of memos"
+msgstr "طبع قائمة المهام"
+
+#: ../ui/evolution-memos.xml.h:14
+#, fuzzy
+msgid "View the selected memo"
+msgstr "عرض الملف المنتقى"
+
+#: ../ui/evolution-memos.xml.h:18
+#, fuzzy
+msgid "_Open Memo"
+msgstr "فتح ملف"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "إرفاق ملف"
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
 #. accel="*Ctrl*s"/>
 #.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
 #: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr "غلق الملف الحالي"
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "حذف الكلّ عدى التوقيع"
 
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "تشفير هذه الرسالة باستخدام PGP"
 
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "تشفير هذه الرسالة باستخدام شهادة التشفير S/MIME الخاصة بك"
+msgstr "توقيع الرسالة بتوقيع شهادة S/MIME خاصة بك"
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr "_تهيئة"
 
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "فتح ملفّ"
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "تشفير باستعمال PGP"
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "توقيع باستعمال PGP"
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Request read receipt"
-msgstr "وصول قراءة"
+msgid "R_equest Read Receipt"
+msgstr "عدم إرسال وصل قراءة أبداً"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "تشفير باستعمال S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "توقيع باسعمال S/MIME"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "حفظ كـ"
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save Draft"
 msgstr "حفظ _مسودّة"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
 msgstr "حفظ _كـ..."
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
 msgstr "حفظ _مسودّة"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save as draft"
-msgstr "حفظ _مسودّة"
+msgstr "حفظ الملف كـ"
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr "حفظ في المجلّد..."
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr "حفظ الملف الحالي"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr "حفظ الملف الحالي بإسم مغاير"
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
 msgstr "حفظ الرسالة في مجلّد محدد"
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Send"
+msgstr "إرسال"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "إرسال البريد بتهيئة HTML"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Send this message"
 msgstr "إرسال هذه الرسالة"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Set the message priority to high"
+msgstr "حفظ الرّسالة كملف نصّي"
+
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
 msgstr "توقيع الرسالة بمفتاح PGP الخاص بك"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "توقيع الرسالة بتوقيع شهادة S/MIME خاصة بك"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_مُرفق..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr "حقل النّسخة الكربونيّة ال_مخفيّة"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_Delete all"
 msgstr "_حذف الكل"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_From Field"
 msgstr "حقل _مِن"
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr "_إدراج"
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_فتح..."
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
 #, fuzzy
 msgid "_Post-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+#, fuzzy
+msgid "_Prioritize Message"
+msgstr "إر_سال رسالة"
+
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_أمن"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
 #, fuzzy
 msgid "_To Field"
-msgstr "حقل _مِن"
+msgstr "حقل ال_رّد إلى"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
@@ -19183,18 +21113,18 @@ msgstr "_غلق"
 msgid "H_TML"
 msgstr "H_TML"
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "حفظ و غلق"
 
 #.
 #. <menuitem name="FileSave" verb="" _label="_Save"/>
 #.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "حفظ و _غلق"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "حفظ الملف الحالي ثم غلق النافذة"
 
@@ -19226,13 +21156,39 @@ msgstr "ألغاء الإشتراك"
 msgid "_Invert Selection"
 msgstr "_عكس المنتقى"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:9
+#, fuzzy
+msgid "Status Details"
+msgstr "اظهار التفاصيل"
+
+#: ../ui/evolution-task-editor.xml.h:10
+#, fuzzy
+msgid "Time Zone"
+msgstr "المنطقة ال_زّمنيّة:"
+
+#: ../ui/evolution-task-editor.xml.h:23
+#, fuzzy
+msgid "_Send Options"
+msgstr "<b>خيارات العرض:</b>"
+
+#: ../ui/evolution-task-editor.xml.h:24
+#, fuzzy
+msgid "_Status Details"
+msgstr "اظهار التفاصيل"
+
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "نسخ المهام·المنتقاة"
+#, fuzzy
+msgid "Copy selected tasks"
+msgstr "_حذف المهام المنتقاة"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "قص المهام·المنتقاة"
+#, fuzzy
+msgid "Cut selected tasks"
+msgstr "_حذف المهام المنتقاة"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19251,8 +21207,9 @@ msgid "Mark selected tasks as complete"
 msgstr "تعليم المهام المنتقاة كمكتملة"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "لصق مهمّة من الحافظة الوسيطة"
+#, fuzzy
+msgid "Paste tasks from the clipboard"
+msgstr "لصق نص من الحافظة الوسيطة"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -19264,18 +21221,28 @@ msgstr "طبع قائمة المهام"
 
 #: ../ui/evolution-tasks.xml.h:18
 #, fuzzy
+msgid "Show task preview window"
+msgstr "إظهار نافذة معاينة الرّسائل"
+
+#: ../ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "Task _Preview"
+msgstr "استعراض الفيديو"
+
+#: ../ui/evolution-tasks.xml.h:20
+#, fuzzy
 msgid "View the selected task"
-msgstr "حذف المهام المنتقاة"
+msgstr "عرض الملف المنتقى"
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 #, fuzzy
 msgid "_Open Task"
-msgstr "_مهمّة"
+msgstr "ت_كليف بالمهمّة"
 
 #: ../ui/evolution.xml.h:1
 #, fuzzy
 msgid "About Evolution..."
-msgstr "حول زيميان ايفُليوشِن..."
+msgstr "خطأ إيفُليوشِن"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -19284,12 +21251,12 @@ msgstr "تغيير تعيينات ايفُليوشِن"
 #: ../ui/evolution.xml.h:3
 #, fuzzy
 msgid "Change the visibility of the toolbar"
-msgstr "تغيير خواص هذا المجلّد"
+msgstr "تغيير رؤية العمود الجانبي لهذه النافذة"
 
 #: ../ui/evolution.xml.h:5
 #, fuzzy
 msgid "Create a new window displaying this folder"
-msgstr "إنشاء نافذة جديدة"
+msgstr "انشاء مجلد جديد فارغ داخل هذا المجلد"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
@@ -19312,53 +21279,81 @@ msgid "Exit the program"
 msgstr "إنهاء البرنامج"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "نسيان _كلمات السّر"
-
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "نسيان كلمات السّر المتذكّرة حتّى يُطلب منك إدخالها من جديد"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
+#, fuzzy
 msgid "Hide window buttons"
-msgstr ""
+msgstr "إظهار أ_زرار الإخفاء"
+
+#: ../ui/evolution.xml.h:13
+#, fuzzy
+msgid "I_mport..."
+msgstr "ا_ستيراد"
 
 #: ../ui/evolution.xml.h:14
+#, fuzzy
 msgid "Icons _and text"
-msgstr ""
+msgstr "نصوص و أيقونات عريضة"
 
 #: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "استيراد بيانات من برامج أخرى"
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
 #, fuzzy
-msgid "New _Window"
-msgstr "_نافذة"
+msgid "Lay_out"
+msgstr "خروج"
 
 #: ../ui/evolution.xml.h:18
 #, fuzzy
-msgid "Prefere_nces"
-msgstr "تفضيلات البريد"
+msgid "New _Window"
+msgstr "نافذة _جديدة"
 
 #: ../ui/evolution.xml.h:19
+#, fuzzy
+msgid "Prefere_nces"
+msgstr "التّف_ضيلات"
+
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "ارسال / تلقي"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
+#, fuzzy
+msgid "Send / _Receive"
+msgstr "ارسال / تلقي"
+
+#: ../ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr "إرسال العناصر المصطفة و جلب العناصر الجديدة"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
 msgid "Set up Pilot configuration"
 msgstr "ضبط إعدادات الحاسوب اليدوي"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:24
+#, fuzzy
+msgid "Show Side _Bar"
+msgstr "عرض عمود ال_قوائم"
+
+#: ../ui/evolution.xml.h:25
+#, fuzzy
+msgid "Show _Status Bar"
+msgstr "لا عمود حالة"
+
+#: ../ui/evolution.xml.h:26
+#, fuzzy
+msgid "Show _Toolbar"
+msgstr "عرض عمود الأدوات"
+
+#: ../ui/evolution.xml.h:27
 #, fuzzy
 msgid "Show information about Evolution"
-msgstr "عرض معلومات حول زيميان ايفُليوشِن"
+msgstr "عرض معلومات عن الملف الحالي"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "إرسال تقرير خلل"
 
@@ -19366,86 +21361,84 @@ msgstr "إرسال تقرير خلل"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "إرسال تقرير _خلل"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "إرسال تقرير خلل باستخدام باك بدي"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:36
 #, fuzzy
-msgid "Tool_bar"
-msgstr "عمود الأدوات الرّئيسي"
+msgid "Tool_bar style"
+msgstr "بدون عمود الأدوات"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:37
 #, fuzzy
-msgid "Tool_bar style"
-msgstr "عمود الأدوات الرّئيسي"
+msgid "View/Hide the Side Bar"
+msgstr "عرض أو إخفاء اللوحة الجانبية"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:38
 #, fuzzy
-msgid "_About Evolution..."
-msgstr "_حول زيميان.ايفُليوشِن..."
+msgid "View/Hide the Status Bar"
+msgstr "عمود الحالة مرئي"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:39
+#, fuzzy
+msgid "_About"
+msgstr "_حول"
+
+#: ../ui/evolution.xml.h:40
 #, fuzzy
 msgid "_Close Window"
-msgstr "غلق هذه النافذة"
+msgstr "_غلق النّافذة"
 
-#: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "_مساعدة"
+#: ../ui/evolution.xml.h:43
+#, fuzzy
+msgid "_Forget Passwords"
+msgstr "تذكر كلمات السر"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:45
+#, fuzzy
 msgid "_Hide buttons"
-msgstr ""
+msgstr "إظهار أ_زرار الإخفاء"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:46
+#, fuzzy
 msgid "_Icons only"
-msgstr ""
-
-#: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_إستيراد..."
-
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_جديد"
+msgstr "أيقونات فقط"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:48
 #, fuzzy
 msgid "_Quick Reference"
-msgstr "تفضيلات البريد"
+msgstr "علامة المرجع"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Quit"
-msgstr "_قص"
+msgstr "إ_نهاء"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr "_إرسال / تلقي"
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:50
+#, fuzzy
 msgid "_Switcher Appearance"
-msgstr ""
+msgstr "<b>خيارات العرض:</b>"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:51
+#, fuzzy
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "<b>خيارات العرض:</b>"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:52
 #, fuzzy
 msgid "_Text only"
-msgstr "نموذج النّص"
+msgstr "نص فقط"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:54
 msgid "_Window"
 msgstr "_نافذة"
 
@@ -19472,7 +21465,7 @@ msgstr "مشهد ال_يوم"
 #: ../views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "_List View"
-msgstr "مشهد اللائحة"
+msgstr "مشهد القائمة"
 
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
@@ -19483,64 +21476,83 @@ msgid "_Work Week View"
 msgstr "_مشهد أسبوع العمل"
 
 #: ../views/mail/galview.xml.h:1
-msgid "As _Sent Folder"
+#, fuzzy
+msgid "As Sent Folder for Wi_de View"
 msgstr "كمجلّد _مُرسلات"
 
 #: ../views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "كمجلّد _مُرسلات"
+
+#: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
 msgstr "بحسب ال_حالة"
 
-#: ../views/mail/galview.xml.h:3
+#: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
 msgstr "بحسب ال_مرسِل"
 
-#: ../views/mail/galview.xml.h:4
+#: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
 msgstr "بحسب المو_ضوع"
 
-#: ../views/mail/galview.xml.h:5
+#: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr "بحسب _علامة المتابعة"
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:7
+#, fuzzy
+msgid "For _Wide View"
+msgstr "نمط عرض الشجرة"
+
+#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
 msgstr "ال_رسائل"
 
+#: ../views/memos/galview.xml.h:1
+#, fuzzy
+msgid "_Memos"
+msgstr "الأعضاء"
+
 #: ../views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "With _Due Date"
-msgstr "تاريخ الإ_ستحقاق:"
+msgstr "تاريخ الإستحقاق خاطئ"
 
 #: ../views/tasks/galview.xml.h:2
 #, fuzzy
 msgid "With _Status"
 msgstr "ضبط الحالة"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#. Put the ""UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
 msgid "UTC"
 msgstr "ت.غ"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Time Zones</b>"
-msgstr "المناطق الزمنيّة"
+msgstr "وقت غير سليم"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 #, fuzzy
 msgid "<b>_Selection</b>"
-msgstr "ال_منتقى:"
+msgstr "المنتقى"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "اختر منطقة زمنيّة"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 #, fuzzy
 msgid "TimeZone Combobox"
-msgstr "المنطقة الزّمنيّة "
+msgstr "نموذج ComboBox"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -19553,13 +21565,13 @@ msgstr ""
 #: ../widgets/menus/gal-define-views-model.c:188
 #, fuzzy
 msgid "Collection"
-msgstr "التّعاون"
+msgstr "م_جموعات صور"
 
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, fuzzy, no-c-format
 msgid "Define Views for %s"
-msgstr "تعريف المشاهد..."
+msgstr "ت_ثبّت من التحديثات"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
@@ -19570,7 +21582,7 @@ msgstr "تعريف المشاهد..."
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, fuzzy, no-c-format
 msgid "Define Views for \"%s\""
-msgstr "تعريف المشاهد..."
+msgstr "ت_ثبّت من التحديثات"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 #, fuzzy
@@ -19578,34 +21590,51 @@ msgid "_Edit..."
 msgstr "_تحرير"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "جدول"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 #, fuzzy
 msgid "Instance"
-msgstr "كل الأنمذجة"
+msgstr "تعريف النسخة"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 #, fuzzy
 msgid "Save Current View"
-msgstr "المشهد الحالي"
+msgstr "عرض المراسَل الحالي"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 #, fuzzy
 msgid "_Create new view"
-msgstr "إنشاء مهمّةً جديدة"
+msgstr "انشاء موضوع جديد"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#, fuzzy
 msgid "_Replace existing view"
-msgstr ""
+msgstr "عرض الفيديو الافتراضي"
+
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "مشهد مخصّص"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "حفظ المعرض المخصّص"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "تعريف المشاهد..."
 
 #: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "المشهد ال_حالي"
+#, fuzzy
+msgid "C_urrent View"
+msgstr "إعرض لوح الاتصال"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -19618,113 +21647,114 @@ msgstr "مصنع"
 #: ../widgets/menus/gal-view-new-dialog.c:115
 #, fuzzy
 msgid "Define New View"
-msgstr "تعريف المعارض"
+msgstr "عرض ال_مجلدات الجديدة باستخدام:"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#, fuzzy
 msgid "Name of new view:"
-msgstr ""
+msgstr "اسم دليل جديد"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 #, fuzzy
 msgid "Type of View"
-msgstr "نوع المشهد الذي سيُعرض"
+msgstr "إعرض لوح الاتصال"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 #, fuzzy
 msgid "Type of view:"
-msgstr "نوع المشهد الذي سيُعرض"
+msgstr "إعرض لوح الاتصال"
+
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr "إقتراح العرض التّلقائي للمُرفق"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "إثأخجسأ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
+#: ../widgets/misc/e-calendar-item.c:1747
 msgid "%B %Y"
 msgstr "%B·%Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-#, fuzzy
-msgid "Previous Button"
-msgstr "السابق"
-
 #: ../widgets/misc/e-calendar.c:226
 #, fuzzy
 msgid "Month Calendar"
-msgstr "جاري تحميل الرُّزنامة"
+msgstr "حدد الشهر في التقويم"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3582
 msgid "Fill color"
 msgstr "لون التّعبئة"
 
-#: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3597
 msgid "GDK fill color"
 msgstr "لون GDK fill"
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3604
 msgid "Fill stipple"
 msgstr "تنقيط التّعبئة"
 
-#: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "أدنى عرض"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "أدنى عرض"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:206
 #, fuzzy
 msgid "Spacing"
-msgstr "إسبانيا"
+msgstr "فراغات"
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "الآن"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "يجب أن يكون الوقت بتهيئة: %s"
@@ -19733,215 +21763,286 @@ msgstr "يجب أن يكون الوقت بتهيئة: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "يجب أن تكون القيمة المائويّة بين 0 و100،مضمنة"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "البلطيقيّة"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "وسط أوروبيّة"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "الصّينيّة"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr "السّريليّة"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "اليونانيّة"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "العبريّة"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "اليابانيّة"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "الكوريّة"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+#, fuzzy
+msgid "Thai"
+msgstr "تايلندي"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "التركيّة"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "يونيكود"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "غرب أوروبي"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 #, fuzzy
 msgid "Western European, New"
-msgstr "غرب أوروبي"
+msgstr "خواتم وقتية للملفات الجديدة"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
 msgid "Traditional"
 msgstr "تقليدي"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Simplified"
 msgstr "مبسّط"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Ukrainian"
 msgstr "الأكرانية"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Visual"
 msgstr "مرئي"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:175
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "مجموعة رموز مجهولة: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:220
 msgid "Character Encoding"
 msgstr "تشفيرة الرموز"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:235
 msgid "Enter the character set to use"
 msgstr "أدخل مجموعة الرموز للاستخدام"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:342
 msgid "Other..."
 msgstr "أخرى..."
 
+#: ../widgets/misc/e-charset-picker.c:483
+#, fuzzy
+msgid "Ch_aracter Encoding"
+msgstr "ت_شفيرات الرموز:"
+
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "   "
 
-#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:321
 #, fuzzy
-msgid "Date and Time Entry"
-msgstr "التاريخ و الوقت"
+msgid "Date and Time"
+msgstr "الوقت و التّاريخ"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:362
+#, fuzzy
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "انقر هذا الزر لبدء المتصفح"
 
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:384
 #, fuzzy
-msgid "Date Button"
-msgstr "رسم الزّر"
-
-#: ../widgets/misc/e-dateedit.c:374
 msgid "Combo box to select time"
-msgstr ""
+msgstr "إختيار وقت للمقارنة به"
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr ""
+#: ../widgets/misc/e-dateedit.c:385
+#, fuzzy
+msgid "Time"
+msgstr "الوقت"
 
-#: ../widgets/misc/e-expander.c:181
+#: ../widgets/misc/e-dateedit.c:461
 #, fuzzy
-msgid "Expanded"
-msgstr "_شطب"
+msgid "No_w"
+msgstr "لا"
+
+#: ../widgets/misc/e-dateedit.c:467
+#, fuzzy
+msgid "_Today"
+msgstr "اليوم"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#: ../widgets/misc/e-dateedit.c:1634
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "قيمة معامل غير صالحة"
+
+#: ../widgets/misc/e-dateedit.c:1660
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "قيمة معامل غير صالحة"
 
 #: ../widgets/misc/e-expander.c:182
 #, fuzzy
+msgid "Expanded"
+msgstr "ممدد"
+
+#: ../widgets/misc/e-expander.c:183
+#, fuzzy
 msgid "Whether or not the expander is expanded"
-msgstr "ما إذا كان سيُسْأل عن تأكيد عند مَحْوِ مجلّد"
+msgstr "فيما اذا يجب قفل لوحة المحارف"
 
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:191
+#, fuzzy
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "نص شارة الموسع"
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:198
 #, fuzzy
 msgid "Use underline"
-msgstr "غير معرّف"
+msgstr "استخدام التسطير"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:199
+#, fuzzy
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
+"إذا ضبط، فسيكون هناك تسطير في النص يشير إلى الرمز التالي الذي يجب استخدامه "
+"كرمز مسطر لمفتاح الاختصار"
 
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:207
+#, fuzzy
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "الفضاء الذي سيوضع بين الشارة و الإبن"
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:216
+#, fuzzy
 msgid "Label widget"
-msgstr ""
+msgstr "قطعة الشارة"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:217
+#, fuzzy
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
+msgstr "القطعة التي ستعرض عوض شارة الموسع الاعتادية"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "حجم الموسّع"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "حجم سهم الموسّع"
 
-#: ../widgets/misc/e-expander.c:231
-msgid "Indicator Spacing"
-msgstr ""
-
 #: ../widgets/misc/e-expander.c:232
-msgid "Spacing around expander arrow"
-msgstr ""
+#, fuzzy
+msgid "Indicator Spacing"
+msgstr "تَبَاعُد المؤشر"
 
-#: ../widgets/misc/e-filter-bar.c:195
+#: ../widgets/misc/e-expander.c:233
 #, fuzzy
-msgid "_Searches"
-msgstr "_بحث"
+msgid "Spacing around expander arrow"
+msgstr "الفراغات حول سهم الموسع"
 
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "محرّر البحث"
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
+#: ../widgets/misc/e-filter-bar.c:717
+msgid "Advanced Search"
+msgstr "بحث متقدّم"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:218
 msgid "Save Search"
 msgstr "حفظ البحث"
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.c:251
+#, fuzzy
+msgid "_Searches"
+msgstr "البحوث"
+
+#: ../widgets/misc/e-filter-bar.c:253
+#, fuzzy
+msgid "Searches"
+msgstr "البحوث"
+
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
 msgid "_Save Search..."
 msgstr "_حفظ البحث..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Edit Saved Searches..."
 msgstr "_تحرير.البحوث المحفوظة..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 #, fuzzy
 msgid "_Advanced Search..."
 msgstr "بحث متقدّم"
 
+#: ../widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "All Accounts"
+msgstr "قائمة الحسابات"
+
+#: ../widgets/misc/e-filter-bar.h:104
+#, fuzzy
+msgid "Current Account"
+msgstr "إسم الحساب:"
+
+#: ../widgets/misc/e-filter-bar.h:105
+#, fuzzy
+msgid "Current Folder"
+msgstr "فتح المجلد %s"
+
+#: ../widgets/misc/e-filter-bar.h:106
+#, fuzzy
+msgid "Current Message"
+msgstr "إر_سال رسالة"
+
 #: ../widgets/misc/e-image-chooser.c:172
 #, fuzzy
 msgid "Choose Image"
-msgstr "إختيار ملف"
+msgstr "صورة الفيديو"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:629
+#, fuzzy
 msgid "World Map"
-msgstr ""
+msgstr "خارطة صورة"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19950,7 +22051,7 @@ msgstr ""
 #: ../widgets/misc/e-pilot-settings.c:103
 #, fuzzy
 msgid "Sync with:"
-msgstr "ينتهي بـ"
+msgstr "الفتح بـاستخدام"
 
 #: ../widgets/misc/e-pilot-settings.c:111
 msgid "Sync Private Records:"
@@ -19960,69 +22061,70 @@ msgstr "مزامنة السّجلّات الخاصّة:"
 msgid "Sync Categories:"
 msgstr "أصناف المزامنة:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 #, fuzzy
 msgid "Empty message"
-msgstr "رسالة مساعدة"
+msgstr "إر_سال رسالة"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 #, fuzzy
 msgid "Reflow model"
-msgstr "إختبار الجزْر"
+msgstr "<b>نسق اللغة:</b>"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 #, fuzzy
 msgid "Column width"
 msgstr "عرض العمود"
 
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-#, fuzzy
-msgid "Search Text Entry"
-msgstr "محرّر البحث"
-
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Search"
 msgstr "_بحث"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Find Now"
 msgstr "_بحث الآن"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Clear"
 msgstr "_مسح"
 
-#: ../widgets/misc/e-search-bar.c:647
-#, fuzzy
-msgid "Search Type"
-msgstr "نطاق ال_بحث: "
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:855
 msgid "Item ID"
 msgstr "هوية العنصر"
 
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
-msgstr "هوية العنصر المحوي"
-
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
+#: ../widgets/text/e-text.c:3504
 msgid "Text"
 msgstr "نص"
 
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "بحث الآ_ن"
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:996
+#, fuzzy
+msgid "Sho_w: "
+msgstr "عرض كل المواضيع"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1013
+#, fuzzy
+msgid "Sear_ch: "
+msgstr "_حرف"
+
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1025
+#, fuzzy
+msgid " i_n "
+msgstr " و "
 
-#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "صف المؤشّر"
 
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "عمود المؤشّر"
@@ -20039,15 +22141,15 @@ msgstr "نمط الانتقاء"
 msgid "Cursor Mode"
 msgstr "نمط المؤشّر"
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
 #, fuzzy
 msgid "When de_leted:"
-msgstr "حُذف"
+msgstr "مونت-دي-مارسان"
 
 #: ../widgets/misc/e-send-options.glade.h:1
 #, fuzzy
 msgid "<b>Delivery Options</b>"
-msgstr "<b>خيارات قائمة المهام</b>"
+msgstr "<b>خيارات العرض:</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:2
 #, fuzzy
@@ -20057,21 +22159,21 @@ msgstr "<b>الحالة:</b>"
 #: ../widgets/misc/e-send-options.glade.h:3
 #, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "التّوثّق"
+msgstr "مساحة التبليغ"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 #, fuzzy
 msgid "<b>Status Tracking</b>"
-msgstr "جاري البحث"
+msgstr "ضبط الحالة"
 
 #: ../widgets/misc/e-send-options.glade.h:5
 #, fuzzy
 msgid "A_uto-delete sent item"
-msgstr "حذف هذا العنصر"
+msgstr "لم يمكن إرسال العنصر!\n"
 
 #: ../widgets/misc/e-send-options.glade.h:6
 #, fuzzy
-msgid "C_lassification"
+msgid "Classification"
 msgstr "التّصنيف"
 
 #: ../widgets/misc/e-send-options.glade.h:7
@@ -20086,32 +22188,36 @@ msgstr ""
 #: ../widgets/misc/e-send-options.glade.h:9
 #, fuzzy
 msgid "Gene_ral Options"
-msgstr "_خيارات"
+msgstr "<b>خيارات قائمة المهام</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:10
 #, fuzzy
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr "وصول قراءة"
+msgstr "_لا شيء (يستخدم تيمة النظام)"
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
 "Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:18
 #, fuzzy
 msgid "R_eply requested"
 msgstr "أسلوب ال_رد:"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
+#, fuzzy
 msgid "Sta_tus Tracking"
-msgstr ""
+msgstr "تشغيل أو ايقاف تتبع موقع الفأرة"
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
 "Undefined\n"
 "High\n"
@@ -20119,101 +22225,107 @@ msgid ""
 "Low"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
-msgid "W_ithin"
-msgstr "منتظر"
-
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.glade.h:25
 #, fuzzy
 msgid "When acce_pted:"
-msgstr "مقبول"
+msgstr "تنشيط عند السكون"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:26
 #, fuzzy
 msgid "When co_mpleted:"
-msgstr "_تاريخ الإنتهاء:"
+msgstr "أفضل ت_باين"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:27
 #, fuzzy
 msgid "When decli_ned:"
-msgstr "مرفوض"
+msgstr "تنشيط عند السكون"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:28
+#, fuzzy
+msgid "Wi_thin"
+msgstr "منتظر"
+
+#: ../widgets/misc/e-send-options.glade.h:29
 #, fuzzy
 msgid "_After:"
 msgstr "بعد"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:30
 #, fuzzy
 msgid "_All information"
-msgstr "معلومات المهمّة"
+msgstr "بيانات سيّئة"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:31
 #, fuzzy
 msgid "_Delay message delivery"
-msgstr "ترك الرّسائل على النّادل"
+msgstr "رسالة إجتماع رديئة"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:32
 #, fuzzy
 msgid "_Delivered"
 msgstr "_حذف"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:34
+#, fuzzy
 msgid "_Set expiration date"
-msgstr ""
+msgstr "حدد الصيغة للتاريخ العائد"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:35
 #, fuzzy
 msgid "_Until:"
 msgstr "حتّى"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:36
+#, fuzzy
 msgid "_When convenient"
-msgstr ""
+msgstr "تنشيط عند السكون"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:37
 #, fuzzy
 msgid "_When opened:"
-msgstr "_تاريخ الإنتهاء:"
+msgstr "فتح ملف الرسائل %s\n"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:209
 #, c-format
 msgid "%s (...)"
 msgstr "%s·(...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:215
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% تام)"
 
 #: ../widgets/misc/e-url-entry.c:107
 #, fuzzy
-msgid "click here to go to url"
-msgstr "<أُنقر هنا لإنتقاء مجلّد>"
+msgid "Click here to go to URL"
+msgstr "أُنقر هنا لإضافة حاضر"
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:2
 #, fuzzy
 msgid "Item(s) belong to these _categories:"
 msgstr "ينتمي هذا المراسَل إلى هذه الفئات:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:3
 #, fuzzy
 msgid "_Available Categories:"
-msgstr "الفئات"
+msgstr "أصناف المزامنة:"
 
-#: ../widgets/misc/gal-categories.glade.h:5
+#: ../widgets/misc/gal-categories.glade.h:4
 #, fuzzy
 msgid "categories"
 msgstr "الفئات"
 
 #: ../widgets/table/e-cell-combo.c:177
+#, fuzzy
 msgid "popup list"
-msgstr ""
+msgstr "قائمة الحسابات"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
@@ -20231,23 +22343,23 @@ msgstr "عمود مركّز عليه"
 msgid "Unselected Column"
 msgstr "عمود غير منتقى"
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Strikeout Column"
 msgstr "عمود شطب"
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Underline Column"
 msgstr "عمود تسطير"
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Bold Column"
 msgstr "عمود سُمك"
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Color Column"
 msgstr "عمود ألوان"
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1828
 msgid "BG Color Column"
 msgstr "عمود لون الخلفيّة"
 
@@ -20260,10 +22372,11 @@ msgstr "إ_زالة"
 #: ../widgets/table/e-table-config.glade.h:1
 #, fuzzy
 msgid "A_vailable Fields:"
-msgstr "حقول قابلة للكتابة"
+msgstr "_حقول الشهادة"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "Ascending"
 msgstr "تصاعدي"
 
@@ -20271,10 +22384,11 @@ msgstr "تصاعدي"
 #: ../widgets/table/e-table-config.glade.h:3
 #, fuzzy
 msgid "Clear All"
-msgstr "_مسح العلم"
+msgstr "نسخ ال_كل"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "Descending"
 msgstr "تنازلي"
 
@@ -20282,18 +22396,19 @@ msgstr "تنازلي"
 #: ../widgets/table/e-table-config.glade.h:7
 #, fuzzy
 msgid "Group Items By"
-msgstr "ال_جمع حسب..."
+msgstr "ترتيب حسب الصّندوق"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
+#, fuzzy
 msgid "Move _Down"
-msgstr ""
+msgstr "التحرك للأسفل"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
 #, fuzzy
 msgid "Move _Up"
-msgstr "نقل"
+msgstr "إلى الأ_على"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
@@ -20304,24 +22419,25 @@ msgstr ""
 #: ../widgets/table/e-table-config.glade.h:10
 #, fuzzy
 msgid "Show Fields"
-msgstr "حقل _مِن"
+msgstr "_حقول الشهادة"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:11
+#, fuzzy
 msgid "Show field in View"
-msgstr ""
+msgstr "عرض شارات في البريمج"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:12
 #, fuzzy
 msgid "Sort"
-msgstr "المرتّب"
+msgstr "ترتيب"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
 #, fuzzy
 msgid "Sort Items By"
-msgstr "ترتيب"
+msgstr "ترتيب قائمة الملفات بحسب الإسم"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
@@ -20335,14 +22451,15 @@ msgstr "إ_ضافة"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
+#, fuzzy
 msgid "_Fields Shown..."
-msgstr ""
+msgstr "_حقول الشهادة"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
 #, fuzzy
 msgid "_Sort..."
-msgstr "_إستيراد..."
+msgstr "ترتيب"
 
 #: ../widgets/table/e-table-config.c:150
 msgid "State"
@@ -20367,28 +22484,28 @@ msgstr "دون جمع"
 #: ../widgets/table/e-table-config.c:584
 #, fuzzy
 msgid "Available Fields"
-msgstr "حقول قابلة للكتابة"
+msgstr "_حقول الشهادة"
 
 #: ../widgets/table/e-table-config.glade.h:17
 #, fuzzy
 msgid "_Group By..."
-msgstr "ال_جمع حسب..."
+msgstr "ترتيب حسب الصّندوق"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
 msgstr ""
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1892
 msgid "DnD code"
 msgstr "رمز DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1906
 msgid "Full Header"
 msgstr "ترويسة كاملة"
 
@@ -20399,7 +22516,7 @@ msgstr "إضافة عمود..."
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 #, fuzzy
 msgid "Field Chooser"
-msgstr "إسم الحقل"
+msgstr "مختار الألوان"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:2
 msgid ""
@@ -20407,210 +22524,207 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:350
-#, c-format
+#: ../widgets/table/e-table-group-container.c:345
+#, fuzzy, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgid_plural "%s : %s (%d items)"
+msgstr[0] "عنصر"
+msgstr[1] ""
 
 #: ../widgets/table/e-table-group-container.c:351
-#, c-format
-msgid "%s : %s (%d items)"
-msgstr ""
-
-#: ../widgets/table/e-table-group-container.c:356
 #, fuzzy, c-format
 msgid "%s (%d item)"
-msgstr "%s (%d%% تام)"
-
-#: ../widgets/table/e-table-group-container.c:357
-#, fuzzy, c-format
-msgid "%s (%d items)"
-msgstr "%s (%s)"
+msgid_plural "%s (%d items)"
+msgstr[0] "عنصر"
+msgstr[1] "%s (%d%% تام)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "ألوان صفوف متناوبة"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "شبكة رسم أفقيّة"
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "شبكة رسم عموديّة"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "تركيز الرّسم"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "نمط المؤشّر"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "نموذج الانتقاء"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "عتبة الطّول"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "ارتفاع صفوف منتظم"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "مجمّد"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "Customize Current View"
 msgstr "تخصيص المعرض الحالي"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Sort Ascending"
 msgstr "ترتيب تصاعدي"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1492
 msgid "Sort Descending"
 msgstr "ترتيب تنازلي"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Unsort"
 msgstr "بعثرة"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1495
 msgid "Group By This Field"
 msgstr "ترتيب حسب هذا الحقل"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Group By Box"
 msgstr "ترتيب حسب الصّندوق"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Remove This Column"
 msgstr "إزالة هذا العمود"
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1499
 msgid "Add a Column..."
 msgstr "إضافة عمود..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1501
 msgid "Alignment"
 msgstr "محاذاة"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Best Fit"
 msgstr "أفضل ملائمة"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1503
 msgid "Format Columns..."
 msgstr "تنسيق الأعمدة..."
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1505
 msgid "Customize Current View..."
 msgstr "تخصيص المعرض الحالي..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1554
+#, fuzzy
+msgid "Sort By"
+msgstr "المطورون"
+
+#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "مجموعة الخط"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1920
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "معلومات التّرتيب"
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "شجرة"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 #, fuzzy
 msgid "Table header"
-msgstr "محوّل جدول الشّجرة الالكترونيّة"
+msgstr "ترويسة الجدول"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 #, fuzzy
 msgid "Table model"
-msgstr "نموذج النّص"
+msgstr "<b>نسق اللغة:</b>"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #, fuzzy
 msgid "Cursor row"
 msgstr "صف المؤشّر"
 
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Always search"
 msgstr "البحث دائماً"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "استخدم النّقر للإضافة"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "محوّل جدول الشّجرة الالكترونيّة"
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "البحث دائماً"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "مظهر ريترو"
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "رسم الخطوط و موسّعات +/-."
 
 #: ../widgets/text/e-entry-test.c:49
+#, fuzzy
 msgid "Minicard Test"
-msgstr ""
+msgstr "تم الاختبار %d"
 
 #: ../widgets/text/e-entry-test.c:50
 #, fuzzy
@@ -20623,14 +22737,14 @@ msgid "This should test the minicard canvas item"
 msgstr "سيختبر هذا رمز طباعة المراسَل"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Event Processor"
 msgstr "معالج الأحداث"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 #, fuzzy
 msgid "Font"
-msgstr "خطوط"
+msgstr "خط"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
 #, fuzzy
@@ -20638,116 +22752,117 @@ msgid "GDKFont"
 msgstr "خطوط"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
 msgid "Justification"
 msgstr "التّرصيف"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
 msgid "Use ellipsis"
 msgstr "استخدام الثّلاث نقاط"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
 msgid "Ellipsis"
 msgstr "ثلاث نقاط"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Line wrap"
 msgstr "لف السّطور"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
 msgid "Break characters"
 msgstr "رموز التّوقّف"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Max lines"
 msgstr "أقصى عدد من السّطور"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
 msgid "Allow newlines"
 msgstr "السّماح برمز السّطر الجديد"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
 msgid "Draw borders"
 msgstr "رسم الحدود"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "Draw background"
 msgstr "رسم الخلفيّة"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Draw button"
 msgstr "رسم الزّر"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
 msgid "Cursor position"
 msgstr "موقع المؤشّر"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+#, fuzzy
 msgid "Emulate label resize"
-msgstr ""
+msgstr "له مقبض تحجيم"
 
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2739
 msgid "Input Methods"
 msgstr "طرق الإدخال"
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
 msgid "Bold"
 msgstr "سميك"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
 msgid "Strikeout"
 msgstr "شطب"
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
 msgid "Anchor"
 msgstr "مرساة"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
 msgid "Clip Width"
 msgstr "عرض القصاصة"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 msgid "Clip Height"
 msgstr "ارتفاع القصاصة"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
 msgid "Clip"
 msgstr "قصاصة"
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
 msgid "Fill clip rectangle"
 msgstr "ملء مستطيل القصاصة"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
 msgid "X Offset"
 msgstr "الانزياح السّيني"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
 msgid "Y Offset"
 msgstr "الانزياح الصّادي"
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
 msgid "Text width"
 msgstr "عرض النّص"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
 msgid "Text height"
 msgstr "ارتفاع النّص"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
 msgid "IM Context"
 msgstr "سياق مراسِل فوري"
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr "معالجة القافزة"
diff --git a/po/bg.po b/po/bg.po
index 470f40a9bb..dd77229771 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-04 00:33+0200\n"
-"PO-Revision-Date: 2006-11-04 00:02+0200\n"
+"POT-Creation-Date: 2006-11-04 00:39+0200\n"
+"PO-Revision-Date: 2006-09-16 12:27+0300\n"
 "Last-Translator: Alexander Shopov <ash@contact.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -536,26 +536,14 @@ msgstr "Доб_авяне"
 msgid "_Discard"
 msgstr "_Отхвърляне"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "_Do not save"
-msgstr "_Да не се запазва"
-
-#: ../addressbook/addressbook.error.xml.h:38
-msgid "_Resize"
-msgstr "_Оразмеряване"
-
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "_Use as it is"
-msgstr "_Ползване както е"
-
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -1301,7 +1289,7 @@ msgstr "Контакт"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:552
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "Редактор на контакти"
 
@@ -2558,20 +2546,20 @@ msgid "Changed"
 msgstr "Променени"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Редактор на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
 msgstr "_Няма изображение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,23 +2567,23 @@ msgstr ""
 "Информацията на контакта е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3136
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3151
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
@@ -3338,8 +3326,8 @@ msgstr "Отваряне на връзката в _браузър"
 msgid "_Copy Link Location"
 msgstr "Копиране на мес_тоположението на връзката"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
-msgid "_Send New Message To..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
 msgstr "_Изпращане на ново писмо до..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:177
@@ -3764,12 +3752,8 @@ msgid "GTK Tree View"
 msgstr "Дървовиден изглед на GTK"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
 #: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Внасяне..."
 
@@ -3797,6 +3781,13 @@ msgstr "Приставка за внасяне от файлове (.cvs, .tab)
 msgid "Evolution CSV and Tab Importer"
 msgstr "Приставка за внасяне от файлове (.cvs, .tab) на Evolution"
 
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "Внасяне..."
+
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Формат за обмяна на данни LDAP (.ldif)"
@@ -4490,7 +4481,7 @@ msgid "_Save Changes"
 msgstr "_Запазване на промените"
 
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:133
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "Изпра_щане"
 
@@ -6245,7 +6236,7 @@ msgstr[1] "%d часа преди среща"
 
 #: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d минута преди среща"
 msgstr[1] "%d минути преди среща"
@@ -6306,7 +6297,6 @@ msgid "Event Description"
 msgstr "Описание на събитие"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "О_бобщение:"
@@ -6424,20 +6414,24 @@ msgstr "До"
 msgid "Sta_rt date:"
 msgstr "На_чална дата:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "О_бобщение"
+
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_До:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Описание:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Група:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "Съдържание на _бележката:"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>Настройки на календара</b>"
@@ -7616,7 +7610,7 @@ msgstr "Предложение за събрание"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1353
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> иска да бъде добавен към съществуващо събрание."
 
 #: ../calendar/gui/e-itip-control.c:1354
@@ -7686,7 +7680,7 @@ msgstr "Предложение за задача"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1430
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> иска да бъде добавен към съществуваща задача."
 
 #: ../calendar/gui/e-itip-control.c:1431
@@ -10516,7 +10510,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Заради „{0}“, може да се наложи да изберете други настройки на пощата."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Защото „{1}“."
 
@@ -10809,7 +10803,7 @@ msgstr "Искате ли да се презапише?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Файлът съществува „{0}“."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "Пре_записване"
 
@@ -10977,7 +10971,7 @@ msgstr "Липсваща дата."
 msgid "Missing file name."
 msgstr "Липсващо име на файл."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Липсващо име."
 
@@ -11751,7 +11745,7 @@ msgstr "_Нова папка..."
 msgid "_Rename..."
 msgstr "П_реименуване..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "Изчистване на _кошчето"
 
@@ -12330,6 +12324,10 @@ msgstr "_Отговор на подателя"
 msgid "Reply to _List"
 msgstr "Отговор до _списъка"
 
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "_Изпращане на ново писмо до..."
+
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
 msgstr "Доб_авяне към адресника"
@@ -13946,8 +13944,8 @@ msgid "Pinging %s"
 msgstr "Проверяване на %s"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Филтриране на избраните писма"
+msgid "Filtering Folder"
+msgstr "Филтър върху папка"
 
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
@@ -14225,15 +14223,10 @@ msgstr "Нова папка за търсене"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "Вече съществува папка с име „{1}“. Изберете друго име."
-
-#: ../mail/mail.error.xml.h:2
-msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Вече съществува папка с име „{1}“. Изберете друго име."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14245,7 +14238,7 @@ msgstr ""
 "Може да изберете да игнорирате тази папка, да я презапишете, да добавите "
 "съдържанието или да излезете."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14253,13 +14246,13 @@ msgstr ""
 "Било изискано уведомяване за прочитане за „{1}“. Да се изпрати ли "
 "уведомление до {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "Подпис с име „{0}“ вече съществува. Изберете друго име."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14267,28 +14260,28 @@ msgstr ""
 "Добавянето на смислена тема на вашите писма ще даде на получателите някаква "
 "идея какво точно ще прочетат в писмо."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr ""
 "Сигурни ли сте, че искате да изтриете този абонамент и всичките му сървъри-"
 "посредници?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурни ли сте, че искате да изтриете този абонамент?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Сигурни ли сте, че искате да изключите този абонамент и всичките му сървъри-"
 "посредници?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Сигурни ли сте, че искате да отворите едновременно {0} писма?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14296,7 +14289,7 @@ msgstr ""
 "Сигурни ли сте, че искате да премахнете за постоянно всички изтрити писма от "
 "всички папки?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14304,82 +14297,82 @@ msgstr ""
 "Сигурни ли сте, че искате да премахнете за постоянно всички изтрити писма в "
 "папката „{0}“?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Сигурни ли сте, че искате да изпратите писмо в HTML формат?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Сигурни ли сте, че искате да изпратите писмото само с получатели в полето "
 "„Скрито копие“?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурни ли сте, че искате да изпратите писмото без тема?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Защото „{0}“."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Защото „{2}“."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Празен подпис"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Неуспех при добавянето на папката за търсене „{0}“."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при копирането на папка „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Неуспех при създаването на папка „{0}“."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Не може да се създаде временна директория за запазвания."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Не може да се създаде директория за запазването, защото „{1}“"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Неуспех при изтриването на папката „{0}“."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Системната папка „{0}“ не може да бъде изтрита."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Не може да се редактира папката за търсене „{0}“, защото тя не съществува."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при преместването на папка „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Неуспех при отварянето на източника „{1}“."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Неуспех при отварянето на източника „{2}“."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Неуспех при отварянето на целта „{2}“."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14389,31 +14382,31 @@ msgstr ""
 "Няма да можете да използвате този доставчик, преди да приемете неговия "
 "лиценз."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Неуспех при преименуването на „{0}“ в „{1}“."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Системната папка „{0}“ не може да бъде преименувана или преместена."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Неуспех при запазването на промените в абонамента."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Неуспех при запазването в папка „{0}“."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Неуспех при запазването във файл „{0}“."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Не може да се зададе скрипт за подписване „{0}“."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14422,72 +14415,72 @@ msgstr ""
 "големите и малките букви имат значение. Може би клавишът „Caps Lock“ е "
 "натиснат."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Неуспех при запазването на файла с подписа."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Изтриване на „{0}“?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Изтриване на абонамента?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Игнориране на промените?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Да не се изтрива"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Да не се изключва"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Искате ли операцията да се извърши и в подпапките?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Искате ли да отбележите всички писма като прочетени?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Искате ли да запазите направените промени?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Въвеждане на парола."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Грешка при зареждането на дефинициите за филтрите."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Грешка при изпълнение на операцията."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Грешка по време на {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Файлът съществува, но не може да бъде презаписан."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Файлът съществува, но не е обикновен файл."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 "Ако продължите, няма да имате втора възможност да възстановите тези писма."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14495,13 +14488,13 @@ msgstr ""
 "Ако изтриете папката, цялото й съдържание, както и съдържанието на всички "
 "нейни подпапки, ще бъде изтрито за постоянно."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Ако продължите, всички абонаменти към сървъри-посредници ще бъдат изтрити за "
 "постоянно."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14509,12 +14502,12 @@ msgstr ""
 "Ако продължите, информацията за абонамента\n"
 "и цялата информация за сървъри-посредници ще бъде изтрита за постоянно."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Ако продължите, информацията за абонамента ще бъде изтрита за постоянно."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14522,19 +14515,19 @@ msgstr ""
 "Ако спрете програмата, вашите писма няма да бъдат изпратени, докато не "
 "стартирате отново Evolution."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Игнориране"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Невалидно удостоверяване"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Филтрите на пощата автоматично се обновяват."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14546,39 +14539,39 @@ msgstr ""
 "всички получатели ще се покажат така или иначе. За да избегнете това, "
 "добавете поне един получател в полето „До“ или „Копие“."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Отбелязване на всички писма като прочетени"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "Отбелязване на всички писма в подпапката като прочетени?"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "От_белязване като прочетено"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Липсваща папка."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Няма избрани източници."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварянето на много писма едновременно може да отнеме много време."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Проверете настройките на вашия абонамент и опитайте отново."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Включете абонамента или изпратете през друг абонамент."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 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."
@@ -14587,7 +14580,7 @@ msgstr ""
 "чрез натискане на бутона „До:“, който се намира до полето за въвеждане на "
 "адреси."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14599,47 +14592,47 @@ msgstr ""
 "{0}\n"
 "Изпращане въпреки това?"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Въведете уникално име за идентификацията на този подпис."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Изчакайте."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Проблем по време на мигрирането на папка със стара поща „{0}“."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Обръщане към сървър"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Сървърът се проверява за поддържаните методи на удостоверяване."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Изискано е известие за прочитане."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Наистина ли искате да изтриете папката „{0}“ и всички нейни подпапки?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Папките за търсене са автоматично обновени."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Изпращане на известие за прочитане"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Подписът вече съществува"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14647,7 +14640,7 @@ msgstr ""
 "За да работи правилно Evolution, програмата се нуждае от системни папки, "
 "които не можете да преименувате, премествате или изтривате."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14663,7 +14656,7 @@ msgstr ""
 "всички получатели ще се покажат така или иначе. За да избегнете това, "
 "добавете поне един получател в полето „До“ или „Копие“. "
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14677,7 +14670,7 @@ msgstr ""
 "    „{1}“\n"
 "и бяха обновени."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14691,11 +14684,11 @@ msgstr ""
 "    „{1}“\n"
 "и бяха обновени."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr "Този скриптов файл трябва да съществува и да бъде изпълним."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14704,7 +14697,7 @@ msgstr ""
 "Отидете в редактора за папки за търсене и я добавете изрично, ако това се "
 "налага."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14712,13 +14705,13 @@ msgstr ""
 "Това писмо не може да бъде изпратено, защото абонаментът, през който искате "
 "да го пратите, е изключен"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Това писмо не може да бъде изпратено, защото не сте посочили получател(и)"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14726,11 +14719,11 @@ msgstr ""
 "Сървърът не поддържа този тип удостоверяване и като цяло може да не поддържа "
 "изобщо какъвто и да е тип."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr "Този подпис беше променен, но промените не бяха запазени."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14738,11 +14731,11 @@ msgstr ""
 "Това ще отбележи всички писма като прочетени, в избраната папка и нейните "
 "подпапки."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "Неуспех при свързването със сървър GroupWise."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14750,39 +14743,39 @@ msgstr ""
 "Неуспех при отварянето на папката за чернови към този абонамент. Да се "
 "използва ли стандартната папка за чернови?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "Неуспех при прочитането на файла с лицензното споразумение."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Използване на _стандартни"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "Да бъде ли използвана стандартната папка за чернови?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "Не сте подали цялата необходима информация."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате неизпратени писма, искате ли да спрете програмата въпреки това?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "Не може да имате два абонамента с едно и също име."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Трябва да дадете име на тази папка за търсене"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Трябва да определите папка."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14792,27 +14785,27 @@ msgstr ""
 "избирайки папки поотделно, и/или всички локални папки, всички отдалечени "
 "папки, или и двете."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Влизането в сървъра „{0}“ като „{0}“ е неуспешно."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr "_Прикрепяне"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr "_Игнориране на промените"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "_Do not Mark as Read"
 msgstr "Без отбелязване като _прочетено"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "_Изчистване"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "Отваряне на _писма"
 
@@ -15237,8 +15230,8 @@ msgstr "Стандартни източници"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr ""
 "Предоставя функционалност за отбелязване на календар или адресник като "
 "стандартен."
@@ -15567,6 +15560,10 @@ msgstr "Паролата Ви ще изтече след 7 дни..."
 msgid "_Change Password"
 msgstr "_Смяна на паролата"
 
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "бутон_ОК"
+
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Достъпът е отказан)"
@@ -16112,7 +16109,7 @@ msgid "_Not Shared"
 msgstr "_Не са споделени"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With..."
+msgid "_Shared With ..."
 msgstr "_Споделено с ..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
@@ -16991,10 +16988,10 @@ msgstr "Пощенски _списък"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr ""
-"Осигурява действия за командите за пощенски списъци (абониране, "
-"отписване, ...)."
+"Осигурява общи действия при пощенски списъци (абониране, отписване, ...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -17399,7 +17396,7 @@ msgid "Save attachments"
 msgstr "Запазване на прикрепените файлове"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
+msgid "Save Attachments ..."
 msgstr "Запазване на прикрепените файлове..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
diff --git a/po/ca.po b/po/ca.po
index 5935a4b8f8..3eae5e8b1c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-19 01:15+0200\n"
-"PO-Revision-Date: 2006-10-19 01:27+0200\n"
+"POT-Creation-Date: 2006-10-19 01:28+0200\n"
+"PO-Revision-Date: 2006-10-19 01:29+0200\n"
 "Last-Translator: Xavier Conde Rueda <xavi.conde@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -611,28 +611,14 @@ msgstr "_Afegeix"
 msgid "_Discard"
 msgstr "_Descarta"
 
-# fitxer: calendar.ca.po.5
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "_Do not save"
-msgstr "No ho _desis"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: ../addressbook/addressbook.error.xml.h:38
-msgid "_Resize"
-msgstr "_Canvia de mida"
-
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "_Use as it is"
-msgstr "_Utilitza tal i com és"
-
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -1525,7 +1511,7 @@ msgstr "Contacte"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:552
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -3081,22 +3067,22 @@ msgstr "Modificat"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu una imatge per a aquest contacte"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
 msgstr "Cap _imatge"
 
 # fitxer: calendar.ca.po.4
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -3104,24 +3090,24 @@ msgstr ""
 "La data de contacte no és vàlida:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' té un format invàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' té un format invàlid"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3136
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' està buit"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3151
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "Contacte invàlid."
 
@@ -4025,8 +4011,8 @@ msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
 # fitxer: mail.ca.po.3
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
-msgid "_Send New Message To..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
 msgstr "Envia un mi_ssatge nou a..."
 
 # fitxer: mail.ca.po.2
@@ -4532,12 +4518,8 @@ msgstr "Visualització d'arbre del GTK"
 
 # fitxer: mail.ca.po.2
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
 #: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "S'està important..."
 
@@ -4567,6 +4549,14 @@ msgstr "Evolution CSV o Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador CSV i Tab de l'Evolution"
 
+# fitxer: mail.ca.po.2
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "S'està important..."
+
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format d'intercanvi de dades LDAP (.ldif)"
@@ -5389,7 +5379,7 @@ msgstr "De_sa els canvis"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:133
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_Envia"
 
@@ -7487,7 +7477,7 @@ msgstr[1] "%d hores abans de la cita"
 # fitxer: calendar.ca.po.5
 #: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut abans de la cita"
 msgstr[1] "%d minuts abans de la cita"
@@ -7564,7 +7554,6 @@ msgstr "Descripció de l'esdeveniment"
 
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_m:"
@@ -7706,23 +7695,27 @@ msgstr "Per a"
 msgid "Sta_rt date:"
 msgstr "Data d'ini_ci:"
 
+# fitxer: calendar.ca.po.4
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "Resu_m"
+
 # fitxer: addressbook.printing.ca.po
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_A:"
 
-# fitxer: calendar.ca.po.4
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descripció:"
-
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grup:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "_Contingut de les anotacions:"
+
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
@@ -9113,7 +9106,7 @@ msgstr "Proposició de reunió"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1353
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
 # fitxer: calendar.ca.po.3
@@ -9199,7 +9192,7 @@ msgstr "Proposició de la tasca"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1430
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
 
 # fitxer: calendar.ca.po.3
@@ -12688,7 +12681,7 @@ msgstr ""
 "Degut a &quot;{0}&quot;, hauríeu de seleccionar diferents opcions de correu."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Degut a &quot;{1}&quot;."
 
@@ -13037,7 +13030,7 @@ msgid "File exists &quot;{0}&quot;."
 msgstr "El fitxer &quot;{0}&quot; ja existeix."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "S_obreescriu"
 
@@ -13237,7 +13230,7 @@ msgid "Missing file name."
 msgstr "Manca el nom de fitxer."
 
 # fitxer: calendar.ca.po.4
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Manca el nom."
 
@@ -14160,7 +14153,7 @@ msgid "_Rename..."
 msgstr "_Reanomena..."
 
 # fitxer: ui.evolution-mail-global.xml.h.ca.po
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "Buida la _paperera"
 
@@ -14828,6 +14821,11 @@ msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
 # fitxer: mail.ca.po.3
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "Envia un mi_ssatge nou a..."
+
+# fitxer: mail.ca.po.3
 #
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
@@ -16662,10 +16660,10 @@ msgstr "Habili_teu-lo per a acceptar l'acord de llicència"
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
 
-# fitxer: ui.evolution-mail-list.xml.h.ca.po
+# fitxer: mail.ca.po.1
 #: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "S'estan filtrant els missatges seleccionats"
+msgid "Filtering Folder"
+msgstr "S'està filtrant la carpeta"
 
 # fitxer: mail.ca.po.1
 #: ../mail/mail-ops.c:266
@@ -16998,20 +16996,12 @@ msgstr "Nova carpeta de cerca"
 # fitxer: mail.ca.po.3
 #: ../mail/mail.error.xml.h:1
 msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
-"diferent."
-
-# fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:2
-msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
 "diferent."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -17023,7 +17013,7 @@ msgstr ""
 "Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir el seu "
 "contingut, o sortir."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -17032,7 +17022,7 @@ msgstr ""
 "Voleu enviar la notificació de recepció a {0}?"
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
@@ -17040,7 +17030,7 @@ msgstr ""
 "Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
 "diferent."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -17049,28 +17039,28 @@ msgstr ""
 "tema del vostre correu."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Esteu segur de voler suprimir aquest compte i tots els seus apoderats?"
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Esteu segur de voler suprimir aquest compte?"
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Esteu segur de voler suprimir aquest compte i tots els seus apoderats?"
 
 # fitxer: mail.ca.po.2
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Esteu segur que voleu obrir {0} missatges a la vegada?"
 
 # fitxer: ui.evolution-mail-global.xml.h.ca.po
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -17079,7 +17069,7 @@ msgstr ""
 "carpetes?"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -17088,92 +17078,92 @@ msgstr ""
 "{0}&quot;?"
 
 # fitxer: calendar.ca.po.5
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Esteu segur de voler enviar un missatge HTML?"
 
 # fitxer: mail.ca.po.2
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Esteu segur que voleu enviar un missatge només amb destinataris BCC?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Esteu segur que voleu enviar un missatge sense assumpte?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Degut a &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Degut a &quot;{2}&quot;."
 
 # fitxer: mail.ca.po.1
 #
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Signatura buida"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "No es pot afegir la carpeta de cerca &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es pot copiar la carpeta &quot;{0}&quot; a &quot;{1}'."
 
 # fitxer: camel.ca.po.2
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "No s'ha pogut crear la carpeta &quot;{0}&quot;."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "No s'ha pogut crear el directori temporal per desar."
 
 # fitxer: camel.ca.po.2
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "No s'ha pogut crear el directori per desar degut a &quot;{1}&quot;"
 
 # fitxer: camel.ca.po.3
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "No s'ha pogut suprimir la carpeta &quot;{0}&quot;."
 
 # fitxer: camel.ca.po.3
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "No es pot suprimir la carpeta de sistema &quot;{0}&quot;."
 
 # fitxer: camel.ca.po.2
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "No es pot editar la carpeta de cerca &quot;{0}&quot; perquè no existeix."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es pot moure la carpeta &quot;{0}&quot; a &quot;{1}&quot;."
 
 # fitxer: calendar.ca.po.3
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "No s'ha pogut obrir la font &quot;{1}&quot;"
 
 # fitxer: calendar.ca.po.3
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "No s'ha pogut obrir l'origen &quot;{2}&quot;."
 
 # fitxer: camel.ca.po.4
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "No es pot obrir el destí &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -17183,36 +17173,36 @@ msgstr ""
 "d'instal·lació. No podreu usar aquest proveïdor fins que no n'accepteu la "
 "llicència."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es pot reanomenar &quot;{0}&quot; com &quot;{1}&quot;."
 
 # fitxer: camel.ca.po.3
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "No s'ha pogut reanomenar o moure la carpeta de sistema &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "No es poden desar els canvis al compte."
 
 # fitxer: camel.ca.po.2
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "No s'ha pogut desar al directori &quot;{0}&quot;."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "No es pot desar al fitxer {0}."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "No s'ha pogut definir el fitxer de seqüència &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -17222,86 +17212,86 @@ msgstr ""
 "que la tecla de bloqueig de majúscules no estigui activada."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "No s'ha pogut desar el fitxer de signatura."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Voleu suprimir &quot;{0}&quot;?"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Voleu suprimir el compte?"
 
 # fitxer: mail.ca.po.1
 #
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Voleu descartar els canvis?"
 
 # fitxer: mail.ca.po.3
 #
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "No ho suprimeixis"
 
 # fitxer: calendar.ca.po.5
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "No ho inhabilitis"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Voleu que s'apliqui l'operació a les subcarpetes?"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Voleu marcar tots els missatges com a llegits?"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Voleu desar els canvis?"
 
 # fitxer: calendar.ca.po.5
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Introduïu la contrasenya."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "S'ha produït un error en carregar les definicions del filtre."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "S'ha produït un error en realitzar l'operació."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "S'ha produït un error en {0}."
 
 # fitxer: composer.ca.po
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "El fitxer existeix però no es pot sobreescriure."
 
 # fitxer: filter.ca.po
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "El fitxer existeix però no és un fitxer normal."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continueu, no podreu recuperar aquest missatge."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -17309,11 +17299,11 @@ msgstr ""
 "Si suprimiu la carpeta, tots els continguts i els de les subcarpetes "
 "s'esborraran permanentment."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continueu, els comptes apoderats se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -17321,11 +17311,11 @@ msgstr ""
 "Si continueu, la informació dels comptes i\n"
 "i la informació de l'apoderat se suprimiran permanentment."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continueu, la informació dels comptes se suprimirà permanentment."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17333,20 +17323,20 @@ msgstr ""
 "Si sortiu, aquests missatges no s'enviaran fins que s'iniciï l'Evolution de "
 "nou."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignora"
 
 # fitxer: camel.ca.po.1
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Autenticació invàlida"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "S'han actualitzat automàticament els filtres de correu."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -17360,43 +17350,43 @@ msgstr ""
 "'CC:'."
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Marca com a llegits tots els missatges"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "Voleu marcar tots els missatges a les subcarpetes com a llegits?"
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "Ma_rca com a llegit"
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Manca la carpeta."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "No s'ha seleccionat cap font."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Es pot trigar molt de temps en obrir molts missatges a la vegada."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Comproveu la vostra configuració de comptes i proveu-ho de nou."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Habiliteu el vostre compte o envieu amb un altre compte."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 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."
@@ -17406,7 +17396,7 @@ msgstr ""
 "de text."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -17419,56 +17409,56 @@ msgstr ""
 "Voleu enviar-lo?"
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduïu un nom únic per a aquesta signatura."
 
 # fitxer: mail.ca.po.2
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Espereu."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 "Hi ha hagut un problema en migrar la carpeta de correu antiga &quot;{0}"
 "&quot;."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "S'està consultant el servidor"
 
 # fitxer: camel.ca.po.1
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "S'està consultant al servidor els mecanismes d'autenticació suportats."
 
 # fitxer: designs.ca.po
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "S'ha demanat un avís de lectura."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Voleu suprimir la carpeta &quot;{0}&quot; i totes les seves subcarpetes?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "S'han actualitzat les carpetes de cerca automàticament."
 
 # fitxer: designs.ca.po
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Avís d'enviament"
 
 # fitxer: smime.ca.po
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "La signatura ja existeix"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -17476,7 +17466,7 @@ msgstr ""
 "L'Evolution necessita les carpetes del sistema per funcionar correctament i "
 "no es poden reanomenar, moure ni suprimir."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -17494,7 +17484,7 @@ msgstr ""
 "'CC:'."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -17509,7 +17499,7 @@ msgstr ""
 "i s'han actualitzat."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -17523,11 +17513,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "i s'han actualitzat."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr "El fitxer de seqüència ha de ser executable."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -17536,7 +17526,7 @@ msgstr ""
 "aneu a l'editor de carpetes de cerca per a afegir-la explícitament, en cas "
 "que sigui necessari."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -17545,14 +17535,14 @@ msgstr ""
 "està disponible"
 
 #
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Aquest missatge no es pot enviar perquè no se n'ha indicat cap destinatari"
 
 # fitxer: camel.ca.po.1
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -17561,12 +17551,12 @@ msgstr ""
 "no permeti cap autenticació."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr "Aquesta signatura s'ha modificat, però no s'ha desat."
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -17574,12 +17564,12 @@ msgstr ""
 "Això marcarà tots els missatges com a llegits en el directori seleccionat i "
 "els seus subdirectoris."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es pot connectar al servidor GroupWise."
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -17588,43 +17578,43 @@ msgstr ""
 "servir la carpeta d'esborranys del sistema?"
 
 # fitxer: camel.ca.po.2
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "No es pot llegir el fitxer de la llicència."
 
 # fitxer: camel.ca.po.3
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Pre_determinat"
 
 # fitxer: shell.ca.po
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "Voleu usar la carpeta d'esborranys predeterminada?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "No heu emplenat tota la informació necessària."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Teniu missatges sense enviar. Voleu sortir igualment?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "No hauríeu de crear dos comptes amb el mateix nom."
 
 # fitxer: filter.ca.po
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Heu d'assignar un nom a aquesta carpeta de cerca."
 
 # fitxer: filter.ca.po
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Heu d'especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -17634,32 +17624,32 @@ msgstr ""
 "Podeu seleccionar les carpetes individualment, i/o seleccionant totes les "
 "carpetes locals, totes les remotes, o ambdues."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Ha fallat l'entrada al servidor &quot;{0}&quot; com a &quot;{0}&quot;."
 
 # fitxer: calendar.ca.po.5
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr "_Afegeix"
 
 # fitxer: mail.ca.po.1
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr "_Descarta els canvis"
 
 # fitxer: mail.ca.po.3
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "_Do not Mark as Read"
 msgstr "No _marquis com a llegit"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "Bui_da"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "_Obre un missatge"
 
@@ -19183,7 +19173,7 @@ msgid "_Not Shared"
 msgstr "No e_s comparteix"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With..."
+msgid "_Shared With ..."
 msgstr "E_s comparteix amb..."
 
 # fitxer: addressbook.printing.ca.po
@@ -20239,7 +20229,8 @@ msgstr "_Llista de correu"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr ""
 "Proporciona accions per a ordres habituals de les llistes de correu "
 "(subscriu, suprimeix la subscripió, ...)."
@@ -20702,7 +20693,7 @@ msgstr "Desa els fitxers adjunts"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
+msgid "Save Attachments ..."
 msgstr "Desa els fitxers adjunts..."
 
 # fitxer: mail.ca.po.1
@@ -25929,24 +25920,40 @@ msgstr "Context de MI"
 msgid "Handle Popup"
 msgstr "Menú emergent de l'ansa"
 
-# fitxer: mail.ca.po.3
-#~ msgid "_Send New Message To ..."
-#~ msgstr "Envia un mi_ssatge nou a..."
+# fitxer: calendar.ca.po.5
+#~ msgid "_Do not save"
+#~ msgstr "No ho _desis"
 
-# fitxer: mail.ca.po.2
-#~ msgid "Importing ..."
-#~ msgstr "S'està important..."
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Resize"
+#~ msgstr "_Canvia de mida"
+
+#~ msgid "_Use as it is"
+#~ msgstr "_Utilitza tal i com és"
 
 # fitxer: calendar.ca.po.4
-#~ msgid "Su_mmary"
-#~ msgstr "Resu_m"
+#~ msgid "_Description:"
+#~ msgstr "_Descripció:"
 
-#~ msgid "_Memo Content:"
-#~ msgstr "_Contingut de les anotacions:"
+# fitxer: calendar.ca.po.3
+#~ msgid "<b>%s</b> wishes to be added to an existing meeting."
+#~ msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
-# fitxer: mail.ca.po.1
-#~ msgid "Filtering Folder"
-#~ msgstr "S'està filtrant la carpeta"
+# fitxer: calendar.ca.po.3
+#~ msgid "<b>%s</b> wishes to be added to an existing task."
+#~ msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
+
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#~ msgid "Filtering Selected Messages"
+#~ msgstr "S'estan filtrant els missatges seleccionats"
+
+# fitxer: mail.ca.po.3
+#~ msgid ""
+#~ "A folder named &quot;{0}&quot; already exists. Please use a different "
+#~ "name."
+#~ msgstr ""
+#~ "Ja existeix una carpeta anomenada &quot;{1}&quot;. Feu servir un nom "
+#~ "diferent."
 
 # fitxer: shell.ca.po
 #~ msgid " New "
diff --git a/po/dz.po b/po/dz.po
index 0ef636e515..010fa21eb5 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.dz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-29 06:47+0200\n"
-"PO-Revision-Date: 2006-09-29 12:35+0530\n"
+"POT-Creation-Date: 2006-11-08 06:47+0100\n"
+"PO-Revision-Date: 2006-11-08 15:00+0530\n"
 "Last-Translator: Mindu Dorji\n"
 "Language-Team: DZONGKHA <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
@@ -25,12 +25,12 @@ msgid "evolution addressbook"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ།"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact"
 msgstr "འབྲེལ་ས་གསརཔ།"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:232
 msgid "New Contact List"
 msgstr "འབྲེལ་ས་གསར་པའི་ཐོ་ཡིག"
 
@@ -167,7 +167,7 @@ msgstr "%A %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -201,7 +201,7 @@ msgstr "%d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -391,7 +391,7 @@ msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ བ�
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
 msgid "Failed to delete contact"
 msgstr "འབྲེལ་ས་བཏོན་གཏང་མ་ཚུགས།"
 
@@ -491,12 +491,14 @@ msgstr "ཁ་སྐོང་རྐྱབས། (_A)"
 msgid "_Discard"
 msgstr "བཏོན་བཀོག (_D)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "(༡)"
 
@@ -534,7 +536,7 @@ msgstr "ནཱ་ལུ་ རང་བཞིན་མཇུག་སྡུད�
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
 #: ../calendar/gui/calendar-component.c:272
-#: ../calendar/gui/migration.c:403
+#: ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "འབྲེལ་ས་ཚུ།"
@@ -573,13 +575,13 @@ msgstr "ཁྱོད་རའི་ ཨེསི་/མ་ཡིམ་ ལག་
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
 #: ../calendar/gui/memos-component.c:195
-#: ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573
-#: ../calendar/gui/migration.c:1081
+#: ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572
+#: ../calendar/gui/migration.c:1080
 #: ../calendar/gui/tasks-component.c:190
 #: ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201
@@ -593,15 +595,15 @@ msgstr "གློག་རིག་འདི་གུ།"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-component.c:147
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 #: ../calendar/gui/calendar-component.c:241
 #: ../calendar/gui/memos-component.c:203
-#: ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581
-#: ../calendar/gui/migration.c:1089
+#: ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580
+#: ../calendar/gui/migration.c:1088
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055
@@ -610,41 +612,41 @@ msgid "Personal"
 msgstr "རང་དོན།"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "ཨེལ་ཌི་ཨེ་པི་ སར་བར་གུ།"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "_Contact"
 msgstr "འབྲེལ་ས། (C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact"
 msgstr "འབྲེལ་ས་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "Contact _List"
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག (_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Create a new contact list"
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:240
 #: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ།"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:241
 msgid "Address _Book"
 msgstr "ཁ་བྱང་ཀི་དེབ། (_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:242
 msgid "Create a new address book"
 msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../addressbook/gui/component/addressbook-component.c:407
+#: ../addressbook/gui/component/addressbook-component.c:405
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་གཞི་སྒྲིག་གམ་ སྣོད་འཛིན་ཚུ་ ཡར་སྐྱེད་འབད་མ་ཚུགས།"
 
@@ -676,7 +678,7 @@ msgid "General"
 msgstr "ཡོངས་ཁྱབ།"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:568
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ།"
@@ -697,7 +699,7 @@ msgid "Details"
 msgstr "རྒྱས་བཤད།"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../mail/em-folder-browser.c:854
 msgid "Searching"
 msgstr "འཚོལ་ཞིབ་འབད་དོ།"
 
@@ -797,7 +799,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ།(_N)"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:986
 #: ../calendar/gui/calendar-component.c:584
 #: ../calendar/gui/e-calendar-table.c:1302
 #: ../calendar/gui/e-calendar-view.c:1720
@@ -2703,7 +2705,7 @@ msgstr "འོག་གི་ཐོ་ཡིག་ནང་ལུ་ གློ�
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:228
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2759,18 +2761,18 @@ msgstr ""
 "ཁྱོད་ཀྱིས་ འདི་གང་རུང་འབད་ ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:177
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "ས་སྒོ་གང་རུང་ནང་ཡོད་པ།"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
 msgid "Email begins with"
 msgstr "གློག་འཕྲིན་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན།"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:175
+#: ../addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Name begins with"
 msgstr "མིང་འདི་གིས་ འགོ་བཙུགསཔ་ཨིན།"
 
@@ -2787,7 +2789,7 @@ msgstr[1] "འབྲེལ་ས་%d།"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:242
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2813,11 +2815,11 @@ msgstr "དཔེ།"
 msgid "Error modifying card"
 msgstr "ཤོག་བྱང་ལེགས་བཅོས་འབད་ནི་ལུ་འཛོལ་བ།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:235
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 msgid "Source"
 msgstr "འབྱུང་ཁུངས།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:249
+#: ../addressbook/gui/widgets/e-addressbook-view.c:251
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:487
@@ -2826,14 +2828,14 @@ msgstr "འབྱུང་ཁུངས།"
 msgid "Type"
 msgstr "དབྱེ་བ།"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:839
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2150
+#: ../addressbook/gui/widgets/e-addressbook-view.c:841
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུངས།..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 #: ../calendar/gui/e-calendar-table.c:1280
 #: ../calendar/gui/e-calendar-view.c:1698
 #: ../calendar/gui/e-memo-table.c:901
@@ -2841,59 +2843,59 @@ msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུ�
 msgid "_Open"
 msgstr "ཁ་ཕྱེ། (_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "_New Contact..."
 msgstr "འབྲེལ་ས་གསརཔ་…(_N)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "New Contact _List..."
 msgstr "འབྲེལ་སའི་ཐོ་ཡིག་གསརཔ་…(_L)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
 msgid "_Save as VCard..."
 msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུང་བཞག་འབད་...(_S)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "_Forward Contact"
 msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད།(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "_Forward Contacts"
 msgstr "འབྲེལ་ས་ཚུ་གདོང་བསྐྱོད་འབད།(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Send _Message to Contact"
 msgstr "འབྲེལ་ས་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 msgid "Send _Message to List"
 msgstr "ཐོ་ཡིག་ལུ་འཕྲིན་དོན་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 msgid "Send _Message to Contacts"
 msgstr "འབྲེལ་ས་ཚུ་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 msgid "_Print"
 msgstr "དཔར་བསྐྲུན།(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 msgid "Cop_y to Address Book..."
 msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ འདྲ་བཤུས་རྐྱབས་...(_y)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
 msgid "Mo_ve to Address Book..."
 msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ སྤོ་བཤུད་འབད་...(_v)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:981
+#: ../addressbook/gui/widgets/e-addressbook-view.c:983
 #: ../ui/evolution-composer-entries.xml.h:4
 #: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "བཏོག (_t)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:984
 #: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/dialogs/comp-editor.c:463
 #: ../calendar/gui/e-calendar-table.c:1288
 #: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-memo-table.c:909
@@ -2913,23 +2915,23 @@ msgstr "བཏོག (_t)"
 msgid "_Copy"
 msgstr "འདྲ་བཤུས། (_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:985
 msgid "P_aste"
 msgstr "སྦྱར།(_a)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1666
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "དབྱེ་རིམ་གང་རུང་།"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1868
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
 msgid "Print cards"
 msgstr "ཤོག་བྱང་དཔར་བསྐྲུན་འབད།"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "འཛོལ་བ་གཞན།"
@@ -3518,7 +3520,7 @@ msgid "Error adding list"
 msgstr "ཐོ་ཡིག་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་འཛོལ་བ།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:705
+#: ../addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Error adding contact"
 msgstr "འབྲེལ་ས་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་འཛོལ་བ།"
 
@@ -3535,7 +3537,7 @@ msgid "Error removing list"
 msgstr "ཐོ་ཡིག་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཛོལ་བ།"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:658
+#: ../addressbook/gui/widgets/eab-gui-util.c:659
 msgid "Error removing contact"
 msgstr "འབྲེལ་ས་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཛོལ་བ།"
 
@@ -3591,37 +3593,37 @@ msgstr "ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད
 msgid "list"
 msgstr "ཐོ་ཡིག"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Move contact to"
 msgstr "འབྲེལ་ས་ལུ་ སྤོ་བཤུད་འབད།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Copy contact to"
 msgstr "འབྲེལ་ས་ལུ་ འདྲ་བཤུས་རྐྱབས།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Move contacts to"
 msgstr "འབྲེལ་ས་ཚུ་སྤོ་བཤུད་འབད་ཡུལ།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:775
 msgid "Copy contacts to"
 msgstr "འབྲེལ་ས་ཚུ་འདྲ་བཤུས་བརྐྱབ་ཡུལ།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:999
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
 msgid "Multiple VCards"
 msgstr "སྣ་མང་ཝི་ཤོག་བྱང་།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1002
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 #, c-format
 msgid "VCard for %s"
 msgstr "%sགི་དོན་ལས་ ཝི་ཤོག་བྱང་།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1043
-#: ../addressbook/gui/widgets/eab-gui-util.c:1061
+#: ../addressbook/gui/widgets/eab-gui-util.c:1045
+#: ../addressbook/gui/widgets/eab-gui-util.c:1063
 msgid "Contact information"
 msgstr "འབྲེལ་སའི་བརྡ་དོན།"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1065
 #, c-format
 msgid "Contact information for %s"
 msgstr "%sགི་དོན་ལུ་འབྲེལ་སའི་བརྡ་དོན།"
@@ -4479,7 +4481,7 @@ msgstr "ངོ་འཕྲད་ཚུ།"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1619
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1113
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../plugins/itip-formatter/itip-view.c:936
 msgid "Location:"
 msgstr "གནས་ཁོངས་:།"
@@ -4982,27 +4984,27 @@ msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱ�
 msgid "daylight savings time"
 msgstr "ཉིན་མདངས་སྲུང་བཞག་དུས་ཚོད།"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "བཅུད་དོན་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "འགྲེལ་བཤད་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "དབྱེ་རིམ་ཨིན་།"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "བསམ་བཀོད་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "གནས་ཁོངས་ནང་ཡོདཔ།"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "མཐུན་མིན།"
 
@@ -5040,15 +5042,15 @@ msgstr "གཟའ།"
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:260
 #: ../calendar/gui/memos-component.c:222
-#: ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600
-#: ../calendar/gui/migration.c:1108
+#: ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599
+#: ../calendar/gui/migration.c:1107
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "ཝེབ་གུ།"
 
 #: ../calendar/gui/calendar-component.c:278
-#: ../calendar/gui/migration.c:406
+#: ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "སྐྱེས་ཚེས་དང་ ལོ་བསྟར་དུས་དྲན་ཚུ།"
 
@@ -5357,7 +5359,7 @@ msgid "Display"
 msgstr "བཀྲམ་སྟོན།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "སྤེན་པ།"
@@ -5373,7 +5375,7 @@ msgstr ""
 "ཉིནམ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "མིག་དམར།"
@@ -5406,7 +5408,7 @@ msgid "S_un"
 msgstr "ཟླ་བ། (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "ཉི་མ།"
@@ -5424,7 +5426,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་སྟོན།(_n)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "ཟླ་བ།"
@@ -5443,7 +5445,7 @@ msgid "Template:"
 msgstr "ཊེམ་པེལེཊི།:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "པ་སངས།"
@@ -5458,13 +5460,13 @@ msgid "Time format:"
 msgstr "ཆུ་ཚོད་ཀྱི་རྩ་སྒྲིག:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "ལྷག"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "ཕུར་བུ།"
@@ -5693,15 +5695,15 @@ msgstr "(རན་པ།"
 msgid "Due "
 msgstr "རན་པ།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
+#: ../calendar/gui/dialogs/comp-editor.c:209
 #: ../composer/e-msg-composer.c:2889
 #, c-format
 msgid "Attached message - %s"
 msgstr "མཉམ་སྦྲགས་འཕྲིན་དོན་-- %s།"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393
 #: ../composer/e-msg-composer.c:2894
 #: ../composer/e-msg-composer.c:3090
 #, c-format
@@ -5710,7 +5712,7 @@ msgid_plural "%d attached messages"
 msgstr[0] "མཉམ་སྦྲགས་འཕྲིན་དོན།"
 msgstr[1] "མཉམ་སྦྲགས་འཕྲིན་དོན་%d།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446
+#: ../calendar/gui/dialogs/comp-editor.c:464
 #: ../composer/e-msg-composer.c:3154
 #: ../mail/em-folder-tree.c:1003
 #: ../mail/em-folder-utils.c:368
@@ -5719,18 +5721,18 @@ msgstr[1] "མཉམ་སྦྲགས་འཕྲིན་དོན་%d།"
 msgid "_Move"
 msgstr "སྤོ་བཤུད་འབད། (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448
+#: ../calendar/gui/dialogs/comp-editor.c:466
 #: ../composer/e-msg-composer.c:3156
 #: ../mail/em-folder-tree.c:1005
 #: ../mail/message-list.c:1923
 msgid "Cancel _Drag"
 msgstr "འདྲུད་ནི་ཆ་མེད་གཏང་། (_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:820
 msgid "Could not update object"
 msgstr "དངོས་པོ་དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:966
 #: ../composer/e-msg-composer.c:2502
 #, c-format
 msgid "<b>%d</b> Attachment"
@@ -5738,16 +5740,16 @@ msgid_plural "<b>%d</b> Attachments"
 msgstr[0] " མཉམ་སྦྲགས་<b>%d</b>།"
 msgstr[1] "མཉམ་སྦྲགས་<b>%d</b>"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:998
 msgid "Hide Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../calendar/gui/dialogs/comp-editor.c:1486
 msgid "Show Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 #: ../calendar/gui/dialogs/event-page.c:1896
 #: ../calendar/gui/dialogs/task-page.c:1199
 #: ../composer/e-msg-composer-attachment-bar.c:470
@@ -5758,7 +5760,7 @@ msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_B)"
 msgid "_Remove"
 msgstr "རྩ་བསྐྲད་གཏང་། (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3653
 #: ../mail/em-folder-tree.c:2081
@@ -5767,76 +5769,76 @@ msgstr "རྩ་བསྐྲད་གཏང་། (_R)"
 msgid "_Properties"
 msgstr "རྒྱུ་དངོས་ཚུ།(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3655
 msgid "_Add attachment..."
 msgstr "མཉམ་སྦྲགས་ཁ་སྐོང་རྐྱབས་...(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1492
-#: ../mail/em-format-html-display.c:2267
+#: ../calendar/gui/dialogs/comp-editor.c:1510
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:1511
 msgid "Press space key to toggle attachment bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་ སོར་སྟོན་འབད་ནིའི་དོན་ལུ་ བར་སྟོང་ལྡེ་མིག་ཨེབ།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2118
+#: ../calendar/gui/dialogs/comp-editor.c:2161
 msgid "Edit Appointment"
 msgstr "ངོ་འཕྲད་ཞུན་དག་རྐྱབས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2106
-#: ../calendar/gui/dialogs/comp-editor.c:2149
+#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2167
 #, c-format
 msgid "Meeting - %s"
 msgstr "འཛོམས་འདུ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2108
-#: ../calendar/gui/dialogs/comp-editor.c:2151
+#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2169
 #, c-format
 msgid "Appointment - %s"
 msgstr "ངོ་འཕྲད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2112
-#: ../calendar/gui/dialogs/comp-editor.c:2155
+#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2173
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "འགན་སྤྲོད་ལས་ཀ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2175
 #, c-format
 msgid "Task - %s"
 msgstr "ལས་ཀ་- %s\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2117
-#: ../calendar/gui/dialogs/comp-editor.c:2160
+#: ../calendar/gui/dialogs/comp-editor.c:2135
+#: ../calendar/gui/dialogs/comp-editor.c:2178
 #, c-format
 msgid "Journal entry - %s"
 msgstr "གསར་དེབ་ཐོ་བཀོད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2128
-#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2188
 msgid "No summary"
 msgstr "བཅུད་དོན་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2715
+#: ../calendar/gui/dialogs/comp-editor.c:2733
 #: ../composer/e-msg-composer-attachment-bar.c:307
 #: ../mail/em-utils.c:518
 #: ../mail/em-utils.c:555
-#: ../widgets/misc/e-attachment-bar.c:365
+#: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2804
-#: ../calendar/gui/dialogs/comp-editor.c:2858
-#: ../calendar/gui/dialogs/comp-editor.c:2882
+#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2876
+#: ../calendar/gui/dialogs/comp-editor.c:2900
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "དུས་མཐུན་ཅིག་བྱུང་པ་ཅིན་ རྣམ་གྲངས་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བཏོན་བཀོག་འོང་།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2906
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 msgid "Unable to use current version!"
 msgstr "ད་ལྟོའི་ཐོན་རིམ་དེ་ ལག་ལེན་འཐབ་མི་ཚུགས་པས།"
 
@@ -6000,36 +6002,36 @@ msgstr "ཁ་སྐོང་རྐྱབས། (_A)"
 msgid "Unable to open the calendar '%s'."
 msgstr "ཟླ་ཐོ་'%s'ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ ཉིནམ་%d གི་ཧེ་མར། "
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ ཉིནམ་%dགི་ཧེ་མར། "
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ ཆུ་ཚོད་%dགི་ཧེ་མར།"
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ ཆུ་ཚོད་%dགི་ཧེ་མར། "
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "ངོ་འཕྲད་ཀྱི་ སྐར་མ་%dགི་ཧེ་མར།"
 msgstr[1] "ངོ་འཕྲད་ཀྱི་ སྐར་མ%dགི་ཧེ་མར།"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2955
 msgid "Customize"
 msgstr "སྲོལ་སྒྲིག་འབད།"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2960
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1099
+#: ../calendar/gui/e-itip-control.c:1131
 #: ../composer/e-msg-composer.c:2294
 #: ../filter/filter-rule.c:889
 #: ../mail/em-account-editor.c:701
@@ -6374,22 +6376,41 @@ msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན།"
 msgid "21st to 31st"
 msgstr "༢༡ པ་ལས་ ༣༡ པ་ཚུན།"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr "གཟའ།"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr "ལུ།"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr "འབྱུང་བ་།"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2378
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
+msgid "Add exception"
+msgstr "དམིགས་བསལ་ཁ་སྐོང་རྐྱབས།"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
+msgid "Could not get a selection to modify."
+msgstr "ལེགས་བཅོས་འབད་ནི་ལུ་ སེལ་འཐུ་ཅིག་ཐོབ་མ་ཚུགས།"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
+msgid "Modify exception"
+msgstr "དམིགས་བསལ་ལེགས་བཅོས་འབད།"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2254
+msgid "Could not get a selection to delete."
+msgstr "བཏོན་གཏང་ནིའི་དོན་ལུ་ སེལ་འཐུ་ཅིག་ཐོབ་མ་ཚུགས།"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2385
 msgid "Date/Time"
 msgstr "ཚེས་གྲངས/ཆུ་ཚོད།"
 
@@ -6464,7 +6485,7 @@ msgstr "<span weight=\"bold\">གནས་ཚད་</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
 #: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-itip-control.c:923
 #: ../calendar/gui/e-meeting-store.c:194
 #: ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/print.c:2382
@@ -6709,15 +6730,15 @@ msgstr "%s ཁ་ཕྱེ་ནི་ལུ་ ཨེབ་གཏང་འབ�
 msgid "Untitled"
 msgstr "མགོ་མིང་མ་བཏགསཔ།"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "འགོ་བཙུགས་ཚེས་གྲངས:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../mail/mail-config.glade.h:68
@@ -6725,13 +6746,13 @@ msgstr "འགོ་བཙུགས་ཚེས་གྲངས:"
 msgid "Description:"
 msgstr "འགྲེལ་བཤད:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "ཝེབ་ཤོག་ལེབ:"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "བཅུད་དོན:"
@@ -6743,7 +6764,7 @@ msgstr "རན་པའི་ཚེས་གྲངས:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1127
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:961
 msgid "Status:"
@@ -6833,8 +6854,8 @@ msgstr "མེན།"
 #: ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124
 #: ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../calendar/gui/e-itip-control.c:1317
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124
@@ -6844,7 +6865,7 @@ msgstr "མེན།"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1764
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:705
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
@@ -6863,7 +6884,7 @@ msgid "Save As..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2113
+#: ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "སེལ་འཐུ་འབད་མི་ མཉམ་སྦྲགས་ཚུ་ བསྲུང་ནི་འི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
@@ -6893,7 +6914,7 @@ msgstr "རྒྱབ་གཞི་བཟུམ་སྦེ་གཞི་སྒ
 msgid "_Save Selected"
 msgstr "སེལ་འཐུ་འབད་མི་སྲུངས།(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:400
+#: ../calendar/gui/e-cal-popup.c:399
 #: ../mail/em-popup.c:776
 #, c-format
 msgid "Open in %s..."
@@ -7204,7 +7225,7 @@ 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:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i སྐར་མའི་སྡེ་ཚན།"
@@ -7216,7 +7237,7 @@ msgstr "%02i སྐར་མའི་སྡེ་ཚན།"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524
 #: ../calendar/gui/print.c:1538
@@ -7225,7 +7246,7 @@ msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:746
-#: ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
@@ -7233,7 +7254,7 @@ msgstr "སྔ་ཆ།"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:749
-#: ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
@@ -7243,93 +7264,125 @@ msgstr "ཕྱི་ཆ།"
 msgid "Yes. (Complex Recurrence)"
 msgstr "ཨིན། (གོ་དཀའ་བའི་སླར་འབྱུང་)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "ཉིན་བསྟར་བཞིན་དུ།"
 msgstr[1] "ཉིནམ་%d རེ་ནང་།"
 
-#: ../calendar/gui/e-itip-control.c:775
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "བདུན་རིམ་བཞིན་དུ།"
 msgstr[1] "བདུན་ཕྲག་%d རེ་ནང་།"
 
-#: ../calendar/gui/e-itip-control.c:777
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:789
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "བདུན་རིམ་བཞིན་དུ་ ལུ།"
 msgstr[1] "བདུན་ཕྲག་%d རེ་ནང་ ལུ།།"
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:798
 msgid " and "
 msgstr "དང་།"
 
-#: ../calendar/gui/e-itip-control.c:792
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s day of "
 msgstr "%s ཉིནམ་གི།"
 
-#: ../calendar/gui/e-itip-control.c:805
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s གི།"
 
-#: ../calendar/gui/e-itip-control.c:812
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:834
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "ཟླ་རིམ་བཞིན་དུ།"
 msgstr[1] "ཟླཝ་%dརེ་ནང་།"
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "ལོ་རིམ་བཞིན་དུ།"
 msgstr[1] "ལོ་%dརེ་ནང་།"
 
-#: ../calendar/gui/e-itip-control.c:827
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "ལན་གྲངས་%dགི་བསྡོམས།"
 msgstr[1] "ལན་གྲངས་%dགི་བསྡོམས།"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:866
 msgid ", ending on "
 msgstr "མཇུག་བསྡུ་ཚེས།"
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:888
 msgid "Starts"
 msgstr "འགོ་བཙུགསཔ་ཨིན།"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Ends"
 msgstr "མཇུག་བསྡུཝ་ཨིན།"
 
-#: ../calendar/gui/e-itip-control.c:904
+#: ../calendar/gui/e-itip-control.c:936
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "རན་ནི།"
 
-#: ../calendar/gui/e-itip-control.c:944
-#: ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:976
+#: ../calendar/gui/e-itip-control.c:1033
 msgid "iCalendar Information"
 msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:993
 msgid "iCalendar Error"
 msgstr "ཨའི་ཟླ་ཐོའི་འཛོལ་བ།"
 
-#: ../calendar/gui/e-itip-control.c:1033
-#: ../calendar/gui/e-itip-control.c:1049
-#: ../calendar/gui/e-itip-control.c:1060
-#: ../calendar/gui/e-itip-control.c:1077
+#: ../calendar/gui/e-itip-control.c:1065
+#: ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1092
+#: ../calendar/gui/e-itip-control.c:1109
 #: ../plugins/itip-formatter/itip-view.c:342
 #: ../plugins/itip-formatter/itip-view.c:343
 #: ../plugins/itip-formatter/itip-view.c:410
@@ -7340,296 +7393,296 @@ msgid "An unknown person"
 msgstr "ངོ་མ་ཤེས་པའི་གང་ཟག་ཅིག"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1116
 msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> འོག་གི་བརྡ་དོན་ཚུ་ བསྐྱར་ཞིབ་འབད་ཞིནམ་ལས་ འོག་གི་དཀར་ཆག་ནང་ལས་ བྱ་བ་ཅིག་སེལ་འཐུ་འབད་གནང་།"
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:687
 #: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "དང་ལེན་འབད་ཡི།"
 
-#: ../calendar/gui/e-itip-control.c:1136
-#: ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/e-itip-control.c:1168
+#: ../calendar/gui/itip-utils.c:690
 #: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད་ཡི།"
 
-#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:693
+#: ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "དང་ལེན་མ་འབད།"
 
-#: ../calendar/gui/e-itip-control.c:1224
+#: ../calendar/gui/e-itip-control.c:1256
 msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "འཛོམས་འདུ་དེ་ ཆ་མེད་བཏང་ཡོད་རུང་ ཁྱོད་ཀྱི་ཟླ་ཐོ་ཚུ་ནང་ ཐོབ་མ་ཚུགས།"
 
-#: ../calendar/gui/e-itip-control.c:1226
+#: ../calendar/gui/e-itip-control.c:1258
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "ལས་ཀ་དེ་ ཆ་མེད་བཏང་ཡོད་རུང་ ཁྱོད་ཀྱི་ལས་ཀའི་ཐོ་ཡིག་ཚུ་ནང་ ཐོབ་མ་ཚུགས།"
 
-#: ../calendar/gui/e-itip-control.c:1305
+#: ../calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུའི་བརྡ་དོན་ དཔེ་བསྐྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1338
 msgid "Meeting Information"
 msgstr "འཛོམས་འདུའི་བརྡ་དོན།"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> གིས་%s ལུ་ འཛོམས་འདུ་ཅིག་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> གིས་ ཁྱོད་ལུ་འཛོམས་འདུ་ཅིག་ནང་ ངོ་འཛོམས་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Proposal"
 msgstr "འཛོམས་འདུའི་གྲོས་འཆར།"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>གིས་ ད་ལྟོའི་འཛོམས་འདུ་ཅིག་ལུ་ ཁ་སྐོང་བརྐྱབ་ནིའི་ འདོད་པ་བསྐྱེདཔ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
 msgstr "འཛོམས་འདུའི་དུས་མཐུན།"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུའི་མཐའ་མཇུག་གི་བརྡ་དོན་ཚུ་ འཐོབ་ནིའི་འདོད་པ་བསྐྱེདཔ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Update Request"
 msgstr "འཛོམས་འདུ་དུས་མཐུན་བཟོ་དགོ་པའི་ཞུ་བ།"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>གིས་ འཛོམས་འདུའི་ཞུ་བ་ལུ་ ལན་གསལ་བྱིན་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Reply"
 msgstr "འཛོམས་འདུའི་ལན་གསལ།"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> གིས་ འཛོམས་འདུ་ཅིག་ ཆ་མེད་བཏང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Cancelation"
 msgstr "འཛོམས་འདུ་ཆ་མེད།"
 
-#: ../calendar/gui/e-itip-control.c:1353
-#: ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1502
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> གིས་ ཧ་གོ་མ་ཚུགས་པའི་ འཕྲིན་དོན་ཅིག་བཏང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Bad Meeting Message"
 msgstr "འཛོམས་འདུའི་འཕྲིན་དོན་བྱང་ཉེས།"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>གིས་ ལས་ཀའི་བརྡ་དོན་ དཔེ་བསྐྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Task Information"
 msgstr "ལས་ཀའི་བརྡ་དོན།"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> གིས་%s ལུ་ ལས་ཀ་ཅིག་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> གིས་ ཁྱོད་ལུ་ལས་ཀ་ཅིག་འབད་དགོ་པའི་ ཞུ་བ་འབདཝ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Proposal"
 msgstr "ལས་ཀའི་གྲོས་འཆར།"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> གིས་ ད་ལྟོའི་ལས་ཀ་ཅིག་ལུ་ ཁ་སྐོང་བརྐྱབ་ནིའི་ འདོད་པ་བསྐྱེདཔ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
 msgstr "ལས་ཀའི་དུས་མཐུན།"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> གིས་ མཐའ་མཇུག་གི་ལས་ཀའི་བརྡ་དོན་ འཐོབ་འདོད་བསྐྱེདཔ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Task Update Request"
 msgstr "ལས་ཀ་དུས་མཐུན་བཟོ་དགོ་པའི་ཞུ་བ།"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>གིས་ ལས་ཀའི་འགན་སྤྲོད་འབད་མི་དེ་ལུ་ ལན་གསལ་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Reply"
 msgstr "ལས་ཀའི་ལན་གསལ།"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b>གིས་ ལས་ཀ་ཅིག་ ཆ་མེད་བཏང་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Cancelation"
 msgstr "ལས་ཀ་ཆ་མེད།"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Bad Task Message"
 msgstr "ལས་ཀའི་འཕྲིན་དོན་བྱང་ཉེས།"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1487
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>གིས་ དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན་ དཔེ་བསྐྲུན་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Free/Busy Information"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1492
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> གིས་ ཁྱོད་ཀྱི་ དལཝ/ཁོམ་མེད་བརྡ་དོན་གྱི་ ཞུ་བ་འབདཝ་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1493
 msgid "Free/Busy Request"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་ཞུ་བ།"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1497
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> གིས་ དལཝ/ཁོམ་མེད་ཀྱི་ཞུ་བ་ལུ་ ལན་གསལ་འབད་ནུག"
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1498
 msgid "Free/Busy Reply"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་ལན་གསལ།"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1503
 msgid "Bad Free/Busy Message"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་འཕྲིན་དོན་བྱང་ཉེས།"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1578
 msgid "The message does not appear to be properly formed"
 msgstr "འཕྲིན་དོན་དེ་ ཚུལ་ལྡན་སྦེ་ གཞི་བསྒྲུབས་མ་འབདཝ་བཟུམ་ཅིག་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1637
 msgid "The message contains only unsupported requests."
 msgstr "འཕྲིན་དོན་དེ་ནང་ རྒྱབ་སྐྱོར་མེད་པའི་ ཞུ་བ་ཚུ་རྐྱངམ་གཅིག་ཨིན་མས།"
 
-#: ../calendar/gui/e-itip-control.c:1638
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment does not contain a valid calendar message"
 msgstr "མཉམ་སྦྲགས་དེ་ནང་ ནུས་ཅན་གྱི་ ཟླ་ཐོའི་འཕྲིན་དོན་མིན་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1702
 msgid "The attachment has no viewable calendar items"
 msgstr "མཉམ་སྦྲགས་དེ་ལུ་ མཐོང་ཚུགས་པའི་ ཟླ་ཐོའི་རྣམ་གྲངས་མིན་འདུག"
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Update complete\n"
 msgstr "དུས་མཐུན་མཇུག་བསྡུ་ཡོདཔ།\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:1964
 msgid "Object is invalid and cannot be updated\n"
 msgstr "དངོས་པོ་དེ་ ནུས་མེད་ཨིནམ་ལས་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "ངོས་ལན་འདི་ ད་ལྟོའི་ངོ་འཛོམས་པ་ཅིག་མེན་པས། ངོ་འཛོམས་པ་ཅིག་ ཁ་སྐོང་རྐྱབས།"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "ནུས་མེད་གནས་ཚད་ཅིག་ལུ་བརྟེན་ཏེ་ ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་མ་ཚུགས།\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2003
 msgid "Attendee status updated\n"
 msgstr "ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་ཡི།\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:2006
 #: ../plugins/itip-formatter/itip-formatter.c:1104
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "རྣམ་གྲངས་དེ་ གནས་ཏེ་མེདཔ་ལས་ ངོ་འཛོམས་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ་མི་ཚུགས།"
 
-#: ../calendar/gui/e-itip-control.c:1998
-#: ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2030
+#: ../calendar/gui/e-itip-control.c:2078
 msgid "Item sent!\n"
 msgstr "རྣམ་གྲངས་བཏང་ཡོད!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2032
+#: ../calendar/gui/e-itip-control.c:2082
 msgid "The item could not be sent!\n"
 msgstr "རྣམ་གྲངས་དེ་ བཏང་མ་ཚུགས!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2162
 msgid "Choose an action:"
 msgstr "བྱ་བ་ཅིག་གདམ:"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "དུས་མཐུན་བཟོ།"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "དང་ལེན་འབད།"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད།"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "དང་ལེན་མ་འབད།"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན་བཏང་།"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "ལན་བཀོད་པའི་གནས་ཚད་ དུས་མཐུན་བཟོ།"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "མཐའ་མཇུག་གི་བརྡ་དོན་བཏང་།"
 
-#: ../calendar/gui/e-itip-control.c:2345
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/e-itip-control.c:2377
+#: ../calendar/gui/itip-utils.c:710
 #: ../mail/mail-send-recv.c:451
 #: ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
@@ -7746,7 +7799,7 @@ msgstr "ངེས་མེད།"
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192
 #: ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:696
 #: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "བགོ་སྤེལ་འབད་ཡོདཔ།"
@@ -8027,52 +8080,52 @@ msgstr "འགོ་འདྲེན་པ་ཅིག་ གཞི་སྒྲ�
 msgid "At least one attendee is necessary"
 msgstr "ཉུང་མཐའ་ལུ་ ངོ་འཛོམས་པ་གཅིག་དགོ"
 
-#: ../calendar/gui/itip-utils.c:647
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:649
+#: ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "བྱུང་ལས་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:649
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:651
+#: ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "ལས་ཀའི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:651
-#: ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:653
+#: ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "གསར་དེབ་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:653
-#: ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "ཟླ་ཐོའི་བརྡ་དོན།"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "དུས་མཐུན་བཟོ་བཟོཝ།"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "ཡང་སེལ།"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "གདོང་ལན་གྲོས་འཆར།"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "དལཝ/ཁོམ་མེད་ཀྱི་བརྡ་དོན།(%sལས་%sལུ་)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "ཁྱོད་ བྱུང་ལས་དེ་གི་ ངོ་འཛོམས་པ་ཅིག་ཨིན་དགོ"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 
@@ -8174,24 +8227,24 @@ msgstr ""
 "\"ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་།"
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771
-#: ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:770
+#: ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "ཨི་བོ་ལུ་ཤཱན་/ཀཱོན་ཕིག་.ཨེགསི་ཨེམ་ཨེལ་ཌི་བི་ནང་ལས་ གཞི་སྒྲིག་རྙིངམ་ཚུ་ གཞིས་སྤོ་འབད་མ་ཚུགས།"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "ཟླ་ཐོ་`%sགཞིས་སྤོ་འབད་མ་ཚུགས།"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "ལས་ཀ་`%sགཞིས་སྤོ་འབད་མ་ཚུགས།"
 
-#: ../calendar/gui/migration.c:1212
+#: ../calendar/gui/migration.c:1211
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
@@ -10090,25 +10143,22 @@ msgid "Pacific/Yap"
 msgstr "པེ་སི་ཕིག་/ཡཔ།"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1027
+#: ../widgets/misc/e-attachment-bar.c:1012
 msgid "Attachment Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་།"
 
@@ -10660,8 +10710,8 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "ག་བསྡུར་བརྐྱབ་ནིའི་དོན་ལས་ དུས་ཚོད་ཅིག་སེལ་འཐུ་འབད།"
 
-#: ../filter/filter-file.c:293
-#: ../filter/filter-file.c:299
+#: ../filter/filter-file.c:296
+#: ../filter/filter-file.c:302
 msgid "Choose a file"
 msgstr "ཡིག་སྣོད་ཅིག་ གདམ་ཁ་རྐྱབས།"
 
@@ -11399,11 +11449,11 @@ msgstr "གལ་ཅན་འཕྲིན་དོན་ཚུ། "
 msgid "Messages Not Junk"
 msgstr "མཁོ་མེད་མེན་པའི་འཕྲིན་དོན་ཚུ།"
 
-#: ../mail/em-folder-browser.c:1019
+#: ../mail/em-folder-browser.c:1030
 msgid "Account Search"
 msgstr "རྩིས་ཐོའི་འཚོལ་ཞིབ།"
 
-#: ../mail/em-folder-browser.c:1049
+#: ../mail/em-folder-browser.c:1074
 msgid "All Account Search"
 msgstr "རྩིས་ཐོའི་འཚོལ་ཞིབ་ཆ་མཉམ།"
 
@@ -11769,163 +11819,163 @@ msgid "Click to hide/unhide addresses"
 msgstr "ཁ་བྱང་ཚུ་སྦ་ནི་/སྦ་བཤོལ་འབད་ནི་ལུ་ ཨེབ་གཏང་འབད།"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "%d མཐུན་པས།"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "འཚོལ་:(_n)"
 
-#: ../mail/em-format-html-display.c:675
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
 msgstr "གདོང་བསྐྱོད།(_r)"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "ཡི་གུ་མཐུན་སྒྲིག་འབད།(_a)"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 #: ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "མིང་རྟགས་མ་བཀོདཔ།"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་མ་བཀོདཔ་ལས་ འཕྲིན་དོན་འདི་ བདེན་པ་ཨིན་པའི་ ཉེན་ལེན་འབད་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 #: ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "ནུས་ཅན་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་བཀོད་དེ་ ནུས་ཅན་ཨིནམ་ལས་ འཕྲིན་དོན་འདི་ ངེས་བདེན་འོང་ནི་མས།"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 #: ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "ནུས་མེད་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "འཕྲིན་དོན་འདི་གི་ མིང་རྟགས་འདི་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས། གཏོང་ལེན་ནང་ལུ་ མེདཔ་བཏང་གདའཔ་འོང་ནི་མས།"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་པས། དེ་འབདཝ་ད་ གཏང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 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:936
+#: ../mail/em-format-html-display.c:939
 #: ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "གསང་བ་མ་བཟོཝ།"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:939
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོཝ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ གཏོང་ལེན་འབད་བའི་སྐབས་མཐོང་འོང་།"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 #: ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "གསང་བཟོ་ལེགས་ཤོམ་མ་འགྱོ་བས།"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
 msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོའི་ཨཱལ་གོ་རི་དམ་ ཤུགས་མེད་ཅིག་གི་ཐོག་ལས་གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་མཚམས་ཅིག་ཡོད་རུང་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ མཐོང་མ་ཚུགསཔ་མེད།"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 #: ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 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:939
+#: ../mail/em-format-html-display.c:942
 #: ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "སྒྲིང་སྒྲིང་སྦེ་ གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:942
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
 msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོའི་ཨཱལ་གོ་རི་དམ་ སྒྲིང་སྒྲིང་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག  ཕྱི་མི་ཅིག་གིས་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ལཱ་ཁག་ཡོད།"
 
-#: ../mail/em-format-html-display.c:1040
+#: ../mail/em-format-html-display.c:1043
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "ལག་ཁྱེར་ལུ་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "ལག་ཁྱེར་འདི་ མཐོང་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ལུ་མཇུག་བསྡུ་ཡོད།"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "ཧེ་མ་ལས་རན་ཡོདཔ།"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %pལས།"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "ཨིན་ལའིན་ལུ་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "སྦ་བཞག (_H)"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "རྒྱ་ཚད་ལུ་ཚུད་སྒྲིག་འབད།(_F)"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "ཐོག་མའི་་ཚད་སྟོན། (_O)"
 
-#: ../mail/em-format-html-display.c:1867
+#: ../mail/em-format-html-display.c:1886
 #: ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་བསྲུང་ནིའི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "སེལ་འཐུ་འབད་མི་་སྲུངས་...(_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "མཉམ་སྦྲགས་%d། (_t)"
 msgstr[1] "མཉམ་སྦྲགས་%d།(-t)"
 
-#: ../mail/em-format-html-display.c:2195
-#: ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2214
+#: ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "སྲུངས། (_a)"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "ཆ་མཉམ་སྲུངས།(_a)"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "མཉམ་སྦྲགས་མིན་འདུག"
 
@@ -12945,7 +12995,7 @@ msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན།
 msgid "Create a new mail folder"
 msgstr "ཡིག་འཕྲིན་གྱི་སྣོད་འཛིན་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "ཡིག་འཕྲིན་གྱི་ སྒྲིག་སྟངས་སམ་ སྣོད་འཛིན་ཚུ་  ཡར་བསྐྱེད་འབད་མ་ཚུགས།"
 
@@ -14740,6 +14790,14 @@ msgstr "ཀཱལ་ཌེབ།"
 msgid "Use _SSL"
 msgstr "ཨེསི་ཨེསི་ཨེལ་ལག་ལེན་འཐབ།(_S)"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "CalDAV ཟླ་ཐོ་འབྱུང་ཚུ་"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "CalDAVའབྱུང་ཁུངས་ཚུ།"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "ཉེ་གནས་ཀྱི་ཟླ་ཐོ་ཚུ།"
@@ -15826,6 +15884,15 @@ msgstr "ཟླ་ཐོ་སེལ་འཐུ་འབད།"
 msgid "_Import"
 msgstr "ནང་འདྲེན། (_I)"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "་ཟླ་ཐོ་ལུ་ནང་འདྲེན་འབད།"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "ཨའི་སི་ཨེསི་ མཉམ་སྦྲགས་ཚུ་ ཟླ་ཐོ་ལུ་ནང་འདྲེན་འབདཝ་ཨིན།"
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17373,19 +17440,19 @@ msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད། (_W)"
 msgid "Work Offline"
 msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད།"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད། ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་གཏང་འབད།"
 
-#: ../shell/e-shell-window.c:387
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ འགྱོ་བའི་བསྒང་ཨིན་མས།"
 
-#: ../shell/e-shell-window.c:394
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཡོད། ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་གཏང་འབད།"
 
-#: ../shell/e-shell-window.c:794
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ལུ་སོར་བསྒྱུར་འབད།"
@@ -20312,45 +20379,45 @@ msgstr "ཝེསི་ཊརན་ ཡུ་རོ་པི་ཡཱན།"
 msgid "Western European, New"
 msgstr "ཝེསི་ཊརན་ ཡུ་རོ་པི་ཡཱན་ གསརཔ།"
 
-#: ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
 msgid "Traditional"
 msgstr "སྔོན་སྲོལ་གྱི།"
 
-#: ../widgets/misc/e-charset-picker.c:96
 #: ../widgets/misc/e-charset-picker.c:97
 #: ../widgets/misc/e-charset-picker.c:98
 #: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Simplified"
 msgstr "འཇམ་སམ་བཟོ་བཟོཝ།"
 
-#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Ukrainian"
 msgstr "ཡུཀ་རའི་ནི་ཡཱན།"
 
-#: ../widgets/misc/e-charset-picker.c:105
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Visual"
 msgstr "ཝི་ཤུ་ཡེལ།"
 
-#: ../widgets/misc/e-charset-picker.c:174
+#: ../widgets/misc/e-charset-picker.c:175
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "མ་ཤེས་པའི་ ཡིག་འབྲུའི་གཞི་སྒྲིག་%s།"
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-charset-picker.c:220
 msgid "Character Encoding"
 msgstr "ཡིག་འབྲུའི་ ཨིན་ཀོ་ཌིང་།"
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-picker.c:235
 msgid "Enter the character set to use"
 msgstr "ལག་ལེན་གྱི་དོན་ལུ་ ཡིག་འབྲུའི་གཞི་སྒྲིག་བཙུགས།"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-picker.c:342
 msgid "Other..."
 msgstr "གཞན་...།"
 
-#: ../widgets/misc/e-charset-picker.c:482
+#: ../widgets/misc/e-charset-picker.c:483
 msgid "Ch_aracter Encoding"
 msgstr "ཡིག་འབྲུའི་ཨིན་ཀོ་ཌིང་།(_a)"
 
@@ -20398,6 +20465,14 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#: ../widgets/misc/e-dateedit.c:1634
+msgid "Invalid Date Value"
+msgstr "ནུས་མེད་ཚེས་གྲངས་བེ་ལུ།"
+
+#: ../widgets/misc/e-dateedit.c:1660
+msgid "Invalid Time Value"
+msgstr "ནུས་མེད་ཆུ་ཚོད་བེ་ལུ།"
+
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡོདཔ།"
@@ -20450,20 +20525,21 @@ msgstr "རྒྱ་སྐྱེད་པའི མདའ་རྟགས་མ�
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129
-#: ../widgets/misc/e-filter-bar.c:168
+#: ../widgets/misc/e-filter-bar.c:170
+#: ../widgets/misc/e-filter-bar.c:717
 msgid "Advanced Search"
 msgstr "མཐོ་རིམ་ཅན་གྱི་འཚོལ་ཞིབ།"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:216
+#: ../widgets/misc/e-filter-bar.c:218
 msgid "Save Search"
 msgstr "འཚོལ་ཞིབ་སྲུངས།"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:251
 msgid "_Searches"
 msgstr "འཚོལ་ཞིབ་ཚུ། (_S)"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:253
 msgid "Searches"
 msgstr "འཚོལ་ཞིབ་ཚུ། "
 
@@ -20537,23 +20613,23 @@ msgstr "སླར་འབབ་ཀྱི་དཔེ།"
 msgid "Column width"
 msgstr "ཀེར་ཐིག་གི་རྒྱ་ཚད།"
 
-#: ../widgets/misc/e-search-bar.c:573
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Search"
 msgstr "འཚོལ་ཞིབ་འབད། (_S)"
 
-#: ../widgets/misc/e-search-bar.c:579
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Find Now"
 msgstr "ད་ལྟོ་རང་འཚོལ། (_F)"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Clear"
 msgstr "བསལ། (_C)"
 
-#: ../widgets/misc/e-search-bar.c:831
+#: ../widgets/misc/e-search-bar.c:855
 msgid "Item ID"
 msgstr "རྣམ་གྲངས་གྱི་ཨའི་ཌི"
 
-#: ../widgets/misc/e-search-bar.c:838
+#: ../widgets/misc/e-search-bar.c:862
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3503
@@ -20563,19 +20639,19 @@ msgstr "ཚིག་ཡིག"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:971
+#: ../widgets/misc/e-search-bar.c:996
 msgid "Sho_w: "
 msgstr "སྟོན་:(_w)"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:988
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sear_ch: "
 msgstr "འཚོལ་ཞིབ་:(_c)"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1000
+#: ../widgets/misc/e-search-bar.c:1025
 msgid " i_n "
 msgstr "ནང་ན།(_n)"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 8213c7e875..b16488673d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution gnome-2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-16 09:53+0100\n"
-"PO-Revision-Date: 2006-09-16 09:53-0000\n"
+"POT-Creation-Date: 2006-10-22 10:25+0100\n"
+"PO-Revision-Date: 2006-10-22 10:28-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -23,12 +23,12 @@ msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact"
 msgstr "New Contact"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:232
 msgid "New Contact List"
 msgstr "New Contact List"
 
@@ -56,32 +56,32 @@ msgstr "Contact: "
 msgid "evolution minicard"
 msgstr "evolution minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "It has alarms."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "It has recurrences."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "It is a meeting."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Calendar Event: Summary is %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Calendar Event: It has no summary."
 
-#: ../a11y/calendar/ea-cal-view-event.c:298
+#: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
 msgstr "calendar view event"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:529
 msgid "Grab Focus"
 msgstr "Grab Focus"
 
@@ -151,7 +151,7 @@ msgstr "calendar view for a work week"
 msgid "calendar view for one or more days"
 msgstr "calendar view for one or more days"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../a11y/calendar/ea-gnome-calendar.c:188
 #: ../calendar/gui/calendar-component.c:707
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
@@ -162,28 +162,28 @@ msgstr "%A %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
 #: ../calendar/gui/calendar-component.c:712
 #: ../calendar/gui/calendar-component.c:717
 #: ../calendar/gui/calendar-component.c:719
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
 #: ../calendar/gui/calendar-component.c:731
 #: ../calendar/gui/calendar-component.c:738
 #: ../calendar/gui/calendar-component.c:744
@@ -196,26 +196,26 @@ msgstr "%d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
+#: ../a11y/calendar/ea-gnome-calendar.c:248
+#: ../a11y/calendar/ea-gnome-calendar.c:256
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "search bar"
 msgstr "search bar"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:292
 msgid "evolution calendar search bar"
 msgstr "evolution calendar search bar"
 
@@ -490,12 +490,14 @@ msgstr "_Add"
 msgid "_Discard"
 msgstr "_Discard"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -533,7 +535,7 @@ msgstr "Configure autocomplete here"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
 #: ../calendar/gui/calendar-component.c:272
-#: ../calendar/gui/migration.c:403
+#: ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "Contacts"
@@ -572,13 +574,13 @@ msgstr "Manage your S/MIME certificates here"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
 #: ../calendar/gui/memos-component.c:195
-#: ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573
-#: ../calendar/gui/migration.c:1081
+#: ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572
+#: ../calendar/gui/migration.c:1080
 #: ../calendar/gui/tasks-component.c:190
 #: ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201
@@ -592,15 +594,15 @@ msgstr "On This Computer"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-component.c:147
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 #: ../calendar/gui/calendar-component.c:241
 #: ../calendar/gui/memos-component.c:203
-#: ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581
-#: ../calendar/gui/migration.c:1089
+#: ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580
+#: ../calendar/gui/migration.c:1088
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055
@@ -609,41 +611,41 @@ msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-component.c:157
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:228
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact"
 msgstr "Create a new contact"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "Contact _List"
 msgstr "Contact _List"
 
-#: ../addressbook/gui/component/addressbook-component.c:236
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Create a new contact list"
 msgstr "Create a new contact list"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:240
 #: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:241
 msgid "Address _Book"
 msgstr "Address _Book"
 
-#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-component.c:242
 msgid "Create a new address book"
 msgstr "Create a new address book"
 
-#: ../addressbook/gui/component/addressbook-component.c:407
+#: ../addressbook/gui/component/addressbook-component.c:405
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Failed upgrading Address Book settings or folders."
 
@@ -675,7 +677,7 @@ msgid "General"
 msgstr "General"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:569
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "Address Book"
@@ -696,7 +698,7 @@ msgid "Details"
 msgstr "Details"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../mail/em-folder-browser.c:854
 msgid "Searching"
 msgstr "Searching"
 
@@ -796,7 +798,7 @@ msgstr "_New Address Book"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:986
 #: ../calendar/gui/calendar-component.c:584
 #: ../calendar/gui/e-calendar-table.c:1302
 #: ../calendar/gui/e-calendar-view.c:1720
@@ -804,7 +806,7 @@ msgstr "_New Address Book"
 #: ../calendar/gui/memos-component.c:453
 #: ../calendar/gui/tasks-component.c:443
 #: ../mail/em-folder-tree.c:2077
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1126
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30
@@ -833,12 +835,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:501
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:481
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Enter password for %s (user %s)"
@@ -1186,7 +1188,7 @@ msgstr "AIM"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:193
+#: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "Contact"
 
@@ -1370,7 +1372,7 @@ msgstr "Address"
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:186
+#: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:181
 #: ../widgets/table/e-cell-text.c:1821
 #: ../widgets/text/e-entry.c:1312
@@ -2702,7 +2704,7 @@ msgstr "_Type an email address or drag a contact into the list below:"
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:229
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2759,7 +2761,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -2786,7 +2788,7 @@ msgstr[1] "%d contacts"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:243
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2812,11 +2814,11 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:236
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 msgid "Source"
 msgstr "Source"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:250
+#: ../addressbook/gui/widgets/e-addressbook-view.c:251
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:487
@@ -2825,14 +2827,14 @@ msgstr "Source"
 msgid "Type"
 msgstr "Type"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:840
+#: ../addressbook/gui/widgets/e-addressbook-view.c:841
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2151
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 #: ../calendar/gui/e-calendar-table.c:1280
 #: ../calendar/gui/e-calendar-view.c:1698
 #: ../calendar/gui/e-memo-table.c:901
@@ -2840,68 +2842,68 @@ msgstr "Save as VCard..."
 msgid "_Open"
 msgstr "_Open"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "_New Contact..."
 msgstr "_New Contact..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "New Contact _List..."
 msgstr "New Contact _List..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
 msgid "_Save as VCard..."
 msgstr "_Save as VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "_Forward Contact"
 msgstr "_Forward Contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "_Forward Contacts"
 msgstr "_Forward Contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Send _Message to Contact"
 msgstr "Send _Message to Contact"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 msgid "Send _Message to List"
 msgstr "Send _Message to List"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 msgid "Send _Message to Contacts"
 msgstr "Send _Message to Contacts"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 msgid "_Print"
 msgstr "_Print"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 msgid "Cop_y to Address Book..."
 msgstr "Cop_y to Address Book..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ve to Address Book..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:983
 #: ../ui/evolution-composer-entries.xml.h:4
 #: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:984
 #: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/dialogs/comp-editor.c:463
 #: ../calendar/gui/e-calendar-table.c:1288
 #: ../calendar/gui/e-calendar-view.c:1705
 #: ../calendar/gui/e-memo-table.c:909
 #: ../calendar/gui/memos-component.c:452
 #: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3152
+#: ../composer/e-msg-composer.c:3153
 #: ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1110
-#: ../mail/message-list.c:1919
+#: ../mail/em-folder-view.c:1112
+#: ../mail/message-list.c:1920
 #: ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13
@@ -2912,13 +2914,13 @@ msgstr "Cu_t"
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:985
 msgid "P_aste"
 msgstr "P_aste"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:422
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -3109,7 +3111,7 @@ msgid "Web Site"
 msgstr "Web Site"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:149
+#: ../addressbook/gui/widgets/e-minicard.c:150
 #: ../widgets/misc/e-canvas-vbox.c:96
 #: ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436
@@ -3129,7 +3131,7 @@ msgid "Width"
 msgstr "Width"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:156
+#: ../addressbook/gui/widgets/e-minicard.c:157
 #: ../widgets/misc/e-canvas-vbox.c:108
 #: ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444
@@ -3148,7 +3150,7 @@ msgid "Height"
 msgstr "Height"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:164
+#: ../addressbook/gui/widgets/e-minicard.c:165
 msgid "Has Focus"
 msgstr "Has Focus"
 
@@ -3224,23 +3226,23 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Work Email"
 msgstr "Work Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Home Email"
 msgstr "Home Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:104
 msgid "Other Email"
 msgstr "Other Email"
 
-#: ../addressbook/gui/widgets/e-minicard.c:172
+#: ../addressbook/gui/widgets/e-minicard.c:173
 msgid "Selected"
 msgstr "Selected"
 
-#: ../addressbook/gui/widgets/e-minicard.c:179
+#: ../addressbook/gui/widgets/e-minicard.c:180
 msgid "Has Cursor"
 msgstr "Has Cursor"
 
@@ -3250,7 +3252,7 @@ msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2509
+#: ../mail/em-folder-view.c:2511
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
@@ -3305,11 +3307,11 @@ msgstr "Video Chat"
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2286
 #: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
-#: ../plugins/hula-account-setup/camel-hula-listener.c:379
-#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+#: ../plugins/hula-account-setup/camel-hula-listener.c:381
+#: ../plugins/hula-account-setup/camel-hula-listener.c:410
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Calendar"
@@ -3517,7 +3519,7 @@ msgid "Error adding list"
 msgstr "Error adding list"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:705
+#: ../addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
@@ -3534,7 +3536,7 @@ msgid "Error removing list"
 msgstr "Error removing list"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:658
+#: ../addressbook/gui/widgets/eab-gui-util.c:659
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
@@ -3590,37 +3592,37 @@ msgstr "Select Address Book"
 msgid "list"
 msgstr "list"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:775
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:999
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1002
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1043
-#: ../addressbook/gui/widgets/eab-gui-util.c:1061
+#: ../addressbook/gui/widgets/eab-gui-util.c:1045
+#: ../addressbook/gui/widgets/eab-gui-util.c:1063
 msgid "Contact information"
 msgstr "Contact information"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1065
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contact information for %s"
@@ -4431,8 +4433,8 @@ msgstr "Memos"
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:391
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:601
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tasks"
@@ -4482,7 +4484,7 @@ msgstr "Appointments"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1619
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1113
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../plugins/itip-formatter/itip-view.c:936
 msgid "Location:"
 msgstr "Location:"
@@ -4985,27 +4987,27 @@ msgstr "Workday start minute"
 msgid "daylight savings time"
 msgstr "daylight savings time"
 
-#: ../calendar/gui/cal-search-bar.c:53
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "Description contains"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "Category is"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "Location contains"
 
-#: ../calendar/gui/cal-search-bar.c:426
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "Unmatched"
 
@@ -5043,15 +5045,15 @@ msgstr "days"
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:260
 #: ../calendar/gui/memos-component.c:222
-#: ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600
-#: ../calendar/gui/migration.c:1108
+#: ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599
+#: ../calendar/gui/migration.c:1107
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "On The Web"
 
 #: ../calendar/gui/calendar-component.c:278
-#: ../calendar/gui/migration.c:406
+#: ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Birthdays & Anniversaries"
 
@@ -5360,7 +5362,7 @@ msgid "Display"
 msgstr "Display"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Friday"
@@ -5376,7 +5378,7 @@ msgstr ""
 "Days"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Monday"
@@ -5411,7 +5413,7 @@ msgid "S_un"
 msgstr "S_un"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Saturday"
@@ -5429,7 +5431,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Sunday"
@@ -5448,7 +5450,7 @@ msgid "Template:"
 msgstr "Template:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Thursday"
@@ -5463,13 +5465,13 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Tuesday"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Wednesday"
@@ -5698,150 +5700,150 @@ msgstr " (Due "
 msgid "Due "
 msgstr "Due "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2888
+#: ../calendar/gui/dialogs/comp-editor.c:209
+#: ../composer/e-msg-composer.c:2889
 #, c-format
 msgid "Attached message - %s"
 msgstr "Attached message - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382
-#: ../composer/e-msg-composer.c:2893
-#: ../composer/e-msg-composer.c:3089
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393
+#: ../composer/e-msg-composer.c:2894
+#: ../composer/e-msg-composer.c:3090
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Attached message"
 msgstr[1] "%d attached messages"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3153
+#: ../calendar/gui/dialogs/comp-editor.c:464
+#: ../composer/e-msg-composer.c:3154
 #: ../mail/em-folder-tree.c:1003
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1006
-#: ../mail/message-list.c:1920
+#: ../mail/em-folder-view.c:1008
+#: ../mail/message-list.c:1921
 msgid "_Move"
 msgstr "_Move"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3155
+#: ../calendar/gui/dialogs/comp-editor.c:466
+#: ../composer/e-msg-composer.c:3156
 #: ../mail/em-folder-tree.c:1005
-#: ../mail/message-list.c:1922
+#: ../mail/message-list.c:1923
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:820
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: ../calendar/gui/dialogs/comp-editor.c:948
-#: ../composer/e-msg-composer.c:2501
+#: ../calendar/gui/dialogs/comp-editor.c:966
+#: ../composer/e-msg-composer.c:2502
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Attachment"
 msgstr[1] "<b>%d</b> Attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:998
 msgid "Hide Attachment _Bar"
 msgstr "Hide Attachment _Bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:983
-#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../calendar/gui/dialogs/comp-editor.c:1486
 msgid "Show Attachment _Bar"
 msgstr "Show Attachment _Bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 #: ../calendar/gui/dialogs/event-page.c:1896
 #: ../calendar/gui/dialogs/task-page.c:1199
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3651
+#: ../composer/e-msg-composer.c:3652
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1103
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3652
+#: ../composer/e-msg-composer.c:3653
 #: ../mail/em-folder-tree.c:2081
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Properties"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3654
+#: ../composer/e-msg-composer.c:3655
 msgid "_Add attachment..."
 msgstr "_Add attachment..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1492
-#: ../mail/em-format-html-display.c:2266
+#: ../calendar/gui/dialogs/comp-editor.c:1510
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "Show Attachments"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1493
+#: ../calendar/gui/dialogs/comp-editor.c:1511
 msgid "Press space key to toggle attachment bar"
 msgstr "Press space key to toggle attachment bar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2118
+#: ../calendar/gui/dialogs/comp-editor.c:2161
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2106
-#: ../calendar/gui/dialogs/comp-editor.c:2149
+#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2167
 #, c-format
 msgid "Meeting - %s"
 msgstr "Meeting - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2108
-#: ../calendar/gui/dialogs/comp-editor.c:2151
+#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2169
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2112
-#: ../calendar/gui/dialogs/comp-editor.c:2155
+#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2173
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Assigned Task - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2175
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2117
-#: ../calendar/gui/dialogs/comp-editor.c:2160
+#: ../calendar/gui/dialogs/comp-editor.c:2135
+#: ../calendar/gui/dialogs/comp-editor.c:2178
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2128
-#: ../calendar/gui/dialogs/comp-editor.c:2170
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2188
 msgid "No summary"
 msgstr "No summary"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2715
+#: ../calendar/gui/dialogs/comp-editor.c:2733
 #: ../composer/e-msg-composer-attachment-bar.c:307
 #: ../mail/em-utils.c:518
 #: ../mail/em-utils.c:555
-#: ../widgets/misc/e-attachment-bar.c:365
+#: ../widgets/misc/e-attachment-bar.c:350
 msgid "attachment"
 msgstr "attachment"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2804
-#: ../calendar/gui/dialogs/comp-editor.c:2858
-#: ../calendar/gui/dialogs/comp-editor.c:2882
+#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2876
+#: ../calendar/gui/dialogs/comp-editor.c:2900
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2906
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
@@ -6005,37 +6007,37 @@ msgstr "_Add "
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d day before appointment"
 msgstr[1] "%d days before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hour before appointment"
 msgstr[1] "%d hours before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute before appointment"
 msgstr[1] "%d minutes before appointment"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2955
 msgid "Customize"
 msgstr "Customise"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2960
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1099
-#: ../composer/e-msg-composer.c:2293
+#: ../calendar/gui/e-itip-control.c:1131
+#: ../composer/e-msg-composer.c:2294
 #: ../filter/filter-rule.c:889
 #: ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1421
@@ -6379,22 +6381,41 @@ msgstr "11th to 20th"
 msgid "21st to 31st"
 msgstr "21st to 31st"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr "day"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr "on the"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1412
+#: ../calendar/gui/dialogs/recurrence-page.c:1415
 msgid "occurrences"
 msgstr "occurrences"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2378
+#: ../calendar/gui/dialogs/recurrence-page.c:2155
+msgid "Add exception"
+msgstr "Add exception"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2198
+msgid "Could not get a selection to modify."
+msgstr "Could not get a selection to modify."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2204
+msgid "Modify exception"
+msgstr "Modify exception"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2250
+msgid "Could not get a selection to delete."
+msgstr "Could not get a selection to delete."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2381
 msgid "Date/Time"
 msgstr "Date/Time"
 
@@ -6469,7 +6490,7 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
 #: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-itip-control.c:923
 #: ../calendar/gui/e-meeting-store.c:194
 #: ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/print.c:2382
@@ -6480,7 +6501,7 @@ msgstr "Completed"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1032
 msgid "High"
 msgstr "High"
 
@@ -6497,7 +6518,7 @@ msgstr "In Progress"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1029
+#: ../mail/message-list.c:1030
 msgid "Low"
 msgstr "Low"
 
@@ -6505,7 +6526,7 @@ msgstr "Low"
 #: ../calendar/gui/e-cal-component-preview.c:252
 #: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1031
 msgid "Normal"
 msgstr "Normal"
 
@@ -6703,7 +6724,7 @@ msgstr "%s for an unknown trigger type"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2877
+#: ../mail/em-folder-view.c:2879
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -6714,15 +6735,15 @@ msgstr "Click to open %s"
 msgid "Untitled"
 msgstr "Untitled"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Start Date:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../mail/mail-config.glade.h:68
@@ -6730,13 +6751,13 @@ msgstr "Start Date:"
 msgid "Description:"
 msgstr "Description:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Web Page:"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.c:1135
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Summary:"
@@ -6748,7 +6769,7 @@ msgstr "Due Date:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1127
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
 #: ../plugins/itip-formatter/itip-view.c:961
 msgid "Status:"
@@ -6838,8 +6859,8 @@ msgstr "No"
 #: ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124
 #: ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1144
-#: ../calendar/gui/e-itip-control.c:1285
+#: ../calendar/gui/e-itip-control.c:1176
+#: ../calendar/gui/e-itip-control.c:1317
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124
@@ -6849,7 +6870,7 @@ msgstr "No"
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1764
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:720
+#: ../widgets/misc/e-attachment-bar.c:705
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Unknown"
@@ -6868,7 +6889,7 @@ msgid "Save As..."
 msgstr "Save As..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:2112
+#: ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "Select folder to save selected attachments..."
 
@@ -6882,7 +6903,7 @@ msgstr "untitled_image.%s"
 #: ../calendar/gui/e-calendar-table.c:1282
 #: ../calendar/gui/e-calendar-view.c:1699
 #: ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1122
 #: ../mail/em-popup.c:554
 #: ../mail/em-popup.c:565
 msgid "_Save As..."
@@ -6898,7 +6919,7 @@ msgstr "Set as _Background"
 msgid "_Save Selected"
 msgstr "_Save Selected"
 
-#: ../calendar/gui/e-cal-popup.c:400
+#: ../calendar/gui/e-cal-popup.c:399
 #: ../mail/em-popup.c:776
 #, c-format
 msgid "Open in %s..."
@@ -6963,7 +6984,7 @@ msgstr "Updating objects"
 #: ../calendar/gui/e-calendar-table.c:1106
 #: ../calendar/gui/e-calendar-view.c:1248
 #: ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1348
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -6981,7 +7002,7 @@ msgstr "Open _Web Page"
 #: ../calendar/gui/e-calendar-view.c:1684
 #: ../calendar/gui/e-calendar-view.c:1700
 #: ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1123
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:44
@@ -7139,7 +7160,7 @@ msgid "_Reply"
 msgstr "_Reply"
 
 #: ../calendar/gui/e-calendar-view.c:1716
-#: ../mail/em-folder-view.c:1115
+#: ../mail/em-folder-view.c:1117
 #: ../mail/em-popup.c:559
 #: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
@@ -7209,7 +7230,7 @@ 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:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
@@ -7221,7 +7242,7 @@ msgstr "%02i minute divisions"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524
 #: ../calendar/gui/print.c:1538
@@ -7230,7 +7251,7 @@ msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:746
-#: ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:858
 msgid "am"
@@ -7238,7 +7259,7 @@ msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:749
-#: ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:860
 msgid "pm"
@@ -7248,93 +7269,125 @@ msgstr "pm"
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: ../calendar/gui/e-itip-control.c:770
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#: ../calendar/gui/e-itip-control.c:775
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every time"
 
-#: ../calendar/gui/e-itip-control.c:777
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:789
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every %d weeks on "
 
-#: ../calendar/gui/e-itip-control.c:785
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:798
 msgid " and "
 msgstr " and "
 
-#: ../calendar/gui/e-itip-control.c:792
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: ../calendar/gui/e-itip-control.c:805
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: ../calendar/gui/e-itip-control.c:812
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:834
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every %d months"
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every %d years"
 
-#: ../calendar/gui/e-itip-control.c:827
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: ../calendar/gui/e-itip-control.c:836
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:866
 msgid ", ending on "
 msgstr ", ending on "
 
-#: ../calendar/gui/e-itip-control.c:857
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:888
 msgid "Starts"
 msgstr "Starts"
 
-#: ../calendar/gui/e-itip-control.c:870
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Ends"
 msgstr "Ends"
 
-#: ../calendar/gui/e-itip-control.c:904
+#: ../calendar/gui/e-itip-control.c:936
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Due"
 
-#: ../calendar/gui/e-itip-control.c:944
-#: ../calendar/gui/e-itip-control.c:1001
+#: ../calendar/gui/e-itip-control.c:976
+#: ../calendar/gui/e-itip-control.c:1033
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:961
+#: ../calendar/gui/e-itip-control.c:993
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: ../calendar/gui/e-itip-control.c:1033
-#: ../calendar/gui/e-itip-control.c:1049
-#: ../calendar/gui/e-itip-control.c:1060
-#: ../calendar/gui/e-itip-control.c:1077
+#: ../calendar/gui/e-itip-control.c:1065
+#: ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1092
+#: ../calendar/gui/e-itip-control.c:1109
 #: ../plugins/itip-formatter/itip-view.c:342
 #: ../plugins/itip-formatter/itip-view.c:343
 #: ../plugins/itip-formatter/itip-view.c:410
@@ -7345,296 +7398,296 @@ msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1116
 msgid "<br> Please review the following information, and then select an action from the menu below."
 msgstr "<br> Please review the following information, and then select an action from the menu below."
 
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:687
 #: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1136
-#: ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/e-itip-control.c:1168
+#: ../calendar/gui/itip-utils.c:690
 #: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:693
+#: ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "Declined"
 
-#: ../calendar/gui/e-itip-control.c:1224
+#: ../calendar/gui/e-itip-control.c:1256
 msgid "The meeting has been canceled, however it could not be found in your calendars"
 msgstr "The meeting has been cancelled, however it could not be found in your calendars"
 
-#: ../calendar/gui/e-itip-control.c:1226
+#: ../calendar/gui/e-itip-control.c:1258
 msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "The task has been cancelled, however it could not be found in your task lists"
 
-#: ../calendar/gui/e-itip-control.c:1305
+#: ../calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1306
+#: ../calendar/gui/e-itip-control.c:1338
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1314
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1315
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: ../calendar/gui/e-itip-control.c:1326
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: ../calendar/gui/e-itip-control.c:1335
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: ../calendar/gui/e-itip-control.c:1343
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Cancelation"
 msgstr "Meeting Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1353
-#: ../calendar/gui/e-itip-control.c:1430
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1502
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: ../calendar/gui/e-itip-control.c:1381
+#: ../calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: ../calendar/gui/e-itip-control.c:1382
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Task Information"
 msgstr "Task Information"
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: ../calendar/gui/e-itip-control.c:1391
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: ../calendar/gui/e-itip-control.c:1392
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
 msgstr "Task Update"
 
-#: ../calendar/gui/e-itip-control.c:1403
+#: ../calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: ../calendar/gui/e-itip-control.c:1412
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: ../calendar/gui/e-itip-control.c:1420
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Cancelation"
 msgstr "Task Cancellation"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1487
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:1460
+#: ../calendar/gui/e-itip-control.c:1492
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1493
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1497
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1498
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1503
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: ../calendar/gui/e-itip-control.c:1546
+#: ../calendar/gui/e-itip-control.c:1578
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: ../calendar/gui/e-itip-control.c:1605
+#: ../calendar/gui/e-itip-control.c:1637
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: ../calendar/gui/e-itip-control.c:1638
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1702
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: ../calendar/gui/e-itip-control.c:1904
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: ../calendar/gui/e-itip-control.c:1932
+#: ../calendar/gui/e-itip-control.c:1964
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: ../calendar/gui/e-itip-control.c:1942
+#: ../calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: ../calendar/gui/e-itip-control.c:1954
+#: ../calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:2003
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:2006
 #: ../plugins/itip-formatter/itip-formatter.c:1104
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: ../calendar/gui/e-itip-control.c:1998
-#: ../calendar/gui/e-itip-control.c:2046
+#: ../calendar/gui/e-itip-control.c:2030
+#: ../calendar/gui/e-itip-control.c:2078
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2000
-#: ../calendar/gui/e-itip-control.c:2050
+#: ../calendar/gui/e-itip-control.c:2032
+#: ../calendar/gui/e-itip-control.c:2082
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
-#: ../calendar/gui/e-itip-control.c:2130
+#: ../calendar/gui/e-itip-control.c:2162
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: ../calendar/gui/e-itip-control.c:2202
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr "Update"
 
-#: ../calendar/gui/e-itip-control.c:2230
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Accept"
 
-#: ../calendar/gui/e-itip-control.c:2231
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: ../calendar/gui/e-itip-control.c:2232
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Decline"
 
-#: ../calendar/gui/e-itip-control.c:2261
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: ../calendar/gui/e-itip-control.c:2317
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: ../calendar/gui/e-itip-control.c:2345
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/e-itip-control.c:2377
+#: ../calendar/gui/itip-utils.c:710
 #: ../mail/mail-send-recv.c:451
 #: ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
@@ -7751,7 +7804,7 @@ msgstr "Tentative"
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192
 #: ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:696
 #: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "Delegated"
@@ -8032,52 +8085,52 @@ msgstr "An organiser must be set."
 msgid "At least one attendee is necessary"
 msgstr "At least one attendee is necessary"
 
-#: ../calendar/gui/itip-utils.c:647
-#: ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:649
+#: ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Event information"
 
-#: ../calendar/gui/itip-utils.c:649
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:651
+#: ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "Task information"
 
-#: ../calendar/gui/itip-utils.c:651
-#: ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:653
+#: ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "Journal information"
 
-#: ../calendar/gui/itip-utils.c:653
-#: ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "Free/Busy information"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "Calendar information"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "Updated"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "Refresh"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "Counter-proposal"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Free/Busy information (%s to %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "iCalendar information"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "You must be an attendee of the event."
 
@@ -8179,27 +8232,27 @@ msgstr ""
 "Please be patient while Evolution migrates your folders..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771
-#: ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:770
+#: ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
 
-#: ../calendar/gui/migration.c:1212
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+#: ../calendar/gui/migration.c:1211
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
 msgid "Notes"
 msgstr "Notes"
 
@@ -10095,25 +10148,22 @@ msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1027
+#: ../widgets/misc/e-attachment-bar.c:1012
 msgid "Attachment Bar"
 msgstr "Attachment Bar"
 
@@ -10236,66 +10286,66 @@ msgstr "A_ttach"
 msgid "Insert Attachment"
 msgstr "Insert Attachment"
 
-#: ../composer/e-msg-composer.c:827
+#: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Cannot sign outgoing message: No signing certificate set for this account"
 
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Cannot encrypt outgoing message: No encryption certificate set for this account"
 
-#: ../composer/e-msg-composer.c:1294
-#: ../composer/e-msg-composer.c:2530
+#: ../composer/e-msg-composer.c:1295
+#: ../composer/e-msg-composer.c:2531
 msgid "Hide _Attachment Bar"
 msgstr "Hide _Attachment Bar"
 
-#: ../composer/e-msg-composer.c:1297
-#: ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3897
+#: ../composer/e-msg-composer.c:1298
+#: ../composer/e-msg-composer.c:2534
+#: ../composer/e-msg-composer.c:3898
 msgid "Show _Attachment Bar"
 msgstr "Show _Attachment Bar"
 
-#: ../composer/e-msg-composer.c:1329
-#: ../composer/e-msg-composer.c:1363
+#: ../composer/e-msg-composer.c:1330
+#: ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../composer/e-msg-composer.c:1401
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Could not open file"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: ../composer/e-msg-composer.c:1688
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1723
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Open File"
 
-#: ../composer/e-msg-composer.c:2173
+#: ../composer/e-msg-composer.c:2174
 #: ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651
 #: ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: ../composer/e-msg-composer.c:2276
+#: ../composer/e-msg-composer.c:2277
 msgid "Si_gnature:"
 msgstr "Si_gnature:"
 
-#: ../composer/e-msg-composer.c:2544
-#: ../composer/e-msg-composer.c:3779
-#: ../composer/e-msg-composer.c:3782
+#: ../composer/e-msg-composer.c:2545
+#: ../composer/e-msg-composer.c:3780
+#: ../composer/e-msg-composer.c:3783
 msgid "Compose Message"
 msgstr "Compose Message"
 
-#: ../composer/e-msg-composer.c:5006
+#: ../composer/e-msg-composer.c:5007
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 msgstr "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
 
@@ -10667,8 +10717,8 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: ../filter/filter-file.c:293
-#: ../filter/filter-file.c:299
+#: ../filter/filter-file.c:296
+#: ../filter/filter-file.c:302
 msgid "Choose a file"
 msgstr "Choose a file"
 
@@ -10912,7 +10962,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:522
+#: ../mail/em-folder-view.c:524
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387
@@ -11406,11 +11456,11 @@ msgstr "Important Messages"
 msgid "Messages Not Junk"
 msgstr "Messages Not Junk"
 
-#: ../mail/em-folder-browser.c:1019
+#: ../mail/em-folder-browser.c:1030
 msgid "Account Search"
 msgstr "Account Search"
 
-#: ../mail/em-folder-browser.c:1049
+#: ../mail/em-folder-browser.c:1074
 msgid "All Account Search"
 msgstr "All Account Search"
 
@@ -11521,13 +11571,13 @@ msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
 #: ../mail/em-folder-tree.c:886
-#: ../mail/message-list.c:1824
+#: ../mail/message-list.c:1825
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
 #: ../mail/em-folder-tree.c:888
-#: ../mail/message-list.c:1826
+#: ../mail/message-list.c:1827
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
@@ -11596,15 +11646,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "Copying `%s' to `%s'"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1006
-#: ../mail/em-folder-view.c:1021
+#: ../mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1023
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Select folder"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1021
+#: ../mail/em-folder-view.c:1023
 msgid "C_opy"
 msgstr "C_opy"
 
@@ -11626,313 +11676,313 @@ msgstr "Create folder"
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
-#: ../mail/em-folder-view.c:1114
+#: ../mail/em-folder-view.c:1116
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1118
 #: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../mail/em-folder-view.c:1119
+#: ../mail/em-folder-view.c:1121
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: ../mail/em-folder-view.c:1125
+#: ../mail/em-folder-view.c:1127
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-view.c:1128
 msgid "_Move to Folder..."
 msgstr "_Move to Folder..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1129
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1132
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1133
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1134
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1135
 msgid "Mark as Un_important"
 msgstr "Mark as Un_important"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1136
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1137
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1138
 msgid "Mark for Follo_w Up..."
 msgstr "Mark for Follo_w Up..."
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1140
 msgid "_Label"
 msgstr "_Label"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1139
+#: ../mail/em-folder-view.c:1141
 #: ../widgets/misc/e-dateedit.c:475
 msgid "_None"
 msgstr "_None"
 
-#: ../mail/em-folder-view.c:1144
+#: ../mail/em-folder-view.c:1146
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: ../mail/em-folder-view.c:1145
+#: ../mail/em-folder-view.c:1147
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: ../mail/em-folder-view.c:1148
+#: ../mail/em-folder-view.c:1150
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1151
 msgid "Search Folder from _Subject"
 msgstr "Search Folder from _Subject"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1152
 msgid "Search Folder from Se_nder"
 msgstr "Search Folder from Se_nder"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1153
 msgid "Search Folder from _Recipients"
 msgstr "Search Folder from _Recipients"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1154
 msgid "Search Folder from Mailing _List"
 msgstr "Search Folder from Mailing _List"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1158
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1159
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1160
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1161
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2010
-#: ../mail/em-folder-view.c:2054
+#: ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:2056
 msgid "Default"
 msgstr "Default"
 
-#: ../mail/em-folder-view.c:2153
+#: ../mail/em-folder-view.c:2155
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Print Message"
 
-#: ../mail/em-folder-view.c:2313
+#: ../mail/em-folder-view.c:2315
 msgid "Unable to retrieve message"
 msgstr "Unable to retrieve message"
 
-#: ../mail/em-folder-view.c:2511
+#: ../mail/em-folder-view.c:2513
 msgid "Create _Search Folder"
 msgstr "Create _Search Folder"
 
-#: ../mail/em-folder-view.c:2512
+#: ../mail/em-folder-view.c:2514
 msgid "_From this Address"
 msgstr "_From this Address"
 
-#: ../mail/em-folder-view.c:2513
+#: ../mail/em-folder-view.c:2515
 msgid "_To this Address"
 msgstr "_To this Address"
 
-#: ../mail/em-folder-view.c:2870
+#: ../mail/em-folder-view.c:2872
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: ../mail/em-folder-view.c:2875
+#: ../mail/em-folder-view.c:2877
 msgid "Click to hide/unhide addresses"
 msgstr "Click to hide/unhide addresses"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:503
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: ../mail/em-format-html-display.c:646
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "Fi_nd:"
 
-#: ../mail/em-format-html-display.c:674
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
 msgstr "Fo_rward"
 
-#: ../mail/em-format-html-display.c:679
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "M_atch case"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:930
 #: ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:930
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "This message is not signed. There is no guarantee that this message is authentic."
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:931
 #: ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:931
 msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
 msgstr "This message is signed and is valid meaning that it is very likely that this message is authentic."
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:932
 #: ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:932
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "The signature of this message cannot be verified, it may have been altered in transit."
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:933
 msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
 msgstr "This message is signed with a valid signature, but the sender of the message cannot be verified."
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:939
 #: ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:939
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
 msgstr "This message is not encrypted. Its content may be viewed in transit across the Internet."
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:940
 #: ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:940
 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 "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."
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:941
 #: ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:941
 msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 msgstr "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:942
 #: ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:942
 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 "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."
 
-#: ../mail/em-format-html-display.c:1039
+#: ../mail/em-format-html-display.c:1043
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: ../mail/em-format-html-display.c:1373
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1381
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: ../mail/em-format-html-display.c:1384
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "_Hide"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "_Fit to Width"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "Show _Original Size"
 
-#: ../mail/em-format-html-display.c:1866
+#: ../mail/em-format-html-display.c:1886
 #: ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Attachment"
 
-#: ../mail/em-format-html-display.c:2073
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "Select folder to save all attachments..."
 
-#: ../mail/em-format-html-display.c:2120
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "_Save Selected..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2187
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d at_tachment"
 msgstr[1] "%d at_tachments"
 
-#: ../mail/em-format-html-display.c:2194
-#: ../mail/em-format-html-display.c:2272
+#: ../mail/em-format-html-display.c:2214
+#: ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "S_ave"
 
-#: ../mail/em-format-html-display.c:2205
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "S_ave All"
 
-#: ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "No Attachment"
 
@@ -12952,7 +13002,7 @@ msgstr "Mail _Folder"
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
@@ -14467,81 +14517,81 @@ msgstr "_Expunge"
 msgid "_Open Messages"
 msgstr "_Open Messages"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1020
 msgid "Unseen"
 msgstr "Unseen"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1021
 msgid "Seen"
 msgstr "Seen"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1022
 msgid "Answered"
 msgstr "Answered"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1023
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1024
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: ../mail/message-list.c:1027
+#: ../mail/message-list.c:1028
 msgid "Lowest"
 msgstr "Lowest"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1029
 msgid "Lower"
 msgstr "Lower"
 
-#: ../mail/message-list.c:1032
+#: ../mail/message-list.c:1033
 msgid "Higher"
 msgstr "Higher"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1034
 msgid "Highest"
 msgstr "Highest"
 
-#: ../mail/message-list.c:1466
+#: ../mail/message-list.c:1467
 #: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1473
+#: ../mail/message-list.c:1474
 #: ../plugins/itip-formatter/itip-view.c:202
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: ../mail/message-list.c:1482
+#: ../mail/message-list.c:1483
 #: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: ../mail/message-list.c:1494
+#: ../mail/message-list.c:1495
 #: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1502
+#: ../mail/message-list.c:1503
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1504
+#: ../mail/message-list.c:1505
 #: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2259
+#: ../mail/message-list.c:2261
 #: ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "Messages"
 
-#: ../mail/message-list.c:3647
+#: ../mail/message-list.c:3652
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -14756,6 +14806,14 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "Use _SSL"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "CalDAV Calendar sources"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "CalDAV sources"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Local Calendars"
@@ -15601,7 +15659,7 @@ msgstr "Unsubscribe Folders"
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:422
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -15847,6 +15905,15 @@ msgstr "Select Calendar"
 msgid "_Import"
 msgstr "_Import"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Import to Calendar"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "Imports ICS attachments to calendar."
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17400,19 +17467,19 @@ msgstr "_Work Offline"
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution is currently online. Click on this button to work offline."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution is currently offline. Click on this button to work online."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
@@ -20348,45 +20415,45 @@ msgstr "Western European"
 msgid "Western European, New"
 msgstr "Western European, New"
 
-#: ../widgets/misc/e-charset-picker.c:93
 #: ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
 msgid "Traditional"
 msgstr "Traditional"
 
-#: ../widgets/misc/e-charset-picker.c:96
 #: ../widgets/misc/e-charset-picker.c:97
 #: ../widgets/misc/e-charset-picker.c:98
 #: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Simplified"
 msgstr "Simplified"
 
-#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../widgets/misc/e-charset-picker.c:105
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:174
+#: ../widgets/misc/e-charset-picker.c:175
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Unknown character set: %s"
 
-#: ../widgets/misc/e-charset-picker.c:219
+#: ../widgets/misc/e-charset-picker.c:220
 msgid "Character Encoding"
 msgstr "Character Encoding"
 
-#: ../widgets/misc/e-charset-picker.c:234
+#: ../widgets/misc/e-charset-picker.c:235
 msgid "Enter the character set to use"
 msgstr "Enter the character set to use"
 
-#: ../widgets/misc/e-charset-picker.c:341
+#: ../widgets/misc/e-charset-picker.c:342
 msgid "Other..."
 msgstr "Other..."
 
-#: ../widgets/misc/e-charset-picker.c:482
+#: ../widgets/misc/e-charset-picker.c:483
 msgid "Ch_aracter Encoding"
 msgstr "Ch_aracter Encoding"
 
@@ -20434,6 +20501,14 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#: ../widgets/misc/e-dateedit.c:1634
+msgid "Invalid Date Value"
+msgstr "Invalid Date Value"
+
+#: ../widgets/misc/e-dateedit.c:1660
+msgid "Invalid Time Value"
+msgstr "Invalid Time Value"
+
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expanded"
@@ -20486,20 +20561,21 @@ msgstr "Spacing around expander arrow"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129
-#: ../widgets/misc/e-filter-bar.c:168
+#: ../widgets/misc/e-filter-bar.c:170
+#: ../widgets/misc/e-filter-bar.c:717
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:216
+#: ../widgets/misc/e-filter-bar.c:218
 msgid "Save Search"
 msgstr "Save Search"
 
-#: ../widgets/misc/e-filter-bar.c:249
+#: ../widgets/misc/e-filter-bar.c:251
 msgid "_Searches"
 msgstr "_Searches"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:253
 msgid "Searches"
 msgstr "Searches"
 
@@ -20573,23 +20649,23 @@ msgstr "Reflow model"
 msgid "Column width"
 msgstr "Column width"
 
-#: ../widgets/misc/e-search-bar.c:573
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Search"
 msgstr "_Search"
 
-#: ../widgets/misc/e-search-bar.c:579
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Find Now"
 msgstr "_Find Now"
 
-#: ../widgets/misc/e-search-bar.c:580
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Clear"
 msgstr "_Clear"
 
-#: ../widgets/misc/e-search-bar.c:831
+#: ../widgets/misc/e-search-bar.c:855
 msgid "Item ID"
 msgstr "Item ID"
 
-#: ../widgets/misc/e-search-bar.c:838
+#: ../widgets/misc/e-search-bar.c:862
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3503
@@ -20599,19 +20675,19 @@ 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:971
+#: ../widgets/misc/e-search-bar.c:996
 msgid "Sho_w: "
 msgstr "Sho_w: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:988
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sear_ch: "
 msgstr "Sear_ch: "
 
 #. 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:1000
+#: ../widgets/misc/e-search-bar.c:1025
 msgid " i_n "
 msgstr " i_n "
 
diff --git a/po/es.po b/po/es.po
index 68e16d531a..cfc69ec76f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,10 +11,10 @@
 # This file is distributed under the same license as the evolution package.
 msgid ""
 msgstr ""
-"Project-Id-Version: pan2\n"
+"Project-Id-Version: evolution-2-16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-14 20:04+0100\n"
-"PO-Revision-Date: 2006-11-16 01:14+0100\n"
+"POT-Creation-Date: 2006-11-02 23:54+0100\n"
+"PO-Revision-Date: 2006-11-02 23:52+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -445,7 +445,9 @@ msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 #: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
-msgstr "La imagen que ha seleccionado es grande. ¿Quiere redimensionarla y almacenarla?"
+msgstr ""
+"La imagen que ha seleccionado es grande. ¿quiere redimensionarla y "
+"almacenarla?"
 
 #: ../addressbook/addressbook.error.xml.h:21
 msgid ""
@@ -522,12 +524,14 @@ msgstr ""
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "Ha modificado este contacto. ¿Desea guardar estos cambios?"
+msgstr "Ha hecho modificaciones a este contacto. ¿Desea guardar estos cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr "Los contactos para {0} no estarán disponibles hasta que Evolution se reinicie."
+msgstr ""
+"Sus contactos para {0} no estarán disponibles hasta que Evolution sea "
+"reiniciado."
 
 #: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -540,26 +544,14 @@ msgstr "_Añadir"
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "_Do not save"
-msgstr "_No guardar"
-
-#: ../addressbook/addressbook.error.xml.h:38
-msgid "_Resize"
-msgstr "_Redimensionar"
-
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "_Use as it is"
-msgstr "_Usar tal cual es"
-
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -714,7 +706,7 @@ msgstr "_Tipo:"
 
 #: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy book content locally for offline operation"
-msgstr "Copiar la libreta localmente para operar desconectado"
+msgstr "Copiar el contenido del libro localmente para operación desconectada"
 
 #: ../addressbook/gui/component/addressbook-config.c:984
 #: ../addressbook/gui/component/ldap-config.glade.h:22
@@ -855,7 +847,7 @@ msgstr "Libreta de direcciones _nueva"
 #: ../calendar/gui/e-calendar-table.c:1302
 #: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
 #: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1126
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -907,7 +899,9 @@ msgstr "XML EFolderList para la lista de URIs de completado."
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "Posición del panel vertical, entre las vistas de tarjeta y la vista de lista y el panel de vista previa, en píxeles."
+msgstr ""
+"Posición del panel vertical, entre las vistas de tarjeta y lista y el panel "
+"de vista previa, en píxeles."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
@@ -917,7 +911,9 @@ msgstr "Mostrar el panel de vista previa"
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "El número de caracteres que deben teclearse antes de que Evolution intente autocompletar."
+msgstr ""
+"El número de caracteres que deben teclearse antes de que Evolution intente "
+"auto-completar."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -934,7 +930,7 @@ msgstr ""
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Vertical pane position"
-msgstr "Posición del panel vertical"
+msgstr "Posición vertical del panel"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
@@ -1308,7 +1304,7 @@ msgstr "Contacto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:552
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -2565,20 +2561,20 @@ msgid "Changed"
 msgstr "Modificados"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2586,23 +2582,23 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3136
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3151
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -3005,7 +3001,7 @@ msgstr "Cor_tar"
 #: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
 #: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
 #: ../composer/e-msg-composer.c:3153 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1135 ../mail/message-list.c:1920
+#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1920
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3342,12 +3338,12 @@ msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2534
+#: ../mail/em-folder-view.c:2511
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
-msgid "_Send New Message To..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
 msgstr "_Enviar un mensaje nuevo a…"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:177
@@ -3395,7 +3391,7 @@ msgstr "Charla por vídeo"
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:755
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
+#: ../calendar/gui/gnome-cal.c:2286
 #: ../plugins/exchange-operations/exchange-folder.c:569
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
@@ -3778,12 +3774,8 @@ msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
 #: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Importando…"
 
@@ -3811,6 +3803,13 @@ msgstr "VSC o Tab de Evolution (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importador de VSC y Tab de Evolution"
 
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "Importando…"
+
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de intercambio de datos LDAP (.ldif)"
@@ -4159,7 +4158,8 @@ msgstr "Toda la información en este diario se borrará y no se podrá recuperar
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "Toda la información de estas citas se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información de estas citas se borrará y no puede se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4175,7 +4175,9 @@ msgstr "Toda la información de esta cita se borrará y no se podrá recuperar."
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr "Toda la información en esta entrada del diario se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información en esta entrada del diario se borrará y no se podrá "
+"recuperar."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
@@ -4186,7 +4188,9 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Toda la información acerca de esta tarea se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información acerca de esta tarea será borrada y no puede ser "
+"restaurada."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4237,7 +4241,7 @@ msgstr "¿Seguro que quiere enviar la cita sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
-msgstr "¿Seguro que quiere enviar la tarea sin un resumen?"
+msgstr "¿Seguro que quiere enviar la tarea mensaje sin un resumen?"
 
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
@@ -4282,7 +4286,9 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Se enviarán invitaciones por correo-e a todos los participantes y se les permitirá responder."
+msgstr ""
+"Se enviarán invitaciones por correo-e a todos los participantes y les "
+"permitirá confirmarlas."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4332,23 +4338,31 @@ msgstr ""
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr "El envío de información actualizada permite que otros participantes mantengan su lista de tareas al día."
+msgstr ""
+"Enviando información actualizada se permite que otros participantes "
+"mantengan su lista de tareas al día."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "Hay algunos adjuntos descargándose. Guardar la cita podría resultar en la pérdida de esos adjuntos."
+msgstr ""
+"Hay algunos adjuntos descargándose. Guardar la cita hará que se guarde sin "
+"esos adjuntos pendientes."
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr "Hay algunos adjuntos descargándose. Guardar la tarea podría resultar en la pérdida de esos adjuntos."
+msgstr ""
+"Hay algunos adjuntos descargándose. Guardar la tarea hará que se guarde sin "
+"esos adjuntos pendientes."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
-msgstr "Algunas características quizá no funcionen correctamente con su servidor actual."
+msgstr ""
+"Algunas características quizá no funcionen apropiadamente con su servidor "
+"actual."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4380,23 +4394,23 @@ msgstr "Este calendario se eliminará permanentemente."
 
 #: ../calendar/calendar.error.xml.h:51
 msgid "This memo list will be removed permanently."
-msgstr "Esta lista de notas se eliminará permanentemente."
+msgstr "Esta lista de notas será eliminada permanentemente."
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
-msgstr "Esta lista de tareas se eliminará permanentemente."
+msgstr "Esta lista de tareas será eliminada permanentemente."
 
 #: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
-msgstr "¿Desea guardar los cambios de esta cita?"
+msgstr "¿Desea guardar los cambios a esta cita?"
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
-msgstr "¿Desea guardar los cambios de esta nota?"
+msgstr "¿Desea guardar los cambios a esta nota?"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
-msgstr "¿Desea guardar los cambios de esta tarea?"
+msgstr "¿Desea guardar los cambios a esta tarea?"
 
 #: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
@@ -4424,7 +4438,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
-msgstr "¿Quiere enviar información actualizada de las tareas a los participantes?"
+msgstr "¿Quiere enviar información de tareas actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid ""
@@ -4440,7 +4454,9 @@ msgstr ""
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
-msgstr "Tiene seleccionado un calendario remoto de sólo lectura. Cambie a la vista de calendario y resalte un calendario que pueda aceptar citas."
+msgstr ""
+"Tiene seleccionado un calendario de sólo lectura. Cambie a la vista de "
+"calendario y resalte un calendario que pueda aceptar citas."
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
@@ -4481,7 +4497,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:135
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -5554,7 +5570,7 @@ msgstr "_Sugerir mostrar automáticamente el adjunto"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
 msgid "Selected Calendars for Alarms"
 msgstr "Calendarios seleccionados para alarmas"
 
@@ -5977,7 +5993,7 @@ msgstr[1] "%d mensajes adjuntos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3154
 #: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1031 ../mail/message-list.c:1921
+#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1921
 msgid "_Move"
 msgstr "_Mover"
 
@@ -6274,7 +6290,7 @@ msgstr[1] "%d horas antes de la cita"
 
 #: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes de la cita"
 msgstr[1] "%d minutos antes de la cita"
@@ -6335,7 +6351,6 @@ msgid "Event Description"
 msgstr "Descripción del acontecimiento"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_men:"
@@ -6453,20 +6468,24 @@ msgstr "Para"
 msgid "Sta_rt date:"
 msgstr "Fecha de ini_cio:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "Resu_men"
+
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_Para:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "_Descripción:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "Contenido de la _nota:"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opciones del calendario</b>"
@@ -6637,27 +6656,27 @@ msgstr "día"
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1415
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2155
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2198
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2204
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2250
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que borrar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2381
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -6957,7 +6976,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2902
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2879
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -7116,7 +7135,7 @@ msgstr "imagen-_sin-título.%s"
 
 #: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
 #: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1145 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -7206,7 +7225,7 @@ msgstr "Abrir página _web"
 #: ../calendar/gui/e-calendar-table.c:1283
 #: ../calendar/gui/e-calendar-view.c:1684
 #: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1123
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7351,7 +7370,7 @@ msgstr "Reenviar como i_Calendar…"
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1140
+#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7605,7 +7624,7 @@ msgstr "Aceptado provisionalmente"
 #: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
-msgstr "Rehusado"
+msgstr "Rechazado"
 
 #: ../calendar/gui/e-itip-control.c:1256
 msgid ""
@@ -7648,7 +7667,7 @@ msgstr "Propuesta de reunión"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1353
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
 #: ../calendar/gui/e-itip-control.c:1354
@@ -7718,7 +7737,7 @@ msgstr "Propuesta de tarea"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1430
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
 #: ../calendar/gui/e-itip-control.c:1431
@@ -7860,7 +7879,7 @@ msgstr "Aceptar provisionalmente"
 #: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
-msgstr "Rehusar"
+msgstr "Declinar"
 
 #: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
@@ -8092,7 +8111,7 @@ msgid "Memo sort"
 msgstr "Ordenar nota"
 
 #: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2767
+#: ../calendar/gui/gnome-cal.c:2748
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8152,39 +8171,39 @@ msgstr "%e de %B"
 msgid "Updating query"
 msgstr "Actualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2409
 msgid "_Custom View"
 msgstr "Vista _personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2410
 msgid "_Save Custom View"
 msgstr "_Guardar vista personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2415
 msgid "_Define Views..."
 msgstr "_Definir vistas…"
 
-#: ../calendar/gui/gnome-cal.c:2598
+#: ../calendar/gui/gnome-cal.c:2579
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2617
+#: ../calendar/gui/gnome-cal.c:2598
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: ../calendar/gui/gnome-cal.c:2626
+#: ../calendar/gui/gnome-cal.c:2607
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Cargando notas en %s"
 
-#: ../calendar/gui/gnome-cal.c:2732
+#: ../calendar/gui/gnome-cal.c:2713
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/gnome-cal.c:3660
+#: ../calendar/gui/gnome-cal.c:3641
 msgid "Purging"
 msgstr "Compactando"
 
@@ -10423,7 +10442,7 @@ msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
 #: ../composer/e-msg-composer-hdrs.c:666
 msgid "_Bcc:"
-msgstr "Cc_o:"
+msgstr "_Cco:"
 
 #: ../composer/e-msg-composer-hdrs.c:667
 msgid ""
@@ -10549,7 +10568,7 @@ msgstr ""
 "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Porque «{1}»."
 
@@ -10844,7 +10863,7 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
@@ -10912,7 +10931,7 @@ msgstr "ahora"
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: ../filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
-msgstr "%e/%b/%Y"
+msgstr "%e-%b-%Y"
 
 # Aquí time se refiere a fecha
 #: ../filter/filter-datespec.c:415
@@ -10946,11 +10965,11 @@ msgstr "Prueba"
 
 #: ../filter/filter-rule.c:799
 msgid "_Search name:"
-msgstr "_Nombre de la búsqueda:"
+msgstr "_Buscar nombre:"
 
 #: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
-msgstr "Buscar elementos que cumplen con estos criterios"
+msgstr "buscar los elementos que cumplan con los siguientes criterios"
 
 #: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
@@ -11013,7 +11032,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -11787,7 +11806,7 @@ msgstr "Carpeta _nueva…"
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -11796,14 +11815,14 @@ msgstr "_Vaciar papelera"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1031
-#: ../mail/em-folder-view.c:1046
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1023
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1046
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11825,154 +11844,146 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:66
-msgid "Mail Deletion Failed"
-msgstr "Ha fallado el borrado del correo"
-
-#: ../mail/em-folder-view.c:968 ../mail/mail.error.xml.h:119
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "No tiene suficientes permisos para borrar este correo."
-
-#: ../mail/em-folder-view.c:1139 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1141 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/em-folder-view.c:1144 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1127
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1128
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1129
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1132
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1133
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1134
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1135
 msgid "Mark as Un_important"
 msgstr "Marcar como no _importante"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1136
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1137
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1138
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1140
 msgid "_Label"
 msgstr "_Etiqueta"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1164 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1141 ../widgets/misc/e-dateedit.c:475
 msgid "_None"
-msgstr "_Ninguna"
+msgstr "_Ninguno"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1146
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1170
+#: ../mail/em-folder-view.c:1147
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1173
+#: ../mail/em-folder-view.c:1150
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: ../mail/em-folder-view.c:1174
+#: ../mail/em-folder-view.c:1151
 msgid "Search Folder from _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1152
 msgid "Search Folder from Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1153
 msgid "Search Folder from _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1177
+#: ../mail/em-folder-view.c:1154
 msgid "Search Folder from Mailing _List"
 msgstr "Carpeta de búsqueda según la _lista de correo"
 
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1158
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1159
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1160
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1184
+#: ../mail/em-folder-view.c:1161
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2035 ../mail/em-folder-view.c:2079
+#: ../mail/em-folder-view.c:2012 ../mail/em-folder-view.c:2056
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2178
+#: ../mail/em-folder-view.c:2155
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: ../mail/em-folder-view.c:2338
+#: ../mail/em-folder-view.c:2315
 msgid "Unable to retrieve message"
 msgstr "No no pudo obtenerse el mensaje"
 
-#: ../mail/em-folder-view.c:2536
+#: ../mail/em-folder-view.c:2513
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2537
+#: ../mail/em-folder-view.c:2514
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2538
+#: ../mail/em-folder-view.c:2515
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:2895
+#: ../mail/em-folder-view.c:2872
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:2900
+#: ../mail/em-folder-view.c:2877
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
@@ -12373,6 +12384,10 @@ msgstr "_Responder al remitente"
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "_Enviar un mensaje nuevo a…"
+
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
 msgstr "_Añadir a la libreta de direcciones"
@@ -12881,7 +12896,7 @@ msgstr "Agrupar la lista de mensajes."
 
 #: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
-msgstr "Agrupar la lista de mensajes"
+msgstr "Agrupar la lista de mensajes por conversaciones"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Thread the message-list based on Subject"
@@ -12949,11 +12964,11 @@ msgstr "El elemento del menú «Ver/Cc» está marcado."
 
 #: ../mail/evolution-mail.schemas.in.in.h:114
 msgid "View/From menu item is checked"
-msgstr "El elemento del menú «Ver/De» está marcado"
+msgstr "El elemento del menú «Ver/Desde» está marcado"
 
 #: ../mail/evolution-mail.schemas.in.in.h:115
 msgid "View/From menu item is checked."
-msgstr "El elemento del menú «Ver/De» está marcado."
+msgstr "El elemento del menú «Ver/Desde» está marcado."
 
 #: ../mail/evolution-mail.schemas.in.in.h:116
 msgid "View/PostTo menu item is checked"
@@ -13456,7 +13471,7 @@ msgstr "Detecta si el correo entrante es spam"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
-msgstr "Vacia_r"
+msgstr "_Vaciar"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
@@ -13987,8 +14002,8 @@ msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Filtrado de mensajes seleccionados"
+msgid "Filtering Folder"
+msgstr "Filtrando carpeta"
 
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
@@ -14266,16 +14281,11 @@ msgstr "Carpeta de búsqueda nueva"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «{0}». Use un nombre diferente."
-
-#: ../mail/mail.error.xml.h:2
-msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14287,7 +14297,7 @@ msgstr ""
 "Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o "
 "salir."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14295,14 +14305,14 @@ msgstr ""
 "Se ha solicitado una notificación de recepción para «{1}». ¿Quiere enviar "
 "una notificación de recepción a {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr ""
 "Ya existe una firma con el nombre «{0}». Por favor, use un nombre diferente."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14310,25 +14320,25 @@ msgstr ""
 "Añadir una línea de Asunto con significado al mensaje dará a sus "
 "destinatarios una idea de qué trata su correo."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "¿Seguro que quiere borrar esta cuenta y todos sus proxies?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "¿Seguro que quiere desactivar esta esta cuenta y borrar todos sus proxies?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "¿Seguro que quiere abrir {0} mensajes a la vez?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14336,7 +14346,7 @@ msgstr ""
 "¿Seguro que quiere eliminar todos los mensajes borrados en todas las "
 "carpetas?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14344,79 +14354,79 @@ msgstr ""
 "¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
 "la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "¿Seguro que quiere enviar un mensaje sin un asunto?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Porque «{0}»."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Porque «{2}»."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Firma en blanco"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "No es posible añadir la carpeta de búsqueda «{0}»."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es posible copiar la carpeta: «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "No es posible crear la carpeta: «{0}»."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "No es posible crear el directorio de guardado temporal."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "No es posible crear el directorio de guardado, debido a «{1}»"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "No es posible borrar la carpeta «{0}»."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "No es posible borrar la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "No es posible editar la carpeta de búsqueda «{0}» porque no existe."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es posible mover la carpeta «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "No es posible abrir el origen «{1}»"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "No es posible abrir el origen «{2}»."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "No es posible abrir el destino «{2}»."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14426,31 +14436,31 @@ msgstr ""
 "instalación. No será posible usar este proveedor hasta que pueda aceptar "
 "esta licencia."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "No es posible renombrar «{0}» a «{1}»."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "No es posible renombrar o mover la carpeta de sistema «{0}»."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "No es posible guardar los cambios en la cuenta."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "No es posible guardar al directorio «{0}»."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "No es posible guardar al archivo «{0}»."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "No es posible establecer el script de firma «{0}»."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14459,71 +14469,71 @@ msgstr ""
 "contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
 "puede estar activada."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "No es posible guardar el archivo de firma."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "¿Desea borrar «{0}»?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "¿Desea borrar la cuenta?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "¿Desea descartar los cambios?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "No borrar"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "No desactivar"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "¿Desea realizar esta operación en las subcarpetas?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "¿Quiere marcar todos los mensajes como leídos?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Error al efectuar operación."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Error al {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "El archivo existe pero no es un archivo regular."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14531,11 +14541,11 @@ msgstr ""
 "Si borra la carpeta, todo su contenido y el de sus subcarpetas se borrará "
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continúa, las cuentas proxy se borrarán permanentemente."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14543,11 +14553,11 @@ msgstr ""
 "Si continúa, la información de la cuenta y toda la\n"
 "información del proxy se borrará permanentemente."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14555,19 +14565,19 @@ msgstr ""
 "Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14579,39 +14589,39 @@ msgstr ""
 "listará todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Marca todos los mensajes como leídos"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "¿Desea marcar todos los mensajes en las aubcarpetas como leídos?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuración de la cuenta e inténtelo otra vez."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envíe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 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."
@@ -14620,7 +14630,7 @@ msgstr ""
 "Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de "
 "la caja de entrada."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14632,49 +14642,49 @@ msgstr ""
 "{0}\n"
 "¿Enviar de todas formas?"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Consultando al servidor"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultando al servidor por una lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14682,7 +14692,7 @@ msgstr ""
 "Evolution requiere las carpetas de sistema para funcionar correctamente y no "
 "pueden renombrarse, moverse o borrarse."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14698,7 +14708,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
 "destinatario a Para: o Cc: "
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14712,7 +14722,7 @@ msgstr ""
 "   «{1}» \n"
 "y se han actualizado."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14726,11 +14736,11 @@ msgstr ""
 "      «{1}»\n"
 "Y se han actualizado."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14739,7 +14749,7 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14747,13 +14757,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Este mensaje no puede enviarse porque no ha especificado ningún destinatario"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14761,11 +14771,11 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticación requerido y quizá no "
 "soporte ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14773,11 +14783,11 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14785,39 +14795,39 @@ msgstr ""
 "No es posible abrir la carpeta de borradores para esta cuenta. ¿Quiere usar "
 "la carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14827,27 +14837,27 @@ msgstr ""
 "Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "_Do not Mark as Read"
 msgstr "_No marcar como leído"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "C_ompactar"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
@@ -15148,11 +15158,11 @@ msgstr "Usar _SSL"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "CalDAV Calendar sources"
-msgstr "Fuentes de calendarios CalDAV"
+msgstr "Fuentes de calendario CalDAV"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV sources"
-msgstr "Fuentes CalDAV"
+msgstr "Fuentes de calendarios CalDAV"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
@@ -15274,11 +15284,11 @@ msgstr "Fuentes predeterminadas"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr ""
-"Proporciona funcionalidad para marcar un calendario o una libreta de "
-"direcciones como el o la predeterminada."
+"Proporciona funcionalidad para hacer calendarios o libretas de direcciones "
+"como la predeterminada."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15332,7 +15342,7 @@ msgid ""
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 "El mensaje especificado abajo se enviará automáticamente a cada\n"
-"persona que le envíe correo mientras está fuera de la oficina."
+" persona que le envíe correo mientras está fuera de la oficina."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -15347,12 +15357,12 @@ msgstr "Ahora estoy en la oficina"
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
-msgstr "Cambie la contraseña para la cuenta de Exchange"
+msgstr "Cambia la contraseña para la cuenta de Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
-msgstr "Cambiar contraseña"
+msgstr "Cambia la contraseña"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:335
@@ -15415,11 +15425,15 @@ msgstr ""
 msgid ""
 "The current password does not match the existing password for your account. "
 "Please enter the correct password"
-msgstr "La contraseña actual no coincide con la contraseña existente para su cuenta. Introduzca la contraseña correcta"
+msgstr ""
+"La contraseña actual no coincide con la contraseña existente para su cuenta. "
+"Por favor introduzca la contraseña correcta"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "Las dos contraseñas no coinciden. Vuelva a introducir las contraseñas."
+msgstr ""
+"Las dos contraseñas no coinciden. Por favor, vuelva a introducir las "
+"contraseñas."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Confirm Password:"
@@ -15475,7 +15489,7 @@ msgstr "No es posible acceder al Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
-msgstr "No es posible encontrarse a sí mismo en el Active Directory"
+msgstr "No es posible encontrar a sí mismo en el Active Directory"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
@@ -15604,6 +15618,10 @@ msgstr "Su contraseña caducará en 7 días…"
 msgid "_Change Password"
 msgstr "_Cambiar contraseña"
 
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "Botón_ok"
+
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Permiso denegado.)"
@@ -15638,7 +15656,7 @@ msgstr "Crear subcarpetas"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
-msgstr "Borrar cualquier elemento"
+msgstr "Delegar cualquier elemento"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
@@ -15658,11 +15676,11 @@ msgstr "Contacto de la carpeta"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 msgid "Folder owner"
-msgstr "Propietario de la carpeta"
+msgstr "Dueño de la carpeta"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 msgid "Folder visible"
-msgstr "Carpeta visible"
+msgstr "Visibilidad de la carpeta"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
@@ -15711,7 +15729,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
-msgstr "No es posible mostrar carpetas."
+msgstr "No es posiblen mostrar carpetas."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot perform the operation."
@@ -15739,7 +15757,7 @@ msgid ""
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
-"No es posible configurar la cuenta de Exchange porque\n"
+"No es posible configurar la cuenta de Exchange porque \n"
 "ocurrió un error desconocido. Compruebe el URL,\n"
 "usuario y contraseña e inténtelo otra vez."
 
@@ -15967,7 +15985,8 @@ msgstr "Operación no soportada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "Está cerca de su cuota disponible para almacenar correo en este servidor."
+msgstr ""
+"Está cerca de su cuota disponible para almacenar correo en este servidor."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You cannot make yourself your own delegate"
@@ -16151,8 +16170,8 @@ msgid "_Not Shared"
 msgstr "_Sin compartir"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With..."
-msgstr "_Compartir con…"
+msgid "_Shared With ..."
+msgstr "_Compartido con…"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
@@ -16840,7 +16859,7 @@ msgstr "_Abrir calendario"
 #: ../plugins/itip-formatter/itip-view.c:788
 #: ../plugins/itip-formatter/itip-view.c:793
 msgid "_Decline"
-msgstr "_Rehusar"
+msgstr "_Declinar"
 
 #: ../plugins/itip-formatter/itip-view.c:762
 #: ../plugins/itip-formatter/itip-view.c:767
@@ -16852,7 +16871,7 @@ msgstr "_Aceptar"
 
 #: ../plugins/itip-formatter/itip-view.c:765
 msgid "_Decline all"
-msgstr "_Rehusar todo"
+msgstr "_Declinar todo"
 
 #: ../plugins/itip-formatter/itip-view.c:766
 msgid "_Tentative all"
@@ -17041,7 +17060,8 @@ msgstr "_Lista de correo"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr ""
 "Proporciona acciones para comandos comunes de listas de correo (suscribirse, "
 "desuscribirse…)."
@@ -17454,7 +17474,7 @@ msgid "Save attachments"
 msgstr "Guarda los adjuntos"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
+msgid "Save Attachments ..."
 msgstr "Guardar adjuntos…"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
@@ -17653,7 +17673,7 @@ msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "Agrupación según el asunto"
+msgstr "Agrupar según el asunto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -17790,7 +17810,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether or not the window should be maximized."
-msgstr "Indica si la ventana debe o no maximizarse."
+msgstr "Indica si la ventana deberían o no maximizarse."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the sidebar should be visible."
@@ -17798,11 +17818,11 @@ msgstr "Indica si la barra lateral debe ser visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the status bar should be visible."
-msgstr "Indica si la barra de estado debe ser visible."
+msgstr "Indica si la barra de estado debería ser visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the toolbar should be visible."
-msgstr "Indica si la barra de herramientas debe ser visible."
+msgstr "Indica si la barra de herramientas debería ser visible."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid ""
@@ -17813,7 +17833,7 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Whether the window buttons should be visible."
-msgstr "Indica si la los botones de la ventana deben ser visibles."
+msgstr "Indica si la los botones de la ventana deberían ser visibles."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:29
 msgid "Window button style"
@@ -21113,15 +21133,13 @@ msgstr "Anchura de columna"
 msgid "_Search"
 msgstr "_Buscar"
 
-# En conflicto con _Buscar del menu principal
 #: ../widgets/misc/e-search-bar.c:603
 msgid "_Find Now"
-msgstr "B_uscar ahora"
+msgstr "_Buscar ahora"
 
-# Conflicto con _Ver del menú principal
 #: ../widgets/misc/e-search-bar.c:604
 msgid "_Clear"
-msgstr "Vacia_r"
+msgstr "_Vaciar"
 
 #: ../widgets/misc/e-search-bar.c:855
 msgid "Item ID"
@@ -21133,12 +21151,11 @@ msgstr "ID de elemento"
 msgid "Text"
 msgstr "Texto"
 
-# #En conflicto con _Mensaje
 #. 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:996
 msgid "Sho_w: "
-msgstr "M_ostrar: "
+msgstr "_Mostrar: "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
@@ -21508,7 +21525,7 @@ msgstr "Código DnD"
 #: ../widgets/table/e-table-field-chooser.c:84
 #: ../widgets/table/e-table-header-item.c:1906
 msgid "Full Header"
-msgstr "Cabecera completa"
+msgstr "Encabezado completo"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
diff --git a/po/et.po b/po/et.po
index d1b348f878..9cfc099bd8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,4 +1,4 @@
-# Evolutioni eesti keele tõlge.
+# Evolution'i eesti keele tõlge.
 # Estonian translation of Evolution.
 #
 # Copyright (C) 2001-2006 Free Software Foundation, Inc.
@@ -7,15 +7,15 @@
 # Ilmar Kerm <ikerm@hot.ee>, 2001.
 # Ivar Smolin <okul@linux.ee>, 2002, 2003, 2005, 2006.
 # Kaarel Jõgi <kaarel@gg.ee>, 2002.
-# Priit Laes <amd@store20.com>, 2003-2006.
+# Priit Laes <amd@store20.com>, 2003-2005.
 #
 # Riigi- ja linnanimed: Marek Sepp <marek.sepp@ttu.ee>, 2001, 2002
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Evolution HEAD\n"
+"Project-Id-Version: Evolution 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-04 07:17+0200\n"
+"POT-Creation-Date: 2006-10-18 15:06+0200\n"
 "PO-Revision-Date: 2006-11-19 00:06+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -171,7 +171,7 @@ msgstr "%A, %d. %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -205,7 +205,7 @@ msgstr "%d. %B %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -585,7 +585,7 @@ msgstr "Seadista automaatlõpetamist siit"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "Kontaktid"
@@ -627,8 +627,8 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
@@ -645,8 +645,8 @@ msgstr "Kohalikus arvutis"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 #: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
@@ -2853,7 +2853,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
@@ -3001,7 +3001,7 @@ msgstr "_Aseta"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "Iga kategooria"
 
@@ -5186,27 +5186,27 @@ msgstr "Minut, millal tööpäev algab"
 msgid "daylight savings time"
 msgstr "talve- ja suveaja nihe"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "Kategooria on"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "Vastavus puudub"
 
@@ -5244,13 +5244,13 @@ msgstr "päeva"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Veebis"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Sünnipäevad ja aastapäevad"
 
@@ -5971,7 +5971,7 @@ msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1510
-#: ../mail/em-format-html-display.c:2267
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "Näita manuseid"
 
@@ -6196,33 +6196,33 @@ msgstr "_Lisa "
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d päev enne sündmust"
 msgstr[1] "%d päeva enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d tund enne sündmust"
 msgstr[1] "%d tundi enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut enne sündmust"
 msgstr[1] "%d minutit enne sündmust"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2955
 msgid "Customize"
 msgstr "Kohandatud"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2960
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
@@ -6906,13 +6906,13 @@ msgstr "Klõpsa %s avamiseks"
 msgid "Untitled"
 msgstr "Nimetu"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Alguskuupäev:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4
@@ -6921,7 +6921,7 @@ msgstr "Alguskuupäev:"
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Veebileht:"
@@ -7044,7 +7044,7 @@ msgstr "Määratud"
 msgid "Save As..."
 msgstr "Salvestamine teise nimega..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
@@ -7068,7 +7068,7 @@ msgstr "Säti _taustapildiks"
 msgid "_Save Selected"
 msgstr "_Salvesta valik"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
@@ -7357,7 +7357,7 @@ 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:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutiline jaotamine"
@@ -7369,20 +7369,20 @@ msgstr "%02i-minutiline jaotamine"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 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:746 ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pl"
@@ -7528,12 +7528,12 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:687
 #: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "Nõusolek antud"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
 #: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
@@ -7541,7 +7541,7 @@ msgstr "Proovinõusolek antud"
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "Tagasi lükatud"
@@ -7808,7 +7808,7 @@ msgstr "Värskenda vastaja olekut"
 msgid "Send Latest Information"
 msgstr "Värskeimate andmete saatmine"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
 #: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7913,7 +7913,7 @@ msgstr "Katseline"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:696
 #: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "Delegeeritud"
@@ -8187,48 +8187,48 @@ msgstr "Korraldaja peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osalejat"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Andmed sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "Andmed ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "Päevaraamatu andmed"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud andmed"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "Kalendri andmed"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud andmed (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
@@ -8334,24 +8334,24 @@ msgstr ""
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Vanade sätete migreerimine failist evolution/config.xmldb pole võimalik"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit `%s' pole võimalik siirdada"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' pole võimalik siirdada"
 
-#: ../calendar/gui/migration.c:1212
+#: ../calendar/gui/migration.c:1211
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
@@ -11886,39 +11886,39 @@ msgid "Click to hide/unhide addresses"
 msgstr "Klõpsa aadresside peitmiseks/nähtavale toomiseks"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "_Otsing:"
 
-#: ../mail/em-format-html-display.c:675
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
 msgstr "_Edasta"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "_Tõstutundlik"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik tagada."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11926,11 +11926,11 @@ msgstr ""
 "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
 "on tõese sõnumiga."
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11938,11 +11938,11 @@ msgstr ""
 "Selle sõnumi signatuuri pole võimalik verifitseerida. See võib olla sõnumi "
 "kohaletoimetamise käigus asendatud."
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11950,11 +11950,11 @@ msgstr ""
 "See sõnum on signeeritud korrektse allkirjaga, kuid selle saatjat pole "
 "võimalik verifitseerida."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11962,11 +11962,11 @@ msgstr ""
 "See sõnum ei ole krüptitud ja seetõttu võib see interneti kaudu liikudes "
 "olla kolmandatele osapooltele nähtav."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 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 "
@@ -11976,22 +11976,22 @@ msgstr ""
 "olema väga raske aga sugugi mitte võimatu mõistliku aja jooksul sõnumi sisu "
 "näha."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "See sõnum on krüptitud.  Sõnumi sisu ei tohiks olla teistele iskutele loetav."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:942
 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 "
@@ -12000,72 +12000,72 @@ msgstr ""
 "See sõnum on krüptitud tugeva krüptoalgoritmiga. Võimalikul ründajal peaks "
 "olema väga raske mõistliku aja jooksul sõnumi krüpteeringut lahti murda."
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vaata sertifikaati"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole vaadatav"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "sellel ajal: %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "_Salvesta valitud..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ma_nus"
 msgstr[1] "%d ma_nust"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "Salves_ta"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "_Salvesta kõik"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "Manus puudub"
 
@@ -13132,7 +13132,7 @@ msgstr "_Postikaust"
 msgid "Create a new mail folder"
 msgstr "Uue postikausta loomine"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Tõrge e-posti seadistuste või kaustade uuendamisel"
 
@@ -14622,7 +14622,6 @@ msgstr ""
 "See kaust on lisatud muu tegevuse tulemusel,\n"
 "kui vaja, saad selle lisamist Otsingukaustade redaktoris kinnitada."
 
-
 #: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
@@ -15023,6 +15022,14 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "Kasutatakse _SSL-i"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "CalDAV-i kalendriallikad"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "CalDAV-i allikad"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Kohalikud kalendrid"
@@ -16085,7 +16092,6 @@ msgstr "Volinik"
 msgid "<b>Account Name</b>"
 msgstr "<b>Konto nimi</b>"
 
-# Proxy tähendab siin kedagi, kes on volitatud
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
 msgid "Proxy Login"
 msgstr "Volitatatu kasutajanimi"
@@ -16098,7 +16104,6 @@ msgstr "Volitatatu kasutajanimi"
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-# Proxy tähendab siin kedagi, kes on volitatud
 #. 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
@@ -16106,12 +16111,10 @@ msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 msgid "_Proxy Login..."
 msgstr "_Volitatu kasutajanimi..."
 
-# Proxy tähendab siin kedagi, kes on volitatud
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 
-# Proxy tähendab siin kedagi, kes on volitatud
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Voliniku sakk on saadaval ainult juhul, kui konto on lubatud."
@@ -16169,6 +16172,15 @@ msgstr "Kalendri valimine"
 msgid "_Import"
 msgstr "_Impordi"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Kalendrisse importimine"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "ICS-manuste importimine kalendrisse."
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17791,23 +17803,23 @@ msgstr "Siirdu aut_onoomsesse olekusse"
 msgid "Work Offline"
 msgstr "Siirdumine autonoomsesse olekusse"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks "
 "klõpsa seda nuppu."
 
-#: ../shell/e-shell-window.c:387
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub autonoomsesse olekusse."
 
-#: ../shell/e-shell-window.c:394
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution on hetkel autonoomses olekus.  Võrku ühendumiseks klõpsa seda "
 "nuppu."
 
-#: ../shell/e-shell-window.c:794
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
@@ -20859,7 +20871,7 @@ msgstr "Ruum laiendaja noole ümber"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:715
+#: ../widgets/misc/e-filter-bar.c:717
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
@@ -21688,20 +21700,3 @@ msgstr "Välksõnumikontekst"
 #: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr ""
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV-i kalendriallikad"
-
-#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
-msgstr "CalDAV-i allikad"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Kalendrisse importimine"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "ICS-manuste importimine kalendrisse."
diff --git a/po/fi.po b/po/fi.po
index 5d1211a2a3..2d5eeaddf2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-26 09:12+0300\n"
-"PO-Revision-Date: 2006-10-26 09:12+0300\n"
+"POT-Creation-Date: 2006-10-17 07:09+0300\n"
+"PO-Revision-Date: 2006-10-17 07:13+0300\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -537,26 +537,14 @@ msgstr "_Lisää"
 msgid "_Discard"
 msgstr "Hylkää"
 
-#: ../addressbook/addressbook.error.xml.h:37
-msgid "_Do not save"
-msgstr "Ä_lä tallenna"
-
-#: ../addressbook/addressbook.error.xml.h:38
-msgid "_Resize"
-msgstr "_Muuta kokoa"
-
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "_Use as it is"
-msgstr "Käytä _sellaisenaan"
-
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -1301,7 +1289,7 @@ msgstr "Yhteystieto"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:552
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "Yhteystietojen muokkain"
 
@@ -2558,20 +2546,20 @@ msgid "Changed"
 msgstr "Muutettu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
 msgstr "_Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2579,23 +2567,23 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' sisältää virheellisen muotoilun"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3136
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' on tyhjä"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3151
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -3338,8 +3326,8 @@ msgstr "_Avaa linkki selaimessa"
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
-msgid "_Send New Message To..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
 msgstr "Lähetä uusi _viesti..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:177
@@ -3764,12 +3752,8 @@ msgid "GTK Tree View"
 msgstr "GTK puunäkymä"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
 #: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Tuodaan..."
 
@@ -3797,6 +3781,13 @@ msgstr "Evolutionin CSV tai Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolutionin CSV- ja Tab-tuoja"
 
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "Tuodaan..."
+
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP-tiedostonvaihtomuoto (.ldif)"
@@ -4478,7 +4469,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:133
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_Lähetä"
 
@@ -6216,7 +6207,7 @@ msgstr[1] "%d tuntia ennen tapaamista"
 
 #: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuutti ennen tapaamista"
 msgstr[1] "%d minuuttia ennen tapaamista"
@@ -6277,7 +6268,6 @@ msgid "Event Description"
 msgstr "Tapahtuman kuvaus:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
@@ -6395,20 +6385,24 @@ msgstr "Vastaanottaja"
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "_Yhteenveto"
+
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "Vastaan_ottajat:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-msgid "_Description:"
-msgstr "K_uvaus:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "_Muistilapun sisältö:"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenterin vaihtoehdot</b>"
@@ -7584,8 +7578,8 @@ msgstr "Kokousehdotus"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1353
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> toivoo liittämistään olemassaolevaan kokoukseen."
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr "<b>%s</b> toivoo pääsyä olemassaolevaan kokoukseen."
 
 #: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
@@ -7654,8 +7648,8 @@ msgstr "Tehtäväehdotus"
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1430
 #, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään."
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään"
 
 #: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
@@ -10481,7 +10475,7 @@ msgstr ""
 "&quot;{0}&quot; johtuen sinun täytyy ehkä valita eri sähköpostin asetukset."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "Syy: &quot;{1}&quot;."
 
@@ -10778,7 +10772,7 @@ msgstr "Haluatko ylikirjoittaa?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Tiedosto &quot;{0}&quot;on jo olemassa."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
@@ -10947,7 +10941,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -11722,7 +11716,7 @@ msgstr "_Uusi kansio..."
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -12301,6 +12295,10 @@ msgstr "_Vastaa lähettäjälle"
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "Lähetä uusi _viesti..."
+
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
 msgstr "_Lisää osoitekirjaan"
@@ -13909,8 +13907,8 @@ msgid "Pinging %s"
 msgstr "Pingataan %s"
 
 #: ../mail/mail-ops.c:105
-msgid "Filtering Selected Messages"
-msgstr "Suodatetaan valittuja viestejä"
+msgid "Filtering Folder"
+msgstr "Suodatetaan kansiota"
 
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
@@ -14188,15 +14186,10 @@ msgstr "Uusi hakunäkymä"
 
 #: ../mail/mail.error.xml.h:1
 msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
-
-#: ../mail/mail.error.xml.h:2
-msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "Kansio nimeltä &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
+msgstr "Kansio nimeltään &quot;{1}&quot; on jo olemassa. Valitse toinen nimi."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14207,7 +14200,7 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa sen yli, lisätä kansioon tai poistua."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14215,13 +14208,13 @@ msgstr ""
 "Vastaanoton kuittausta pyydetään viestille &quot;{1}&quot;. Lähetetäänkö "
 "kuittaus osoitteeseen {0}?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
 msgstr "Nimellä &quot;{0}&quot; on jo allekirjoitus. Anna toinen nimi."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14229,33 +14222,33 @@ msgstr ""
 "Merkityksellisen aihe-kentän lisääminen viesteihisi helpottaa vastaanottajaa "
 "ymmärtämään, mistä viestissä on kyse."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Haluatko varmasti poistaa tämän tilin ja kaikki sen välimuistit?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Haluatko varmasti poistaa tämän tilin?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Haluatko varmasti poistaa tämän tilin käytöstä ja poistaa kaikki sen "
 "välimuistit?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Haluatko varmasti avata {0} viestiä kerralla?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Haluatko varmasti poistaa kaikki poistetut viestit kaikista kansioista?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14264,82 +14257,82 @@ msgstr ""
 "{0}&quot;\n"
 "?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Haluatko varmasti lähettää viestin HTML-muodossa?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Haluatko varmasti lähettää viestin, jossa on vain piilokopion vastaanottajia "
 "(Bcc)?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Haluatko varmasti lähettää ilman aihetta?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Syy: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Syy: &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Tyhjä allekirjoitus"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Hakunäkymää &quot;{0}&quot; ei voida lisätä."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida kopioida kohtaan &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida luoda."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaista hakemistoa ei voida luoda."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Tallennushakemisto ei voida luoda, syy: &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida poistaa."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Järjestelmäkansiota &quot;{0}&quot; ei voida poistaa."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Hakunäkymää &quot;{0}&quot; ei voida muokata, koska sitä ei ole olemassa."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kansiota &quot;{0}&quot; ei voida siirtää  kohtaan &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Lähdettä &quot;{1}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Lähdettä &quot;{2}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Kohdetta &quot;{2}&quot; ei voida avata."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14348,32 +14341,32 @@ msgstr ""
 "Lisenssitiedostoa &quot;{0}&quot; ei voida lukea asennusongelman takia. Et "
 "voi käyttää tätä lähdettä ennen kuin voit hyväksyä lisenssin."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; ei voida nimetä uudestaan nimelle &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 "Järjestelmäkansiota &quot;{0}&quot; ei voida siirtää tai nimetä uudestaan."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Hakemistoon &quot;{0}&quot; ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Tiedostoon &quot;{0}&quot; ei voida tallentaa."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Allekirjoitus-skriptiä &quot;{0}&quot; ei voida asettaa."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14382,71 +14375,71 @@ msgstr ""
 "salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista myös ettei "
 "CapsLock ole päällä."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Allekirjoitustiedostoa ei voi tallentaa."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Poista &quot;{0}&quot;"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Poista tili?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Hylkää muutokset?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Älä poista"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Älä poista käytöstä"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Haluatko toiminnon tehtäväksi alikansioissa?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Haluatko merkitä kaikki viestit luetuiksi?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Syötä salasana."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Virhe ladattaessa suodatinten määrittelyjä."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Virhe suoritettessa toimenpidettä."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Virhe suoritettaessa komentoa \"{0}\"."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, mutta sitä ei voida ylikirjoittaa."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Tiedosto on olemassa mutta ei ole tavallinen tiedosto."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14454,11 +14447,11 @@ msgstr ""
 "Jos poistat kansion, menetetään kaikki sen sisältö ja alikansiot "
 "sisältöineen pysyvästi."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Jos jatkat, kaikki välimuistitilit poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14466,11 +14459,11 @@ msgstr ""
 "Jos jatkat, tilin tiedot ja kaikki siihen liittyvä välimuistitieto "
 "poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14478,19 +14471,19 @@ msgstr ""
 "Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
 "uudestaan."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Älä välitä"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Virheellinen tunnistautuminen"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Sähköpostin suodattimet päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14502,39 +14495,39 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Merkitse kaikki viestit luetuiksi"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "Merkitse kaikki alikansioiden viestit luetuksi?"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Liian monen viestin avaus kerralla voi viedä pitkän ajan."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Ota tili käyttöön tai lähetä käyttäen toista tiliä."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 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."
@@ -14543,7 +14536,7 @@ msgstr ""
 "sähköpostiosoitteita napsauttamalla Vastaanottaja: -painiketta kentän "
 "vieressä."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14555,47 +14548,47 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Virhe siirrettäessä vanhaa sähköpostikansiota &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Kysytään palvelimelta"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Poistetaanko todella kansio &quot;{0}&quot; ja kaikki sen alikansiot?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Lähetä kuittaus"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Allekirjoitus on jo olemassa"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14603,7 +14596,7 @@ msgstr ""
 "Järjestelmäkansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voida nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14620,7 +14613,7 @@ msgstr ""
 "paljastaa kaikki viestisi vastaanottajat. Välttääksesi tämän tulee viestiin "
 "määritellä ainakin yksi tavallinen vastaanottaja tai kopio-osoite"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14634,7 +14627,7 @@ msgstr ""
 "   &quot;{0}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14648,11 +14641,11 @@ msgstr ""
 "   &quot;{1}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14660,7 +14653,7 @@ msgstr ""
 "Kansio on ehkä lisätty järjestelmän puolesta.\n"
 "Siirry hakunäkymien muokkaukseen ja lisää se erikseen, jos tarpeen."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14668,12 +14661,12 @@ msgstr ""
 "Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Viestiä ei voida lähettää, koska et ole määritellyt vastaanottajia"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14681,11 +14674,11 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr "Tämä allekirjoitus on muuttunut, mutta sitä ei ole tallennettu."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14693,11 +14686,11 @@ msgstr ""
 "Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
 "alikansioissa luetuiksi."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14705,40 +14698,40 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14748,29 +14741,29 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Kirjautumisesi palvelimelle  &quot;{0}&quot; käyttäjänä &quot;{0}&quot; "
 "epäonnistui."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "_Do not Mark as Read"
 msgstr "Älä merkitse _luetuksi"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
@@ -15190,11 +15183,11 @@ msgstr "Oletuslähteet"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr ""
 "Tarjoaa toiminallisuuden kalenterien tai osoitekirjojen merkitsemiseksi "
-"oletusvalinnaksi."
+"oletusvalinnaksi"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15518,6 +15511,10 @@ msgstr "Salasanasi vanhenee seuraavan 7 päivän kuluessa..."
 msgid "_Change Password"
 msgstr "_Vaihda salasana"
 
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "ok_painike"
+
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Lupa evätty.)"
@@ -16062,7 +16059,7 @@ msgid "_Not Shared"
 msgstr "_Ei jaettu"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-msgid "_Shared With..."
+msgid "_Shared With ..."
 msgstr "_Jaettu henkilöille ..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
@@ -16947,10 +16944,11 @@ msgstr "Postitus_lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
 msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr ""
-"Tarjoa toimintoja yleisille postituslistan komennoille (tilaa, peru "
-"tilaus...)."
+"Tarjoaa toimintoja yleisille postituslistan komennoille (tilaa, "
+"perutilaus...)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -17351,8 +17349,8 @@ msgid "Save attachments"
 msgstr "Tallenna liitteet"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "Tallenna liitteet..."
+msgid "Save Attachments ..."
+msgstr "Tallenna liitteet ..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
@@ -21740,24 +21738,6 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "Su_mmary"
-#~ msgstr "_Yhteenveto"
-
-#~ msgid "_Memo Content:"
-#~ msgstr "_Muistilapun sisältö:"
-
-#~ msgid "Filtering Folder"
-#~ msgstr "Suodatetaan kansiota"
-
-#~ msgid "ok_button"
-#~ msgstr "ok_painike"
-
-#~ msgid "_Send New Message To ..."
-#~ msgstr "Lähetä uusi _viesti..."
-
-#~ msgid "Importing ..."
-#~ msgstr "Tuodaan..."
-
 #~ msgid "Logical"
 #~ msgstr "Looginen"
 
@@ -22033,6 +22013,9 @@ msgstr "Kahvan ponnahdusikkuna"
 #~ msgid "Or_ganizer"
 #~ msgstr "_Järjestäjä"
 
+#~ msgid "_Description:"
+#~ msgstr "K_uvaus:"
+
 #~ msgid "_Set alarm\t"
 #~ msgstr "_Aseta hälytys\t"
 
diff --git a/po/fr.po b/po/fr.po
index 0a79e82c5b..2f2b8ad994 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.8.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-06 01:17+0100\n"
+"POT-Creation-Date: 2006-11-06 01:13+0100\n"
 "PO-Revision-Date: 2006-11-06 01:13+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -556,28 +556,14 @@ msgstr "A_jouter"
 msgid "_Discard"
 msgstr "_Abandonner"
 
-#: ../addressbook/addressbook.error.xml.h:37
-#, fuzzy
-msgid "_Do not save"
-msgstr "Ne pas désactiver"
-
-#: ../addressbook/addressbook.error.xml.h:38
-#, fuzzy
-msgid "_Resize"
-msgstr "Belize"
-
-#: ../addressbook/addressbook.error.xml.h:39
-msgid "_Use as it is"
-msgstr ""
-
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:38
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
@@ -1330,7 +1316,7 @@ msgstr "Contact"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:552
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -2587,20 +2573,20 @@ msgid "Changed"
 msgstr "Modifié"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2794
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "Veuillez sélectionner une image pour ce contact"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2795
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
 msgstr "_Aucune image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2608,23 +2594,23 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s « %s » n'a pas un format valide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3125
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3136
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s « %s » est vide"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3151
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "Contact non valide."
 
@@ -3369,9 +3355,9 @@ msgstr "_Ouvrir un lien dans le navigateur"
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
-msgid "_Send New Message To..."
-msgstr "Envoyer un nouveau _message à..."
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+msgid "_Send New Message To ..."
+msgstr "_Envoyer un nouveau message à..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:177
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
@@ -3803,12 +3789,8 @@ msgid "GTK Tree View"
 msgstr "Affichage de l'arborescence GTK"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
-#: ../addressbook/importers/evolution-vcard-importer.c:250
-#: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
 #: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "Importation..."
 
@@ -3836,6 +3818,13 @@ msgstr "Evolution CSV ou Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Importateur Evolution CSV et Tab"
 
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
+msgid "Importing ..."
+msgstr "Importation..."
+
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
@@ -4546,7 +4535,7 @@ msgid "_Save Changes"
 msgstr "_Enregistrer les changements"
 
 #: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:133
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_Envoyer"
 
@@ -6354,8 +6343,8 @@ msgstr[0] "%d heure avant le rendez-vous"
 msgstr[1] "%d heures avant le rendez-vous"
 
 #: ../calendar/gui/dialogs/event-page.c:2942
-#, fuzzy, c-format
-msgid "%d minute before appointment"
+#, c-format
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minute avant le rendez-vous"
 msgstr[1] "%d minutes avant le rendez-vous"
@@ -6416,7 +6405,6 @@ msgid "Event Description"
 msgstr "Description de l'événement :"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Résumé :"
@@ -6534,21 +6522,24 @@ msgstr "À"
 msgid "Sta_rt date:"
 msgstr "Date de _début :"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "_Résumé"
+
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "_À :"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#, fuzzy
-msgid "_Description:"
-msgstr "Description :"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groupe :"
 
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr "Contenu du _mémo :"
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>Options du calendrier</b>"
@@ -7737,8 +7728,8 @@ msgstr "Proposition de réunion"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1353
-#, fuzzy, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
 #: ../calendar/gui/e-itip-control.c:1354
@@ -7807,8 +7798,8 @@ msgstr "Tâche proposée"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1430
-#, fuzzy, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
 #: ../calendar/gui/e-itip-control.c:1431
@@ -10644,7 +10635,7 @@ msgstr ""
 "options de messagerie."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr "À cause de « {1} »."
 
@@ -10947,7 +10938,7 @@ msgstr "Voulez-vous l'écraser ?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fichier existant « {0} »."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:132
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "É_craser"
 
@@ -11115,7 +11106,7 @@ msgstr "Date manquante."
 msgid "Missing file name."
 msgstr "Nom de fichier manquant."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -11894,7 +11885,7 @@ msgstr "_Nouveau dossier..."
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:129
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
@@ -12481,6 +12472,10 @@ msgstr "_Répondre à l'expéditeur"
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "Envoyer un nouveau _message à..."
+
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
 msgstr "_Ajouter dans le carnet d'adresses"
@@ -14120,9 +14115,8 @@ msgid "Pinging %s"
 msgstr "Ping sur %s"
 
 #: ../mail/mail-ops.c:105
-#, fuzzy
-msgid "Filtering Selected Messages"
-msgstr "Masquer les messages _sélectionnés"
+msgid "Filtering Folder"
+msgstr "Filtrage du dossier"
 
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
@@ -14399,19 +14393,12 @@ msgid "New Search Folder"
 msgstr "Nouveau dossier de recherche"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
-msgid ""
-"A folder named &quot;{0}&quot; already exists. Please use a different name."
-msgstr ""
-"Un dossier nommé « {1} » existe déjà. Veuillez utiliser un nom différent."
-
-#: ../mail/mail.error.xml.h:2
 msgid ""
 "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Un dossier nommé « {1} » existe déjà. Veuillez utiliser un nom différent."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
@@ -14423,7 +14410,7 @@ msgstr ""
 "Vous pouvez choisir d'ignorer ce dossier, d'écraser ou d'ajouter son "
 "contenu, ou de quitter."
 
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:5
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14431,7 +14418,7 @@ msgstr ""
 "Un accusé de réception a été demandé pour la lecture de « {1} ». Voulez-vous "
 "envoyer l'accusé de réception à {0} ?"
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
@@ -14439,7 +14426,7 @@ msgstr ""
 "Une signature nommée &laquo;&nbsp;{0}&nbsp;&raquo; existe déjà. Veuillez "
 "utiliser un nom différent."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -14447,24 +14434,24 @@ msgstr ""
 "Ajouter un sujet compréhensible à vos messages permet de donner à vos "
 "destinataires une idée du propos du courriel."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte et tous ses proxys ?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce compte et tous ses proxys ?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Êtes-vous sûr de vouloir ouvrir {0} messages en une fois ?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14472,7 +14459,7 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement tous les messages effacés "
 "dans tous les dossiers"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -14480,82 +14467,82 @@ msgstr ""
 "Êtes-vous sûr de vouloir supprimer définitivement tous les messages effacés "
 "dans le dossier « {0} » ?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Êtes-vous sûr de vouloir envoyer un message au format HTML ?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Êtes-vous sûr de vouloir envoyer un message avec des destinataires Cci "
 "seulement."
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Êtes-vous sûr de vouloir envoyer un message sans sujet ?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "À cause de « {0} »."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "À cause de « {2} »."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Signature vide"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Impossible d'ajouter le dossier de recherche « {0} »."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Impossible de copier le dossier « {0} » vers « {1} »."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Impossible de créer le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de créer de dossier de sauvegarde temporaire."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Impossible de créer le dossier de sauvegarde parce que « {1} »"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Impossible de supprimer le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Impossible de supprimer le dossier système « {0} »."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Impossible d'éditer le dossier de recherche « {0} » puisqu'il n'existe pas."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Impossible de déplacer le dossier « {0} » vers « {1} »."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Impossible d'ouvrir la source « {1} »"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Impossible d'ouvrir la source « {2} »."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Impossible d'ouvrir la cible « {2} »."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
@@ -14565,31 +14552,31 @@ msgstr ""
 "d'installation. Vous ne serez pas capable d'utiliser ce fournisseur jusqu'à "
 "ce que vous acceptiez sa licence."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Impossible de renommer le dossier « {0} » en « {1} »."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Impossible de renommer ou déplacer le dossier système « {0} »."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Impossible d'enregistrer les modifications au compte."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Impossible d'enregistrer dans le dossier « {0} »."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Impossible d'enregistrer dans le fichier « {0} »."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Impossible d'utiliser le script de signature « {0} »."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14598,71 +14585,71 @@ msgstr ""
 "que beaucoup de mots de passe sont sensibles à la casse ; le verrouillage "
 "majuscules est peut-être actif."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Impossible d'enregistrer le fichier de signature."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Supprimer « {0} » ?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Supprimer le compte ?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Abandonner les modifications ?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Ne pas supprimer"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Ne pas désactiver"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Voulez-vous que l'opération soit effectuée dans les sous-dossiers ?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Voulez-vous marquer tous les messages comme lus ?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Voulez-vous enregistrer vos modifications ?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Saisissez le mot de passe."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Erreur de chargement des définitions du filtre."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Erreur durant l'exécution de l'opération."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Erreur durant {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Le fichier existe mais ne peut pas être écrasé."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Le fichier existe mais n'est pas un fichier régulier."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si vous continuez vous ne serez pas capable de récupérer ces messages."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14670,12 +14657,12 @@ msgstr ""
 "Si vous supprimez le dossier, tout ce contenu ainsi que le contenu de ses "
 "sous-dossiers sera définitivement supprimés."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Si vous continuez, tous les comptes proxy seront définitivement supprimés."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14683,13 +14670,13 @@ msgstr ""
 "Si vous continuez, toutes les informations sur le compte\n"
 "et le proxy seront définitivement supprimés."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Si vous continuez, toutes les informations sur le compte seront "
 "définitivement supprimées."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14697,19 +14684,19 @@ msgstr ""
 "Si vous quittez, ces messages ne seront pas envoyés avant qu'Evolution soit "
 "à nouveau démarré."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Authentification non valide"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Filtres du courriel automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14721,41 +14708,41 @@ msgstr ""
 "champ, s'il est ajouté, listera tous les destinataires de votre message. "
 "Pour éviter cela, vous devriez ajouter au moins un destinataire À : ou Cc :."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Marquer tous les messages comme lus"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "Marquer tous les messages dans le sousdossier comme lus"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "Marquer comme _lu"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ouvrir trop de messages en une fois peut prendre un long moment."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Veuillez vérifier les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Veuillez activer le compte ou bien effectuer l'envoi en utilisant un autre "
 "compte."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 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."
@@ -14764,7 +14751,7 @@ msgstr ""
 "pouvez rechercher des adresses électroniques en cliquant sur le bouton À : à "
 "côté de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14776,49 +14763,49 @@ msgstr ""
 "{0}\n"
 "Envoyer quand même ?"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Veuillez fournir un nom unique pour identifier cette signature."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problème lors de la migration de l'ancien dossier de courriel « {0} »."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Interrogation du serveur"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Questionne le serveur pour obtenir une liste des mécanismes "
 "d'authentification supportés."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Réellement supprimer le dossier « {0} » et tous ses sous-dossiers ?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Dossiers de recherche automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Envoyer un accusé de réception"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Signature déjà existante"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14826,7 +14813,7 @@ msgstr ""
 "Les dossiers système sont nécessaires pour que Evolution fonctionne "
 "correctement, et ne peuvent pas être renommés, déplacés ou supprimés."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14843,7 +14830,7 @@ msgstr ""
 "champ, s'il est ajouté, listera tous les destinataires de votre message. "
 "Pour éviter cela, vous devriez ajouter au moins un destinataire À : ou Cc : "
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14857,7 +14844,7 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mis à jour."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14871,11 +14858,11 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mises à jour."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr "Le fichier de script doit exister et être exécutable."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14884,7 +14871,7 @@ msgstr ""
 "si nécessaire, allez dans l'éditeur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14892,14 +14879,14 @@ msgstr ""
 "Ce message ne peut pas être envoyé car le compte que vous avez choisi pour "
 "l'envoi n'est pas actif."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Ce message ne peut pas être envoyé car vous n'avez spécifié aucun "
 "destinataire"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14907,11 +14894,11 @@ msgstr ""
 "Le serveur ne supporte pas ce type d'authentification et il se peut qu'il ne "
 "supporte aucune identification du tout."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr "Cette signature a été modifiée, mais n'a pas été enregistrée."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14919,11 +14906,11 @@ msgstr ""
 "Marque tous les messages dans le dossier sélectionné, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14931,41 +14918,41 @@ msgstr ""
 "Impossible d'ouvrir le dossier Brouillons pour ce compte. Voulez-vous "
 "utiliser le dossier Brouillons générique à la place ?"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "Utiliser le _défaut"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par défaut ?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "Vous n'avez pas saisi toutes les informations requises."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Certains messages n'ont pas été envoyés. Êtes-vous sûr de vouloir quitter le "
 "programme ?"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14975,28 +14962,28 @@ msgstr ""
 "Soit en sélectionnant les dossiers individuellement, et/ou en sélectionnant "
 "tous les dossiers locaux, tous les dossiers distants, ou les deux."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Votre identification sur le serveur « {0} » en temps que « {0} » a échoué."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "_Do not Mark as Read"
 msgstr "_Ne pas marquer comme lu"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
@@ -15422,10 +15409,9 @@ msgid "Default Sources"
 msgstr "Sources par défaut"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-#, fuzzy
 msgid ""
-"Provides functionality for marking a calendar or an addressbook as the "
-"default one."
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr ""
 "Fournit la fonctionnalité pour marquer un calendrier ou un carnet d'adresses "
 "comme celui par défaut."
@@ -15761,6 +15747,10 @@ msgstr "Votre mot de passe expirera dans 7 jours..."
 msgid "_Change Password"
 msgstr "_Changer le mot de passe"
 
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "ok_button"
+
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Permission refusée)"
@@ -16323,8 +16313,7 @@ msgid "_Not Shared"
 msgstr "_Non partagé"
 
 #: ../plugins/groupwise-features/properties.glade.h:14
-#, fuzzy
-msgid "_Shared With..."
+msgid "_Shared With ..."
 msgstr "_Partagé avec..."
 
 #: ../plugins/groupwise-features/properties.glade.h:15
@@ -17227,9 +17216,9 @@ msgid "Mailing _List"
 msgstr "_Liste de diffusion"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-#, fuzzy
 msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr ""
 "Fournit les actions communes aux listes de diffusion (abonnement, "
 "désabonnement, etc)."
@@ -17642,8 +17631,7 @@ msgid "Save attachments"
 msgstr "Enregistrer les pièces jointes"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-#, fuzzy
-msgid "Save Attachments..."
+msgid "Save Attachments ..."
 msgstr "Enregistrer les pièces jointes..."
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
@@ -22079,21 +22067,3 @@ msgstr "Contexte des méthodes de saisie"
 #: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
-
-#~ msgid "_Send New Message To ..."
-#~ msgstr "_Envoyer un nouveau message à..."
-
-#~ msgid "Importing ..."
-#~ msgstr "Importation..."
-
-#~ msgid "Su_mmary"
-#~ msgstr "_Résumé"
-
-#~ msgid "_Memo Content:"
-#~ msgstr "Contenu du _mémo :"
-
-#~ msgid "Filtering Folder"
-#~ msgstr "Filtrage du dossier"
-
-#~ msgid "ok_button"
-#~ msgstr "ok_button"
diff --git a/po/gl.po b/po/gl.po
index f6966bd41e..ad4f310e80 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-02 12:08+0200\n"
-"PO-Revision-Date: 2006-10-02 12:08+0200\n"
+"POT-Creation-Date: 2006-10-25 13:31+0200\n"
+"PO-Revision-Date: 2006-10-25 16:00+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -172,7 +172,7 @@ msgstr "%A, %d de %b de %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -206,7 +206,7 @@ msgstr "%d de %b de %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -586,7 +586,7 @@ msgstr "Configurar autocompletado aquí"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "Contactos"
@@ -628,8 +628,8 @@ msgstr "Xestione seus certificados S/MIME aquí"
 #: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
@@ -646,8 +646,8 @@ msgstr "Neste computador"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 #: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
@@ -2856,7 +2856,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
@@ -3004,7 +3004,7 @@ msgstr "_Pegar"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
@@ -5195,27 +5195,27 @@ msgstr "Minuto de comezo da xornada laboral"
 msgid "daylight savings time"
 msgstr "hora de verán"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "A categoría é"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "A ubicación contén"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "Non concorda"
 
@@ -5254,13 +5254,13 @@ msgstr "días"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "Na Web"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "Cumpreanos e aniversarios"
 
@@ -5971,7 +5971,7 @@ msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1510
-#: ../mail/em-format-html-display.c:2267
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "Amosar adxuntos"
 
@@ -6197,33 +6197,33 @@ msgstr "_Engadir "
 msgid "Unable to open the calendar '%s'."
 msgstr "Non se puido abrir o calendario '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d día antes da cita"
 msgstr[1] "%d días antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora antes da cita"
 msgstr[1] "%d horas antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto antes da cita"
 msgstr[1] "%d minutos antes da cita"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2955
 msgid "Customize"
 msgstr "Personalizar"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2960
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
@@ -6580,6 +6580,22 @@ msgstr "no"
 msgid "occurrences"
 msgstr "ocorrencias"
 
+#: ../calendar/gui/dialogs/recurrence-page.c:2155
+msgid "Add exception"
+msgstr "Engadir excepción"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2198
+msgid "Could not get a selection to modify."
+msgstr "Non se puido obter unha selección para modificar."
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2204
+msgid "Modify exception"
+msgstr "Modificar excepción"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2250
+msgid "Could not get a selection to delete."
+msgstr "Non se puido obter unha selección para borrar."
+
 #: ../calendar/gui/dialogs/recurrence-page.c:2381
 msgid "Date/Time"
 msgstr "Data/Hora"
@@ -6890,13 +6906,13 @@ msgstr "Prema para abrir %s"
 msgid "Untitled"
 msgstr "Sen título"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "Data de Inicio:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4
@@ -6905,7 +6921,7 @@ msgstr "Data de Inicio:"
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Páxina Web:"
@@ -7028,7 +7044,7 @@ msgstr "Asignada"
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
 
@@ -7052,7 +7068,7 @@ msgstr "Establecer como _fondo"
 msgid "_Save Selected"
 msgstr "_Gardar seleccionados"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -7341,7 +7357,7 @@ 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:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7353,20 +7369,20 @@ msgstr "%02i divisións de minuto"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
@@ -7512,12 +7528,12 @@ msgstr ""
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:687
 #: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
 #: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
@@ -7525,7 +7541,7 @@ msgstr "Aceptado provisionalmente"
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "Rexeitado"
@@ -7796,7 +7812,7 @@ msgstr "Actualizar o estado do remitente"
 msgid "Send Latest Information"
 msgstr "Enviar a última información"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
 #: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7901,7 +7917,7 @@ msgstr "Tentativa"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:696
 #: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "Delegado"
@@ -8175,48 +8191,48 @@ msgstr "Debe estabrecerse un organizador."
 msgid "At least one attendee is necessary"
 msgstr "É necesario polo menos un participante"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "Información do evento"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "Información da Tarefa"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "Información do xornal"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "Información de Libre/Ocupado"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "Información do calendario"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "Actualizado"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "Refrescar"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Información de Libre/Ocupado (de %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "Información de iCalendar"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante no evento."
 
@@ -8321,23 +8337,23 @@ msgstr ""
 "Agarde mentras Evolution migra seus cartafoles..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Imposible migrar a configuración antiga desde evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Non se puido migrar o calendario `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Non é posible migrar as tarefas `%s'"
 
-#: ../calendar/gui/migration.c:1212
+#: ../calendar/gui/migration.c:1211
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
@@ -11881,28 +11897,28 @@ msgid "Click to hide/unhide addresses"
 msgstr "Prema para agochar/amosar os enderezos"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "_Buscar:"
 
-#: ../mail/em-format-html-display.c:675
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
 msgstr "_Reenviar"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "_Coincidir con maiúsculas"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11910,11 +11926,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11922,11 +11938,11 @@ msgstr ""
 "Esta mensaxe está asinada e é válida, o que significa que é moi probable que "
 "a mensaxe sexa auténtica."
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "Sinatura inválida"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11934,11 +11950,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "Sinatura válida, non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11946,11 +11962,11 @@ msgstr ""
 "Esta mensaxe está asinada cunha sinatura válida, pero o remitente da mensaxe "
 "non se puido verificar."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11958,11 +11974,11 @@ msgstr ""
 "Esta mensaxe non está cifrada. O seu contido pode verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 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 "
@@ -11972,11 +11988,11 @@ msgstr ""
 "difícil, pero non imposible para un espía ver o contido desta mensaxe "
 "empregando algo de tempo."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11984,11 +12000,11 @@ msgstr ""
 "Esta mensaxe está cifrada. Sería difícil para un espía ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:942
 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 "
@@ -11997,72 +12013,72 @@ msgstr ""
 "Esta mensaxe está cifrada cun algoritmo de cifrado forte. Sería moi difícil "
 "que un espía vira o contido desta mensaxe empregando un tempo razoable."
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Rematado o %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes do %d de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "_Agochar"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "_Axustar ao ancho"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "Amosar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adxunto"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione o cartafol onde gardar todos os adxuntos..."
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "_Gardar seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d ad_xunto"
 msgstr[1] "%d ad_xuntos"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "Sen adxunto"
 
@@ -13133,7 +13149,7 @@ msgstr "_Cartafol de correo"
 msgid "Create a new mail folder"
 msgstr "Crea un cartafol de correo novo"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallou ao actualizar a configuración de correo ou cartafoles."
 
@@ -15042,6 +15058,14 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "Calendarios fonte CalDAV"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "Fontes CalDAV"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Calendarios locais"
@@ -16180,6 +16204,15 @@ msgstr "Seleccionar calendario"
 msgid "_Import"
 msgstr "_Importar"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Importar ao Calendario"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "Importa adxuntos ICS ao calendario."
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17814,19 +17847,19 @@ msgstr "_Traballar Desconectado"
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolucion está conectado. Prema neste botón para traballar desconectado."
 
-#: ../shell/e-shell-window.c:387
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: ../shell/e-shell-window.c:394
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution está desconectado. Prema neste botón para traballar conectado."
 
-#: ../shell/e-shell-window.c:794
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
@@ -20751,8 +20784,8 @@ msgid "Ukrainian"
 msgstr "Ucraniano"
 
 #: ../widgets/misc/e-charset-picker.c:106
-msgid "Logical"
-msgstr "Lóxico"
+msgid "Visual"
+msgstr "Visual"
 
 #: ../widgets/misc/e-charset-picker.c:175
 #, c-format
@@ -20817,6 +20850,14 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
+#: ../widgets/misc/e-dateedit.c:1634
+msgid "Invalid Date Value"
+msgstr "Valor de data inválido"
+
+#: ../widgets/misc/e-dateedit.c:1660
+msgid "Invalid Time Value"
+msgstr "Valor de hora inválido"
+
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "Expandido"
@@ -20871,7 +20912,7 @@ msgstr "Espaciado arredor da frecha do expansor"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:715
+#: ../widgets/misc/e-filter-bar.c:717
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
diff --git a/po/gu.po b/po/gu.po
index 2bf4c725ce..2feb623aad 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,13 +1,15 @@
+# translation of evolution.gnome-2-16.gu.po to Gujarati
 # translation of evolution.HEAD.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
+# Ankit Patel <ankit@redhat.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.gu\n"
+"Project-Id-Version: evolution.gnome-2-16.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-04 07:17+0200\n"
-"PO-Revision-Date: 2006-10-04 11:16+0530\n"
-"Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
-"Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2006-10-17 07:43+0200\n"
+"PO-Revision-Date: 2006-10-17 16:41+0530\n"
+"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
+"Language-Team: Gujarati <fedora-trans-gu@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,6 +72,7 @@ msgstr ""
 "\n"
 "\n"
 "\n"
+"\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -218,7 +221,7 @@ msgstr "%A %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -252,7 +255,7 @@ msgstr "%d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -621,7 +624,7 @@ msgstr "આપોઆપ સંપૂર્ણ અંહિ રુપરેખા
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "સંપર્કો"
@@ -663,8 +666,8 @@ msgstr "તમારા S/MIME પ્રમાણપત્રોની અંહ
 #: ../addressbook/gui/component/addressbook-component.c:139
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
 #: ../mail/mail-vfolder.c:223
@@ -681,8 +684,8 @@ msgstr "આ કમ્પ્યુટરમાં"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
 #: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
@@ -2882,7 +2885,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:60
 msgid "Any field contains"
 msgstr "કોઈ ક્ષેત્ર સમાવે છેે"
 
@@ -3030,7 +3033,7 @@ msgstr "ચોંટાડો (_a)"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "કોઈપણ વર્ગ"
 
@@ -5164,27 +5167,27 @@ msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્ય�
 msgid "daylight savings time"
 msgstr "દિવસીય બચાવ સમય"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr "સાર સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr "વર્ણન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:57
 msgid "Category is"
 msgstr "વર્ગ"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr "ટિપ્પળી સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr "સ્થાન સમાવે છે"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr "બંધબેસતા નથી"
 
@@ -5222,13 +5225,13 @@ msgstr "દિવસો"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "વેબ પર"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "જન્મદિવસો અને સાલગીરીઓ"
 
@@ -5938,7 +5941,7 @@ msgid "_Add attachment..."
 msgstr "જોડાણ ઉમેરો (_A)..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1510
-#: ../mail/em-format-html-display.c:2267
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "જોડાણો બતાવો"
 
@@ -6162,33 +6165,33 @@ msgstr "ઉમેરો (_A) "
 msgid "Unable to open the calendar '%s'."
 msgstr "કેલેન્ડર '%s' ખોલી શકાય એમ નથી."
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d દિવસ"
 msgstr[1] "મુલાકાત પહેલાના %d દિવસો "
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "મુલાકાત પહેલાનો %d કલાક"
 msgstr[1] "મુલાકાત પહેલાના %d કલાકો"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "મુલાકાત પહેલાની %d મિનિટ"
 msgstr[1] "મુલાકાત પહેલાની %d મિનિટો"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2955
 msgid "Customize"
 msgstr "વૈવિધ્યપૂર્ણ"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2960
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
 #: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
@@ -6871,13 +6874,13 @@ msgstr "%s ખોલવા માટે ક્લિક કરો"
 msgid "Untitled"
 msgstr "શીર્ષક વગરનું"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "શરુઆતની તારીખ:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-itip-control.glade.h:4
@@ -6886,7 +6889,7 @@ msgstr "શરુઆતની તારીખ:"
 msgid "Description:"
 msgstr "વર્ણન:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:250
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "વેબ પાનું:"
@@ -7009,7 +7012,7 @@ msgstr "સોંપેલ"
 msgid "Save As..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "પસંદિત જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
@@ -7033,7 +7036,7 @@ msgstr "પાશ્વ ભાગ તરીકે સુયોજિત કર�
 msgid "_Save Selected"
 msgstr "પસંદ કરેલ સંગ્રહો (_S)"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
 #, c-format
 msgid "Open in %s..."
 msgstr "%s માં ખોલો..."
@@ -7322,7 +7325,7 @@ 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:808
+#: ../calendar/gui/e-day-view-time-item.c:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i મિનિટ ભાગલાઓ"
@@ -7334,20 +7337,20 @@ msgstr "%02i મિનિટ ભાગલાઓ"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 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:746 ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "સવાર"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "સાંજ"
@@ -7491,12 +7494,12 @@ msgstr "<br> મહેરબાની કરીને નીચેની જા�
 #: ../calendar/gui/e-itip-control.c:1164
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:685
+#: ../calendar/gui/itip-utils.c:687
 #: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr "સ્વીકારાયેલ"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:688
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
 #: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
@@ -7504,7 +7507,7 @@ msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
 #: ../calendar/gui/e-itip-control.c:1172
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
 #: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr "નકારાયેલ છે"
@@ -7767,7 +7770,7 @@ msgstr "જવાબ આપવાની સ્થિતિ સુધારો"
 msgid "Send Latest Information"
 msgstr "તાજી જાણકારી મોકલો"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
 #: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7872,7 +7875,7 @@ msgstr "જરુરી"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:694
+#: ../calendar/gui/itip-utils.c:696
 #: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr "ડિલિગેટ થયેલ"
@@ -8146,48 +8149,48 @@ msgstr "આયોજક સુયોજિત કરેલો જ હોવો �
 msgid "At least one attendee is necessary"
 msgstr "ઓછામાં ઓછો એક સભાસદ હોવો જરુરી છે"
 
-#: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr "ઘટનાની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr "બાબતની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr "જર્નલની જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:655
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr "કેલેન્ડર જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr "સુધારાયેલ"
 
-#: ../calendar/gui/itip-utils.c:712
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr "ફરી તાજુ કરો"
 
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr "ગળકનો પ્રસ્તાવ"
 
-#: ../calendar/gui/itip-utils.c:788
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "મુક્ત/વ્યસ્ત જાણકારી (%s ને %s)"
 
-#: ../calendar/gui/itip-utils.c:798
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr "iCalendar જાણકારી"
 
-#: ../calendar/gui/itip-utils.c:953
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr "તમે ઘટનાના સભાસદ હોવા જ જોઈએ."
 
@@ -8290,23 +8293,23 @@ msgstr ""
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ખસેડે ત્યાં સુધી શાંતિ દાખવો..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "evolution/config.xmldb માંથી જૂના સુયોજનો ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "કેલેન્ડર `%s' ને ફેરવવામાં અસમર્થ"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "બાબતો `%s' ફેરવવામાં અસમર્થ"
 
-#: ../calendar/gui/migration.c:1212
+#: ../calendar/gui/migration.c:1211
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
@@ -11834,78 +11837,78 @@ msgid "Click to hide/unhide addresses"
 msgstr "સરનામાઓ છુપાવવા/બતાવવા માટે ક્લિક કરો"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "બંધબેસતા: %d"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "શોધો (_n):"
 
-#: ../mail/em-format-html-display.c:675
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
 msgstr "આગળ ધપાવો (_r)"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "જોડણી સરખાવો (_a)"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "સહી કરેલ નથી"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "સંદેશો સહી કરેલ નથી. સંદેશો યોગ્ય હોય એની કોઈ ગેરંટી નથી."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "માન્ય સહી"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "આ સંદેશો સહી થયેલ છે અને એ માન્ય છે એટલે કે એ ખૂબ જરુરી છે કે આ સંદેશો વ્યવસ્થિત છે."
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "અયોગ્ય સહી"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "આ સંદેશાની આ સહી ચકાસાયેલ નથી, તે પરિવહન દરમ્યાન બદલી દેવાયેલ છે."
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "માન્ય સહી, મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 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:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "એનક્રિપ્ટ થયેલ નથી"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ નથી. તેના સમાવિષ્ટો ઈન્ટરનેટ પર પરિવહન દરમ્યાન દેખાઈ શકે છે."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "એનક્રિપ્ટ થયેલ, નબળુ"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 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 "
@@ -11914,21 +11917,21 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, પરંતુ નબળા એનક્રિપ્શન અલગોરિધમ સાથે. તે મુશ્કેલ હશે, પરંતુ એ "
 "બહારના વ્યક્તિ માટે પ્રાયોગિક સમય દરમ્યાન સંદેશાના સમાવિષ્ટો જોવાનું અશક્ય નથી."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "એનક્રિપ્ટ થયેલ"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 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:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "એનક્રિપ્ટ થયેલ, મજબૂત"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:942
 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 "
@@ -11937,72 +11940,72 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, મજબૂત એનક્રિપ્શન અલગોરિધમ સાથે. બહારની વ્યક્તિ માટે પ્રાયોગિક "
 "સમય દરમ્યાન આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "પ્રમાણપત્ર જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "આ પ્રમાણપત્ર જોઈ શકાય એમ નથી"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p પૂર્ણ થઈ જશે"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "ઈચ્છિત સમયે નહિં થયેલ કાર્ય:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p દ્વારા"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "લીટીમાં જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "છુપાવો (_H)"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "પહોળાઈમાં બંધબેસાડો (_F)"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "મૂળ માપ બતાવો (_O)"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "જોડાણ"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "બધા જોડાણ સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "પસંદિત સંગ્રહો (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d જોડાણ (_t)"
 msgstr[1] "%d જોડાણો (_t)"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "બધું સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "કોઈ જોડાણ નથી"
 
@@ -13057,7 +13060,7 @@ msgstr "મેઈલ ફોલ્ડર (_F)"
 msgid "Create a new mail folder"
 msgstr "નવું મેઈલ ફોલ્ડર બનાવો"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "મેઈલ સુયોજનો અથવા ફોલ્ડરો સુધારવામાં નિષ્ફળ."
 
@@ -14925,6 +14928,14 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "_SSL વાપરો"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "CalDAV કેલેન્ડર સ્રોતો"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "CalDAV સ્રોતો"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "સ્થાનિક કેલેન્ડરો"
@@ -16053,6 +16064,15 @@ msgstr "કેલેન્ડર પસંદ કરો"
 msgid "_Import"
 msgstr "આયાત (_I)"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "કેલેન્ડરમાં આયાત કરો"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "ICS જોડાણોને કેલેન્ડરમાં આયાત કરે છે."
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17656,19 +17676,19 @@ msgstr "ઓફલાઈન કામ કરો (_W)"
 msgid "Work Offline"
 msgstr "ઓફલાઈન કામ કરો"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે. ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:387
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "ઈવોલ્યુશન પ્રક્રિયાને ઓફલાઈન કામ કરવાની પ્રક્રિયામાં છે."
 
-#: ../shell/e-shell-window.c:394
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે. ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:794
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "%s માં બદલો"
@@ -20706,7 +20726,7 @@ msgstr "વિસ્તારનાર તીરની ફરતે જગ્ય
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:715
+#: ../widgets/misc/e-filter-bar.c:717
 msgid "Advanced Search"
 msgstr "ઉન્નત શોધ"
 
diff --git a/po/he.po b/po/he.po
index a43b870304..46240bfce9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-11 17:30+0200\n"
+"POT-Creation-Date: 2006-11-14 15:38+0100\n"
 "PO-Revision-Date: 2004-07-25 21:05+0300\n"
 "Last-Translator: Gil Osher <dolfin@rpg.org.il>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -20,98 +20,94 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:169
+#: ../a11y/addressbook/ea-minicard-view.c:180
 msgid "evolution addressbook"
-msgstr "ספר הכתובות של אבולוציה"
+msgstr "ספר הכתובות של Evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:224
 msgid "New Contact"
 msgstr "איש קשר חדש"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:232
 msgid "New Contact List"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../a11y/addressbook/ea-minicard-view.c:152
+#: ../a11y/addressbook/ea-minicard-view.c:163
 #, fuzzy, c-format
-msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "תיקיית ספר הכתובות הנוכחית "
 msgstr[1] "תיקיית ספר הכתובות הנוכחית "
 
 #: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "פתח"
 
 #: ../a11y/addressbook/ea-minicard.c:141
-#, fuzzy
 msgid "Contact List: "
-msgstr "_רשימת תפוצה"
+msgstr "_רשימת תפוצה: "
 
 #: ../a11y/addressbook/ea-minicard.c:142
-#, fuzzy
 msgid "Contact: "
-msgstr "איש קשר"
+msgstr "איש קשר: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
-msgstr "כרטיסים קטנים של אבולוציה"
+msgstr "כרטיסים קטנים של Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 #, fuzzy
 msgid "It has recurrences."
 msgstr "מופע חוזר"
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:247
+#: ../a11y/calendar/ea-cal-view-event.c:278
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:300
 msgid "calendar view event"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
+#: ../a11y/calendar/ea-cal-view-event.c:529
 msgid "Grab Focus"
-msgstr "יש פוקוס"
+msgstr "תפוס פוקוס"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 #, fuzzy
 msgid "New Appointment"
 msgstr "פגישה חדשה"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 #, fuzzy
 msgid "New All Day Event"
 msgstr "פגישה חדשה לכל היום"
 
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr ""
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 #, fuzzy
 msgid "Go to Today"
 msgstr "לך לתיקייה..."
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr ""
 
@@ -120,40 +116,49 @@ msgstr ""
 msgid "a table to view and select the current time range"
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../a11y/calendar/ea-day-view.c:155 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:152
-#, fuzzy, c-format
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:162
+#, c-format
 msgid "Work Week View: %s. %s"
-msgstr "תצוגת שבוע עבודה"
+msgstr "תצוגת שבוע עבודה: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
-#, fuzzy, c-format
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../a11y/calendar/ea-day-view.c:168
+#, c-format
 msgid "Day View: %s. %s"
-msgstr "תצוגת יום"
+msgstr "תצוגת יום: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:199
 msgid "calendar view for a work week"
 msgstr ""
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:201
 msgid "calendar view for one or more days"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:188
+#: ../calendar/gui/calendar-component.c:707
 msgid "%A %d %b %Y"
-msgstr "%a %d %b %Y"
+msgstr "%A %d %b %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
@@ -161,57 +166,60 @@ msgstr "%a %d %b %Y"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../a11y/calendar/ea-gnome-calendar.c:191
+#: ../calendar/gui/calendar-component.c:710
+#: ../calendar/gui/e-day-view-top-item.c:1315
+#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/e-week-view-main-item.c:319
+#: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:192
-#: ../a11y/calendar/ea-gnome-calendar.c:197
-#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../a11y/calendar/ea-gnome-calendar.c:193
+#: ../a11y/calendar/ea-gnome-calendar.c:198
+#: ../a11y/calendar/ea-gnome-calendar.c:200
+#: ../calendar/gui/calendar-component.c:712
+#: ../calendar/gui/calendar-component.c:717
+#: ../calendar/gui/calendar-component.c:719
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:216
-#: ../a11y/calendar/ea-gnome-calendar.c:222
-#: ../a11y/calendar/ea-gnome-calendar.c:228
-#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
-#, fuzzy
+#: ../a11y/calendar/ea-gnome-calendar.c:217
+#: ../a11y/calendar/ea-gnome-calendar.c:223
+#: ../a11y/calendar/ea-gnome-calendar.c:229
+#: ../a11y/calendar/ea-gnome-calendar.c:231
+#: ../calendar/gui/calendar-component.c:731
+#: ../calendar/gui/calendar-component.c:738
+#: ../calendar/gui/calendar-component.c:744
+#: ../calendar/gui/calendar-component.c:746
 msgid "%d %b %Y"
-msgstr "%d %B %Y"
+msgstr "%d %b %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../a11y/calendar/ea-gnome-calendar.c:221
+#: ../calendar/gui/calendar-component.c:736
+#: ../calendar/gui/e-day-view-top-item.c:1319
+#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%d %b"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:247
-#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../a11y/calendar/ea-gnome-calendar.c:248
+#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr ""
 
-#: ../a11y/calendar/ea-gnome-calendar.c:290
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "search bar"
-msgstr ""
+msgstr "סרגל חיפוש"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:292
 #, fuzzy
 msgid "evolution calendar search bar"
 msgstr "Evolution לא יכולה להתחיל."
@@ -224,21 +232,21 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr ""
 
-#: ../a11y/calendar/ea-week-view.c:155
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
 msgid "Month View: %s. %s"
-msgstr "תצוגת חודש"
+msgstr "תצוגת חודש: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
-#, fuzzy, c-format
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
 msgid "Week View: %s. %s"
-msgstr "תצוגת שבוע"
+msgstr "תצוגת שבוע: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr ""
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr ""
 
@@ -252,9 +260,8 @@ msgid "popup a child"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:612
-#, fuzzy
 msgid "edit"
-msgstr "_עריכה"
+msgstr "ערוך"
 
 #: ../a11y/e-table/gal-a11y-e-cell-text.c:613
 msgid "begin editing this cell"
@@ -271,9 +278,8 @@ msgid "toggle the cell"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
-#, fuzzy
 msgid "expand"
-msgstr "איסלנד"
+msgstr "הרחב"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
 msgid "expands the row in the ETree containing this cell"
@@ -293,14 +299,13 @@ msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
-#, fuzzy
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
-msgstr "לחץ כאן כדי להוסיף משימה"
+msgstr "לחץ כאן כדי להוספה"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
-msgstr ""
+msgstr "לחץ"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
 #, fuzzy
@@ -335,6 +340,16 @@ msgstr "הש_תמש בברירת מחדל"
 msgid "Popup Menu"
 msgstr ""
 
+#: ../a11y/widgets/ea-expander.c:40
+#, fuzzy
+msgid "Toggle Attachment Bar"
+msgstr "שמור בשם..."
+
+#: ../a11y/widgets/ea-expander.c:50
+#, fuzzy
+msgid "activate"
+msgstr "מצב"
+
 #: ../addressbook/addressbook.error.xml.h:1
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
@@ -369,147 +384,168 @@ msgid "Could not remove addressbook."
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:9
 #, fuzzy
 msgid "Delete address book '{0}'?"
 msgstr "ספר הכתובות של אבולוציה"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "שגיאה בזמן טעינת ספר הכתובות."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:12
+#. Unknown error
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#, fuzzy
+msgid "Failed to delete contact"
+msgstr "ניסיון ההזדהות נכשל.\n"
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "GroupWise Address book creation:"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "LDAP server did not respond with valid schema information."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:13
-#, fuzzy
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "Permission Denied."
+msgstr "הרשאה נדחתה."
+
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Server Version"
-msgstr "סיירה לאונה"
+msgstr "גירסת שרת"
 
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Some features may not work properly with your current server"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:20
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:21
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:22
 #, fuzzy
 msgid "This address book will be removed permanently."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This addressbook could not be opened."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This addressbook server does not have any suggested search bases."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This server does not support LDAPv3 schema information."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
-msgstr ""
+msgstr "לא ניתן לפתוח ספר כתובות"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
-msgstr ""
+msgstr "לא ניתן לבצע חיפוש."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
-msgstr ""
+msgstr "לא ניתן לשמור {0}"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:31
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:32
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:494
+#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../plugins/groupwise-features/properties.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:15
 msgid "_Add"
 msgstr "_הוסף"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "_Discard"
 msgstr "ה_תעלם"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
+#: ../addressbook/addressbook.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr ""
 
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -531,30 +567,34 @@ msgstr "הגדר את ההשלמה האוטומטית כאן"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1133
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1332
+#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "אנשי קשר"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "ספר הכתובות של אבולוציה"
+msgid "Evolution Address Book"
+msgstr "ספר הכתובות של Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
+#, fuzzy
+msgid "Evolution Address Book address pop-up"
+msgstr "ספר הכתובות של אבולוציה"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr ""
+#, fuzzy
+msgid "Evolution Address Book address viewer"
+msgstr "ספר הכתובות של אבולוציה"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr ""
+#, fuzzy
+msgid "Evolution Address Book card viewer"
+msgstr "ספר הכתובות של אבולוציה"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr ""
+msgid "Evolution Address Book component"
+msgstr "רכיב ספר הכתובות של Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
@@ -566,16 +606,18 @@ msgstr ""
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "נהל את תעודות ה-S/MIME שלך כאן"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:139
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:231
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
+#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "במחשב זה"
 
@@ -584,139 +626,138 @@ msgstr "במחשב זה"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../addressbook/gui/component/addressbook-component.c:147
+#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+#: ../calendar/gui/calendar-component.c:241
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
+#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "אישי"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "על שרתי LDAP"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgid "_Contact"
 msgstr "איש _קשר"
 
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new contact"
 msgstr "צור איש קשר חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:233
 msgid "Contact _List"
 msgstr "_רשימת תפוצה"
 
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "Create a new contact list"
 msgstr "צור רשימת תפוצה חדשה"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
 msgstr "פנקס כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:241
 msgid "Address _Book"
-msgstr "ספר _כתובות:"
+msgstr "ספר _כתובות"
 
-#: ../addressbook/gui/component/addressbook-component.c:243
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-component.c:242
 msgid "Create a new address book"
-msgstr "הוסף משימה חדשה"
+msgstr "צור ספר כתובות חדש"
 
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:405
+msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:332
 #, fuzzy
 msgid "Base"
 msgstr "הדבק"
 
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:533
 #: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Type:"
 msgstr "_סוג:"
 
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:635
 msgid "Copy book content locally for offline operation"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
+#: ../plugins/itip-formatter/itip-formatter.c:2051
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "כללי"
 
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
-msgstr ""
+#: ../addressbook/gui/component/addressbook-config.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
+msgstr "ספר כתובות"
 
-#: ../addressbook/gui/component/addressbook-config.c:907
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Server Information"
-msgstr "<b>מידע על השרת</b>"
+msgstr "מידע על השרת"
 
-#: ../addressbook/gui/component/addressbook-config.c:909
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:991
 msgid "Authentication"
-msgstr "<b>הזדהות</b>"
+msgstr "אימות"
 
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "פרטים"
 
-#: ../addressbook/gui/component/addressbook-config.c:913
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:995
+#: ../mail/em-folder-browser.c:854
 msgid "Searching"
-msgstr "_חיפוש"
+msgstr "חיפוש"
 
-#: ../addressbook/gui/component/addressbook-config.c:915
-#, fuzzy
+#: ../addressbook/gui/component/addressbook-config.c:997
 msgid "Downloading"
-msgstr "<b>מוריד</b>"
+msgstr "מוריד"
 
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "מאפייני ספר הכתובות"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
 msgid "Migrating..."
-msgstr ""
+msgstr "ממיר..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
 #, c-format
 msgid "Migrating `%s':"
-msgstr ""
+msgstr "ממיר `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "שרתי LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "הגדרות השלמה אוטומטית"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -724,43 +765,77 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "מחק"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "החלף את שם התיקייה \"%s\" ל:"
 
-#: ../addressbook/gui/component/addressbook-view.c:766
-#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "מאפיינים..."
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "החלף את שם התיקייה"
 
-#: ../addressbook/gui/component/addressbook-view.c:1144
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "שם התיקייה לא יכול להכיל את התו '/'"
+
+#: ../addressbook/gui/component/addressbook-view.c:445
+msgid "A Folder with this name already exists"
+msgstr "תיקייה בשם זה כבר קיימת"
+
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "_New Address Book"
+msgstr "_ספר כתובות חדש"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/widgets/e-addressbook-view.c:986
+#: ../calendar/gui/calendar-component.c:584
+#: ../calendar/gui/e-calendar-table.c:1302
+#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1126
+#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_מחק"
+
+#: ../addressbook/gui/component/addressbook-view.c:959
+#, fuzzy
+msgid "Save As Vcard..."
+msgstr "שמור בשם..."
+
+#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../calendar/gui/calendar-component.c:585
+#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
+msgid "_Properties..."
+msgstr "_מאפיינים..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1343
 msgid "Contact Source Selector"
 msgstr ""
 
@@ -768,16 +843,17 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:485
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:501
 msgid "Failed to authenticate.\n"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:464
-#, fuzzy, c-format
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:481
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "%s הכנס סיסמה ל%s (משתמש %s("
+msgstr ""
+"הכנס סיסמה ל-%s(משתמש %s)"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 #, fuzzy
@@ -818,7 +894,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Vertical pane position"
 msgstr ""
 
@@ -827,166 +903,184 @@ msgid "Whether to show the preview pane."
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
 msgid "3268"
 msgstr "3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
 msgid "389"
 msgstr "389"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "636"
 msgstr "636"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
-msgstr "<b>הזדהות</b>"
+msgstr "<b>אימות</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Display</b>"
 msgstr "<b>תצוגה</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>מוריד</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>מחפש</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>מידע על השרת</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Type:</b>"
 msgstr "<b>סוג:</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
-msgstr "ספר כתובות"
+msgstr "הוסף ספר כתובות"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "תמיד"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "אנונימי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
 msgid "Distinguished name"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "כתובת דוא\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:21
+#: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
 msgstr "אבולוציה תשתמש בכתובת דוא\"ל זו להזדהות עם השרת."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Lo_gin:"
 msgstr "ה_תחבר:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "אף פעם"
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../addressbook/gui/component/ldap-config.glade.h:25
+#: ../mail/em-account-editor.c:304
+#, fuzzy
+msgid "No encryption"
+msgstr "תיאור"
+
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr ""
 
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
 #: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../mail/em-account-editor.c:312
+msgid "SSL encryption"
+msgstr "הצפנת SSL"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Search Filter"
+msgstr "בחר תיקייה"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search _filter:"
+msgstr "בחר תיקייה"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Search filter"
+msgstr "בחר תיקייה"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:32
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by  default search will be performed on "
+"objectclass of the type \"person\"."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a insecure environment. For example, if you and your LDAP server "
-"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
-"because your connection is already secure."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Sub"
 msgstr "נושא"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../mail/em-account-editor.c:308
+msgid "TLS encryption"
+msgstr "הצפנת TLS"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree. A search scope of \"sub\" will include all entries below "
@@ -994,1479 +1088,1500 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "משתמש בכתובת דוא\"ל"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "כאשר אפשר"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Add Address Book"
 msgstr "_הוסף לפנקס הכתובות"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "הגבלת הור_דה:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "שיטת ה_תחברות:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-#: ../calendar/gui/dialogs/calendar-setup.c:244
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../mail/mail-config.glade.h:164
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../mail/mail-config.glade.h:163
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_שם:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_שער:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../mail/mail-config.glade.h:171
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:170
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_שרת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr ""
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "השתמש ב_תקשורת מאובטחת:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "כרטיסים"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2054
+#: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
 msgstr "דקות"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>דוא\"ל</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
 msgstr "<b>בית</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>הודעות מידיות</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "<b>Job</b>"
 msgstr "<b>עבודה</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>כללי</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
 msgid "<b>Other</b>"
 msgstr "<b>אחר</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Telephone</b>"
 msgstr "<b>טלפון</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
 msgstr "<b>כתובת רשת</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>עבודה</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:348
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:182
+#: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "איש קשר"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2417
 msgid "Contact Editor"
 msgstr "עורך אנשי הקשר"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Full _Name..."
 msgstr "_שם מלא..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Image"
 msgstr "עמוד"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "כתובת למשלוח"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Ni_ckname:"
 msgstr "_כינוי:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Personal Information"
 msgstr "מידע אישי"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Telephone"
-msgstr "<b>טלפון</b>"
+msgstr "טלפון"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:585
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../mail/mail-config.glade.h:153
 msgid "Work"
 msgstr "עבודה"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
-msgid "_Address:"
-msgstr "_כתובת:"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+msgid "_Address: "
+msgstr "_כתובת: "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "_Anniversary:"
 msgstr "יום נישואין:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "_Assistant:"
 msgstr "עוזר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Birthday:"
-msgstr "יום הולדת:"
+msgstr "יום _הולדת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../plugins/itip-formatter/itip-view.c:1709
 msgid "_Calendar:"
-msgstr "לוח שנה:"
+msgstr "לוח _שנה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories"
-msgstr "_קטגוריות"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+msgid "_Categories..."
+msgstr "_קטגוריות..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
-msgstr "עיר:"
+msgstr "_עיר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
-msgstr "חברה:"
+msgstr "ח_ברה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "_Country:"
 msgstr "ארץ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Department:"
-msgstr "מחלקה:"
+msgstr "מח_לקה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_File under:"
 msgstr "_תייק תחת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 #, fuzzy
 msgid "_Free/Busy:"
 msgstr "פנוי/עסוק:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
-msgstr "דף הבית:"
+msgstr "דף הבי_ת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "_Manager:"
 msgstr "מנהל:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Notes:"
-msgstr "הערות:"
+msgstr "הע_רות:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Office:"
-msgstr "משרד:"
+msgstr "משרד_:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_PO Box:"
 msgstr "_תא דואר:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Profession:"
-msgstr "מקצוע:"
+msgstr "מק_צוע:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "_Spouse:"
 msgstr "_צליל:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_State/Province:"
 msgstr "_מדינה/אזור:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "כ_ותרת:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
-msgstr "שיחת וידאו:"
+msgstr "שיחת _וידאו:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
-msgstr "רוצה לקבל דואר HTML"
+msgstr "רוצה לקבל _דואר HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Web Log:"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_איפה:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "_Zip/Postal Code:"
-msgstr "מיקוד:"
+msgstr "מיקו_ד:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: ../addressbook/gui/widgets/eab-contact-display.c:367
-#: ../addressbook/gui/widgets/eab-contact-display.c:382
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Address"
 msgstr "כתובת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
 #: ../addressbook/gui/widgets/e-addressbook-model.c:310
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
-#: ../addressbook/gui/widgets/e-minicard-view.c:520
-#: ../addressbook/gui/widgets/e-minicard.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:522
+#: ../addressbook/gui/widgets/e-minicard.c:187
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/table/e-cell-text.c:1821 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
+#: ../widgets/text/e-text.c:3626
 msgid "Editable"
 msgstr "ניתן לעריכה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
 msgstr "ארה\"ב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
 msgstr "אפגניסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
 msgstr "אלבניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Algeria"
 msgstr "אלג'יר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
 msgstr "סמואה האמריקאית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
 msgstr "אנדורה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "אנגולה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Anguilla"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
 msgstr "אנטרטיקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
 msgstr "אנטיגואה וברבודה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
 msgstr "ארגנטינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Armenia"
 msgstr "ארמניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
 msgstr "ארובה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Australia"
 msgstr "אוסטרליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Austria"
 msgstr "אוסטריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
-msgstr ""
+msgstr "אזרביג'ן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
 msgstr "בהמה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bahrain"
 msgstr "בחריין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Bangladesh"
 msgstr "בנגלדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
 msgstr "ברבדוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
 msgstr "בלרוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belgium"
 msgstr "בלגיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
-msgstr ""
+msgstr "בליז"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
 msgstr "בנין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
 msgstr "ברמודה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bhutan"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bolivia"
 msgstr "בוליביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr "בוסניה-הרצגובינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "ברזיל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "British Indian Ocean Territory"
 msgstr "הטריטוריה הבריטית באוקיינוס ההודי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Brunei Darussalam"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Bulgaria"
 msgstr "בולגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
 msgstr "קמבודיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cameroon"
 msgstr "קמרון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "קנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
 msgstr "רפובליקת מרכז אפריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
 msgstr "צ'אד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
 msgstr "צ'ילה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "China"
 msgstr "סין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Christmas Island"
 msgstr "האי כריסמס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
 msgstr "איי קוקוס (קילינג)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
 msgstr "קולומביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "קונגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Congo, The Democratic Republic Of The"
 msgstr "הרפובליקה הדמוקרטית של קונגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
 msgstr "איי קוק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
 msgstr "קוסטה ריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr "חוף השנהב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Croatia"
 msgstr "קרואטיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
 msgstr "קובה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Cyprus"
 msgstr "קפריסין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Czech Republic"
 msgstr "צ'כיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Denmark"
 msgstr "דנמרק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
 msgstr "דומיניקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Dominican Republic"
 msgstr "הרפובליקה הדומיניקית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Ecuador"
 msgstr "אקוודור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "מצריים"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "El Salvador"
 msgstr "אל סלואדור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
 msgstr "אריתריאה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
 msgstr "אסטוניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
 msgstr "אתיופיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
-msgstr ""
+msgstr "איי פולקלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
 msgstr "פיג'י"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
 msgstr "פינלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "France"
 msgstr "צרפת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Guiana"
 msgstr "גואינה הצרפתית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
 msgstr "פולינסיה הצרפתית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
 msgstr "הטריטוריות הדרומיות הצרפתיות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
 msgstr "גבון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
 msgstr "גמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
 msgstr "גרוזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Germany"
 msgstr "גרמניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
-msgstr ""
+msgstr "גאנה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
 msgstr "גיברלטר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "יוון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Greenland"
 msgstr "גרינלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
 msgstr "גוואדלופ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guam"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guatemala"
 msgstr "גואטמלה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr "גורנזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
 msgstr "גואינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
 msgstr "האיטי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
 msgstr "איי הארד ומקדונלד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
 msgstr "הונדורס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr "הונג קונג"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Hungary"
 msgstr "הונגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
 msgstr "איסלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "India"
 msgstr "הודו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Indonesia"
 msgstr "אינדונזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
-msgstr "איראן"
+msgstr "אירן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Iraq"
 msgstr "עיראק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
 msgid "Ireland"
 msgstr "אירלנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
 msgstr "ישראל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Italy"
 msgstr "איטליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Jamaica"
 msgstr "ג'מייקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Japan"
 msgstr "יפן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jersey"
 msgstr "ג'רסי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Jordan"
 msgstr "ירדן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kazakhstan"
 msgstr "קזחסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
 msgstr "קניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
 msgstr "קוריאה, רפובליקת האנשים הדמוקרטית של"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr "קוריאה, רפובליקת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kuwait"
 msgstr "קווית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Kyrgyzstan"
 msgstr "קיגיזסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr "לאוס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Latvia"
 msgstr "לטביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lebanon"
 msgstr "לבנון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
 msgstr "ליבריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
 msgstr "ליכטנשטיין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
 msgid "Luxembourg"
 msgstr "לוקסמבורג"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Macedonia"
 msgstr "מקדוניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Madagascar"
 msgstr "מדגסקאר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
 msgstr "מלאווי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
 msgstr "מלזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Maldives"
-msgstr ""
+msgstr "האיים המלדיבים"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
 msgstr "מלטה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
 msgstr "איי מרשל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
 msgstr "מאוריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Mexico"
 msgstr "מקסיקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr "מיקרונזיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Moldova, Republic Of"
 msgstr "מולדובה, רפובליקת"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "מונקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Mongolia"
 msgstr "מונגוליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Montserrat"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Morocco"
 msgstr "מרוקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Mozambique"
 msgstr "מוזמביק"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Myanmar"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Namibia"
 msgstr "נמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
 msgstr "נפאל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands"
 msgstr "הולנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
 msgstr "קלדוניה החדשה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
 msgstr "ניו-זילנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
 msgstr "ניקראגואה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
 msgstr "ניגר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "ניגריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
 msgstr "נורווגיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Oman"
 msgstr "אומן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pakistan"
 msgstr "פקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "הטריטוריה הפלשתינית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "פנמה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "פראגוואי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "פרו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Philippines"
 msgstr "פיליפינים"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
 msgstr "פולין"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Portugal"
 msgstr "פורטוגל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Puerto Rico"
 msgstr "פורטו ריקו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
 msgstr "קטאר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr "ריוניון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Romania"
 msgstr "רומניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Russian Federation"
 msgstr "רוסיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Rwanda"
 msgstr "רואנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
 msgstr "סמואה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
 msgstr "ערב הסעודית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
 msgid "Senegal"
 msgstr "סנגל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr "סרביה ומונטגרו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
 msgstr "סיישל"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
 msgstr "סיירה לאונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "סינגפור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovakia"
 msgstr "סלובקיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Slovenia"
 msgstr "סלובניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
 msgstr "איי סלומון"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
 msgstr "סומליה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
 msgstr "דרום אפריקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "ספרד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "Sri Lanka"
 msgstr "סרי לנקה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
 msgstr "סודן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
 msgstr "סורינם"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
 msgstr "שוודיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Switzerland"
 msgstr "שווייץ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr "סוריה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Taiwan"
 msgstr "טיוואן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
 msgstr "טאג'יקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
 msgstr "טנזניה, הרפובליקה המאוחדת של"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Thailand"
 msgstr "תאילנד"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Timor-Leste"
 msgstr "טימור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Togo"
 msgstr "טוגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
 msgstr "טונגה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "טרינידד וטובאגו"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
 msgstr "תוניס"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "טורקיה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turkmenistan"
 msgstr "טורקמניסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
 msgstr "אוגנדה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "אוקראינה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
 msgstr "איחוד האמירויות הערביות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
 msgstr "בריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
 msgstr "אורוגוואי"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Uzbekistan"
 msgstr "אוזבקיסטן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
 msgstr "ונצואלה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Viet Nam"
 msgstr "ויאטנם"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
 msgstr "איי וירג'יניה, בריטניה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
 msgstr "איי וירג'יניה, ארה\"ב"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Western Sahara"
 msgstr "סהרה המערבית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Yemen"
 msgstr "תימן"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
 msgstr "זמביה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
 msgstr "זימבבווה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/save-attachments/save-attachments.c:370
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "שם"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "Yahoo Messenger"
 msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Gadu-Gadu Messenger"
+msgstr "Gadu-Gadu Messenger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:121
 msgid "Service"
 msgstr "שרות"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "מיקום"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "בית"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "אחר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 msgid "Source Book"
 msgstr "ספר מקור"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Target Book"
 msgstr "ספר מטרה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Is New Contact"
 msgstr "האם איש קשר חדש"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 msgid "Writable Fields"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
-#, fuzzy
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Required Fields"
-msgstr "משתתפים דרושים"
+msgstr "שדות חובה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 msgid "Changed"
 msgstr "שונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
 msgstr "עורך אנשי הקשר"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
 msgstr "אנא בחר תמונה בעבור איש קשר זה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
-msgid "No image"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
+#, fuzzy
+msgid "_No image"
 msgstr "ללא תמונה"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3101
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3123
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3134
+#, c-format
+msgid "%s'%s' is empty"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
 msgid "_Edit Full"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-#, fuzzy
-msgid "_Full name:"
-msgstr "_שם מלא:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "_שם מלא"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "_דוא\"ל:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+msgid "E_mail"
+msgstr "דו_א\"ל"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#, fuzzy
+msgid "_Select Address Book"
+msgstr "פנקס כתובות חדש"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s) ?"
+"to delete contact list (%s)?"
 msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -2475,16 +2590,16 @@ msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s) ?"
+"to delete contact (%s)?"
 msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2492,107 +2607,112 @@ msgstr ""
 "אתה בטוח שברצונך\n"
 "למחוק אנשי קשר אלו?"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "כתובת _2:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Ci_ty:"
 msgstr "_עיר:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Countr_y:"
 msgstr "_ארץ:"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "כתובת מלאה"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
+msgstr "_כתובת:"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "מ_יקוד:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "דר."
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "שם מלא"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "הצעיר"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "מר"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "סיר"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "_פרטי:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "_משפחה:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "_אמצעי:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "_סופית:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:2
+#: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
 msgstr ""
 
-#: ../addressbook/gui/contact-editor/im.glade.h:3
+#: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "_Account name:"
 msgstr "שם _חשבון:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../addressbook/gui/contact-editor/im.glade.h:3
 msgid "_IM Service:"
 msgstr "שירות מ_סרים מידיים:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:215
-#: ../plugins/exchange-operations/exchange-contacts.c:193
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_מיקום:"
 
@@ -2600,63 +2720,61 @@ msgstr "_מיקום:"
 msgid "\n"
 msgstr "\n"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Add an email to the List"
 msgstr "הוסף דוא\"ל לרשימה"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
 msgid "Contact List Editor"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Insert email addresses from Address Book"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Members"
 msgstr "חברים"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Remove an email address from the List"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_List name:"
 msgstr "שם _רשימה:"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_Select"
-msgstr "בחר"
+msgstr "בחר_"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:223
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
-#: ../addressbook/gui/widgets/e-minicard-view.c:506
+#: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "ספר"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
 msgid "Is New List"
 msgstr ""
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
-#, fuzzy
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "_Members"
-msgstr "חברים"
+msgstr "חברים_"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 #, fuzzy
 msgid "Contact List Members"
 msgstr "רשימת חברים"
@@ -2694,11 +2812,21 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "חיפוש מתקדם"
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../calendar/gui/cal-search-bar.c:60
+msgid "Any field contains"
+msgstr "כל שדה מכיל"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Email begins with"
+msgstr "דוא\"ל מתחיל ב"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Name begins with"
+msgstr "השם מתחיל ב"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2713,9 +2841,9 @@ msgstr[1] "%d אנשי קשר"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
-#: ../addressbook/gui/widgets/e-minicard-view.c:513
+#: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "שאילתה"
 
@@ -2724,12 +2852,12 @@ msgid "Error getting book view"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
 msgid "Model"
 msgstr "מודל"
 
@@ -2737,135 +2865,126 @@ msgstr "מודל"
 msgid "Error modifying card"
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "השם מתחיל ב"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "דוא\"ל מתחיל ב"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "הקטגוריה היא"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "כל שדה מכיל"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "מתקדם..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 msgid "Source"
 msgstr "מקור"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:251
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-list-view.c:487
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:6
 msgid "Type"
 msgstr "סוג"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "ספר כתובות"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2011
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:841
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1154
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/e-calendar-table.c:1280
+#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_פתח"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "_New Contact..."
 msgstr "איש קשר חדש..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "New Contact _List..."
 msgstr "רשימת תפוצה חדשה..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+msgid "_Save as VCard..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#, fuzzy
+msgid "_Forward Contact"
 msgstr "העבר איש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 #, fuzzy
-msgid "Forward Contacts"
+msgid "_Forward Contacts"
 msgstr "העבר איש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "שלח הודעה לאיש קשר"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Send _Message to Contact"
+msgstr "שלח הודעה _לאיש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
 #, fuzzy
-msgid "Send Message to List"
+msgid "Send _Message to List"
 msgstr "שלח הודעה לאיש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 #, fuzzy
-msgid "Send Message to Contacts"
+msgid "Send _Message to Contacts"
 msgstr "שלח הודעה לאיש קשר"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "הדפס"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+msgid "_Print"
+msgstr "הד_פס"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "העתק לספר הכתובות..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+msgid "Cop_y to Address Book..."
+msgstr "העתק לספר כתובות..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#, fuzzy
+msgid "Mo_ve to Address Book..."
 msgstr "העבר לפנקס הכתובות..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "גזור"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "ג_זור"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "העתק"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../calendar/gui/calendar-component.c:583
+#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../calendar/gui/e-calendar-table.c:1288
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3153 ../mail/em-folder-tree.c:1002
+#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1920
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "ה_עתק"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "הדבק"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:985
+msgid "P_aste"
+msgstr "ה_דבק"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1562
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
+#: ../calendar/gui/cal-search-bar.c:428
 msgid "Any Category"
 msgstr "כל קטגוריה"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1761
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
 #, fuzzy
 msgid "Print cards"
 msgstr "הדפס אנשי קשר"
 
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Other error"
+msgstr "תקלה אחרת"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "עוזר"
 
@@ -2894,9 +3013,10 @@ msgid "Car Phone"
 msgstr "טלפון ברכב"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
 msgid "Categories"
 msgstr "קטגוריות"
 
@@ -2905,18 +3025,16 @@ msgid "Company Phone"
 msgstr "טלפון חברה"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
-#: ../smime/lib/e-cert.c:826
+#: ../addressbook/gui/widgets/eab-contact-display.c:785
+#: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "דוא\"ל"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "דוא\"ל 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "דוא\"ל 3"
 
@@ -2953,20 +3071,22 @@ msgid "Journal"
 msgstr "יומן"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+#: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "מנהל"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
+#: ../addressbook/gui/widgets/eab-contact-display.c:596
 msgid "Mobile Phone"
 msgstr "טלפון סלולרי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "כינוי"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:392
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Note"
 msgstr "הערה"
 
@@ -2975,7 +3095,7 @@ msgid "Office"
 msgstr "משרד"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:362
+#: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Organization"
 msgstr "ארגון"
 
@@ -3001,13 +3121,14 @@ msgstr "רדיו"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:498
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "תפקיד"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr ""
 
@@ -3038,38 +3159,38 @@ msgid "Web Site"
 msgstr "אתר ברשת"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../addressbook/gui/widgets/e-minicard.c:150
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Width"
 msgstr "רוחב"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../addressbook/gui/widgets/e-minicard.c:157
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3675 ../widgets/text/e-text.c:3676
 msgid "Height"
 msgstr "גובה"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:153
+#: ../addressbook/gui/widgets/e-minicard.c:165
 msgid "Has Focus"
 msgstr "יש פוקוס"
 
@@ -3093,7 +3214,7 @@ msgstr ""
 msgid "Column Width"
 msgstr "רוחב עמודה"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:172
+#: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
 "\n"
@@ -3102,7 +3223,7 @@ msgid ""
 "or double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:175
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3111,7 +3232,7 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:180
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 #, fuzzy
 msgid ""
 "\n"
@@ -3119,223 +3240,295 @@ msgid ""
 "Search for the Contact."
 msgstr "חפש אנשי קשר..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:182
+#: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:499
+#: ../addressbook/gui/widgets/e-minicard-view.c:501
 msgid "Adapter"
 msgstr "מתאם"
 
-#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../addressbook/gui/widgets/e-minicard.c:102
+#, fuzzy
+msgid "Work Email"
+msgstr "דוא\"ל"
+
+#: ../addressbook/gui/widgets/e-minicard.c:103
+#, fuzzy
+msgid "Home Email"
+msgstr "דוא\"ל"
+
+#: ../addressbook/gui/widgets/e-minicard.c:104
+#, fuzzy
+msgid "Other Email"
+msgstr "פקס אחר"
+
+#: ../addressbook/gui/widgets/e-minicard.c:173
 msgid "Selected"
 msgstr "נבחר"
 
-#: ../addressbook/gui/widgets/e-minicard.c:168
+#: ../addressbook/gui/widgets/e-minicard.c:180
 msgid "Has Cursor"
 msgstr "יש סמן"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:135
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_פתח את הקישור בדפדפן"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
+#: ../mail/em-folder-view.c:2511
+msgid "_Copy Link Location"
+msgstr "_העתק את מיקום הקישור"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#, fuzzy
+msgid "_Send New Message To ..."
+msgstr "ש_לח הודעה ל..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#, fuzzy
+msgid "Copy _Email Address"
+msgstr "_כתובת דוא\"ל:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:301
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "(map)"
 msgstr "(מפה)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:145
-#: ../addressbook/gui/widgets/eab-contact-display.c:211
+#: ../addressbook/gui/widgets/eab-contact-display.c:311
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "map"
 msgstr "מפה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:276
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:462
+#: ../addressbook/gui/widgets/eab-contact-display.c:763
 msgid "List Members"
 msgstr "רשימת חברים"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:339
-#: ../addressbook/gui/widgets/eab-contact-display.c:341
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "E-mail"
 msgstr "דוא\"ל"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Department"
+msgstr "מחלקה:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#, fuzzy
+msgid "Profession"
+msgstr "מקצוע:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:574
 msgid "Position"
 msgstr "עמדה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
-msgid "Video Conferencing"
-msgstr "ועידת וידאו"
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#, fuzzy
+msgid "Video Chat"
+msgstr "שיחת וידאו:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:578
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2286
+#: ../plugins/exchange-operations/exchange-folder.c:569
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+#: ../plugins/hula-account-setup/camel-hula-listener.c:381
+#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+msgid "Calendar"
+msgstr "לוח שנה"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:365
-#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../ui/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Free/Busy"
+msgstr "פנוי/עסוק:"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
+#: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Phone"
 msgstr "טלפון"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
 msgid "Fax"
 msgstr "פקס"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:370
-msgid "work"
-msgstr "עבודה"
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#, fuzzy
+msgid "Home Page"
+msgstr "דף הבית:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
-msgid "WWW"
-msgstr "WWW"
+#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#, fuzzy
+msgid "Web Log"
+msgstr "עמוד"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:378
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
-msgid "Blog"
-msgstr "ב-לוג"
+#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#, fuzzy
+msgid "Birthday"
+msgstr "יום הולדת:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:385
-msgid "personal"
-msgstr "אישי"
+#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#, fuzzy
+msgid "Anniversary"
+msgstr "יום נישואין:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:781
 msgid "Job Title"
 msgstr "כותרת תפקיד"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:812
 msgid "Home page"
 msgstr "דף הבית"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:820
+msgid "Blog"
+msgstr "ב-לוג"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "הצלחה"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "ספר הכתובות לא קיים"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "לא הוגדר איש קשר עצמי"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "אין הרשאות"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "איש הקשר לא נמצא"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "פרוטוקול לא נתמך"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:664
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2385
+#, fuzzy
+msgid "Canceled"
 msgstr "בוטל"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "לא ניתן לבטל"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "ההזדהות נכשלה"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "הזדהות נדרשת"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "TLS not Available"
 msgstr "TLS לא זמין"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "אין מקור כזה"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 #, fuzzy
 msgid "Not available in offline mode"
 msgstr "התחל במצב לא מקוון"
 
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "תקלה אחרת"
-
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "Invalid server version"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3343,7 +3536,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3351,45 +3544,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:707
 msgid "Error adding contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:659
 msgid "Error removing contact"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3400,22 +3593,23 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#. For Translators only: "it" refers to the filename %s.
+#: ../addressbook/gui/widgets/eab-gui-util.c:324
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:328
 msgid "Overwrite"
 msgstr "החלף"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:378
 #, fuzzy
 msgid "contact"
 msgid_plural "contacts"
@@ -3423,78 +3617,59 @@ msgstr[0] "איש קשר"
 msgstr[1] "איש קשר"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:426
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#, fuzzy
+msgid "Select Address Book"
+msgstr "פנקס כתובות חדש"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:604
 msgid "list"
 msgstr "רשימה"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:768
 msgid "Move contact to"
 msgstr "הזז איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Copy contact to"
 msgstr "העתק איש קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:773
 msgid "Move contacts to"
 msgstr "הזז אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:775
 msgid "Copy contacts to"
 msgstr "העתק אנשי קשר ל"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr ""
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
 msgid "Multiple VCards"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:1004
 #, c-format
 msgid "VCard for %s"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(ללא)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "דוא\"ל ראשי"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "בחר פעולה"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "צור איש קשר חדש \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:1045
+#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#, fuzzy
+msgid "Contact information"
+msgstr "איש הקשר לא נמצא"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "הוסף כתובת לאיש קשר קיים \"%s\""
+#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#, fuzzy, c-format
+msgid "Contact information for %s"
+msgstr "עורך אנשי הקשר"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:289
 msgid "Querying Address Book..."
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr ""
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, fuzzy, c-format
 msgid "There is one other contact."
@@ -3523,27 +3698,58 @@ msgstr ""
 msgid "GTK Tree View"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "מייבא..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+#, fuzzy
+msgid "Evolution CSV and Tab Importer"
+msgstr "Evolution לא יכולה להתחיל."
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 #, fuzzy
 msgid "Importing ..."
 msgstr "מייבא..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr ""
 
@@ -3552,12 +3758,12 @@ msgstr ""
 msgid "Print envelope"
 msgstr "הדפס מעטפה"
 
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:849
 msgid "Print contacts"
 msgstr "הדפס אנשי קשר"
 
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:939
+#: ../addressbook/printing/e-contact-print.c:967
 msgid "Print contact"
 msgstr "הדפס איש קשר"
 
@@ -3602,11 +3808,11 @@ msgid "Format"
 msgstr "מבנה"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1913
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "כותרת"
@@ -3660,7 +3866,7 @@ msgid "Options"
 msgstr "אפשרויות"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "יישור"
 
@@ -3710,9 +3916,9 @@ msgstr ""
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:917
-#: ../plugins/exchange-operations/exchange-calendar.c:205
-#: ../plugins/exchange-operations/exchange-contacts.c:176
+#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "גודל:"
 
@@ -3762,17 +3968,17 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "לא ניתן לפתוח קובץ"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr ""
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr ""
 
@@ -3845,165 +4051,168 @@ msgstr "לא ניתן שם קובץ."
 
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
 msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/gui/dialogs/delete-comp.c:189
 msgid "Are you sure you want to delete this journal entry?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "אתה בטוח שברצונך למחוק פגישה זו?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
 #, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
 #, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
+#, fuzzy
+msgid "Cannot create a new event"
+msgstr "צור איש קשר חדש"
+
+#: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
 msgstr ""
 
+#: ../calendar/calendar.error.xml.h:25
+#, fuzzy
+msgid "Delete memo list '{0}'?"
+msgstr "רשימת תפוצה חדשה"
+
 #: ../calendar/calendar.error.xml.h:26
 #, fuzzy
 msgid "Delete task list '{0}'?"
 msgstr "רשימת תפוצה חדשה"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Discard Changes"
-msgstr "התעלם משינויים"
-
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+#, fuzzy
+msgid "Do _not Send"
 msgstr "אל תשלח"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 #, fuzzy
 msgid "Editor could not be loaded."
 msgstr "ספר הכתובות לא יכל להיפתח."
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
-"Email invitations will be sent to all participants and allow them to accept "
-"this task."
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 #, fuzzy
 msgid "Error loading calendar"
 msgstr "שגיאה בטעינת %s"
 
+#: ../calendar/calendar.error.xml.h:34
+#, fuzzy
+msgid "Error loading memo list"
+msgstr "שגיאה בטעינת %s"
+
 #: ../calendar/calendar.error.xml.h:35
 #, fuzzy
 msgid "Error loading task list"
@@ -4011,171 +4220,251 @@ msgstr "שגיאה בטעינת %s"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Save Changes"
-msgstr "שמור שינויים"
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
-msgid "Send"
-msgstr "שלח"
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Send Notice"
-msgstr "הודעת שליחה"
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:43
-msgid ""
-"Sending updated information allows other participants to keep their task "
-"lists up to date."
+msgid "Some features may not work properly with your current server."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr ""
 
+#: ../calendar/calendar.error.xml.h:45
+#, fuzzy
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
+
 #: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
+msgid "The calendar is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
+msgid "The memo list is not marked for offline usage"
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "This calendar will be removed permanently."
+msgid "The task list is not marked for offline usage."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "This task list will be removed permanently."
+msgid "This calendar will be removed permanently."
 msgstr ""
 
 #: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "This memo list will be removed permanently."
+msgstr "ספר הכתובות לא יכל להיפתח."
+
+#: ../calendar/calendar.error.xml.h:52
+msgid "This task list will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
+#, fuzzy
+msgid "Would you like to save your changes to this memo?"
+msgstr "האם ברצונך לשמור את השינויים שלך?"
+
+#: ../calendar/calendar.error.xml.h:55
 #, fuzzy
 msgid "Would you like to save your changes to this task?"
 msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:53
-msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr ""
+#: ../calendar/calendar.error.xml.h:56
+#, fuzzy
+msgid "Would you like to send a cancelation notice for this journal entry?"
+msgstr "האם ברצונך לשמור את השינויים שלך?"
 
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send all the participants a cancelation notice?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:60
-msgid "You have made changes to this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:62
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
+msgid ""
+"You have a read-only calendar source selected. Change to Calendar View and "
+"highlight a calendar that can accept appointments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
 #, fuzzy
-msgid "You have made changes to this task, but not yet saved them."
+msgid "You have changed this appointment, but not yet saved it."
 msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
+#, fuzzy
+msgid "You have changed this task, but not yet saved it."
+msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
+
+#: ../calendar/calendar.error.xml.h:66
+#, fuzzy
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "ביצעת שינויים לאיש הקשר הזה. האם ברצונך לשמור את השינויים הללו?"
+
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:68
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../calendar/calendar.error.xml.h:70
+#: ../composer/mail-composer.error.xml.h:27
+#, fuzzy
+msgid "_Discard Changes"
+msgstr "התעלם משינויים"
+
+#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "_שמור"
 
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "_Save Changes"
+msgstr "שמור שינויים"
+
+#: ../calendar/calendar.error.xml.h:73
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "_שלח"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:74
+#, fuzzy
+msgid "_Send Notice"
+msgstr "הודעת שליחה"
+
+#: ../calendar/calendar.error.xml.h:75
 msgid "{0}."
 msgstr ""
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "הכנס סיסמה"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1038
+#: ../calendar/conduits/todo/todo-conduit.c:1039
 msgid "Could not start evolution-data-server"
 msgstr ""
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr ""
+
+#: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
 msgstr ""
 
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
+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:2042
 msgid "Calendar and Tasks"
 msgstr "לוח שנה ומשימות"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1361
 msgid "Calendars"
 msgstr "לוחות שנה"
 
@@ -4204,26 +4493,45 @@ msgid "Evolution's Calendar component"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Tasks component"
+msgid "Evolution's Memos component"
 msgstr ""
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1257 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:582
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Memo_s"
+msgstr "חברים"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#, fuzzy
+msgid "Memos"
+msgstr "חברים"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
+#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1840
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:581
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:391
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:601
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "משימות"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "_לוחות שנה"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_משימות"
@@ -4232,25 +4540,30 @@ msgstr "_משימות"
 msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "דקות"
 msgstr[1] "דקות"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "שעות"
+msgstr[1] "שעות"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 #, fuzzy
 msgid "Start time"
 msgstr "מתחיל:"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 #, fuzzy
@@ -4259,8 +4572,10 @@ msgstr "פגישה"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
+#: ../calendar/gui/e-itip-control.c:1145
+#: ../plugins/itip-formatter/itip-view.c:936
 msgid "Location:"
 msgstr ""
 
@@ -4269,17 +4584,17 @@ msgid "Snooze _time:"
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:23
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:35
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:41
 msgid "_Edit"
 msgstr "_עריכה"
 
@@ -4287,58 +4602,38 @@ msgstr "_עריכה"
 msgid "_Snooze"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#, fuzzy
-msgid "description of appointment"
-msgstr "תחילת הפגישה"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 #, fuzzy
 msgid "location of appointment"
 msgstr "תחילת הפגישה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "שחרר"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "שחרר הכל"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
 #, fuzzy
 msgid "No summary available."
 msgstr "אין תיאור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
 msgid "No description available."
 msgstr "אין תיאור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
 #, fuzzy
 msgid "No location information available."
 msgstr "אין תיאור זמין."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
 #, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
+msgid "You have %d alarms"
 msgstr ""
-"התרעה על %s\n"
-"%s\n"
-"מתחיל ב %s\n"
-"מסתיים ב %s"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4346,7 +4641,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4357,7 +4652,7 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
 msgid "Do not ask me about this program again."
 msgstr ""
 
@@ -4365,7 +4660,7 @@ msgstr ""
 msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -4373,6 +4668,35 @@ msgstr ""
 msgid "invalid time"
 msgstr ""
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/misc.c:113
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
+#: ../calendar/gui/misc.c:119
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/misc.c:123
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "שניה %d"
+msgstr[1] "%d שניות"
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 #, fuzzy
 msgid "Alarm programs"
@@ -4429,396 +4753,489 @@ msgid "Default reminder value"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+msgid "Event Gradient"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
+msgid "Event Transparency"
 msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Gradient of the events in calendar views."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 #, fuzzy
 msgid "Hide completed tasks"
 msgstr "העתק את ההודעה המסומנת"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 #, fuzzy
 msgid "Hide task units"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hide task value"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Last alarm time"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "List of server URLs for free/busy publishing."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Marcus Bains Line"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Marcus Bains Line Color - Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Marcus Bains Line Color - Time bar"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Minute the workday ends on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Minute the workday starts on, 0 to 59."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Month view horizontal pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Month view vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+msgid "Number of units for determining a default reminder."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid "Number of units for determining when to hide tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Overdue tasks color"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Programs that are allowed to be run by alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Show appointment end times in week and month views"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show display alarms in notification tray"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:81
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:82
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Show week numbers in date navigator"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Tasks due today color"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Tasks vertical pane position"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#, no-c-format
 msgid ""
-"The default timezone to use for dates and times in the calendar, as an "
-"untranslated Olsen timezone database location like \"America/New York\"."
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, fuzzy
 msgid "Time divisions"
 msgstr "חלוקות _זמן:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Time the last alarm ran, in time_t."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 #, fuzzy
 msgid "Timezone"
 msgstr "אזור זמן"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Twenty four hour time format"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid "Week start"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to set a default reminder for appointments."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Whether to show week numbers in the date navigator."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+msgid "Whether to use daylight savings time while displaying events."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
 #, fuzzy
 msgid "Work days"
 msgstr "ימי עבודה:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
 msgid "Workday end hour"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
 #, fuzzy
 msgid "Workday end minute"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
 msgid "Workday start hour"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
 msgid "Workday start minute"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+msgid "daylight savings time"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:55
 msgid "Summary contains"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:56
 msgid "Description contains"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:51
+#: ../calendar/gui/cal-search-bar.c:57
+msgid "Category is"
+msgstr "הקטגוריה היא"
+
+#: ../calendar/gui/cal-search-bar.c:58
 msgid "Comment contains"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:52
+#: ../calendar/gui/cal-search-bar.c:59
 msgid "Location contains"
 msgstr ""
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:432
 msgid "Unmatched"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
-msgid "Calendar"
-msgstr "לוח שנה"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "הדפס"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
 msgstr ""
 
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "ימים"
 
 #. Create the On the web source group
+#. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:260
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
+#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
+#: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr ""
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:284
 #: ../plugins/calendar-weather/calendar-weather.c:100
-#, fuzzy
 msgid "Weather"
-msgstr "אחרי"
+msgstr "מזג אויר"
 
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
+#: ../calendar/gui/calendar-component.c:582
+#, fuzzy
+msgid "_New Calendar"
 msgstr "לוח שנה חדש"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:899
 msgid "Failed upgrading calendars."
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1198
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1214
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1336
 msgid "Calendar Source Selector"
 msgstr ""
 
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1544
 msgid "New appointment"
 msgstr "פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1545
 msgid "_Appointment"
 msgstr "_פגישה"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1546
 msgid "Create a new appointment"
 msgstr "צור פגישה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1552
 msgid "New meeting"
 msgstr "ישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1553
 msgid "M_eeting"
 msgstr "_ישיבה"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1554
 msgid "Create a new meeting request"
 msgstr "צור בקשה לישיבה חדשה"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1560
 msgid "New all day appointment"
 msgstr "פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1561
 #, fuzzy
 msgid "All Day A_ppointment"
 msgstr "פגישה לכל ה_יום"
 
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1562
 msgid "Create a new all-day appointment"
 msgstr "צור פגישה חדשה לכל היום"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1568
 msgid "New calendar"
 msgstr "לוח שנה חדש"
 
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1569
 msgid "Cale_ndar"
 msgstr "_לוח שנה"
 
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1570
 msgid "Create a new calendar"
 msgstr "צור לוח שנה חדש"
 
@@ -4838,22 +5255,27 @@ msgstr "תצוגת שבוע"
 msgid "Month View"
 msgstr "תצוגת חודש"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr ""
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#, fuzzy
+msgid "Edit Alarm"
+msgstr "הוסף התרעה"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Alarm</b>"
@@ -4884,17 +5306,17 @@ msgid "Mes_sage:"
 msgstr "הו_דעה:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "נגן צליל"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr "הקפץ התרעה"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "הפעל תוכנית"
 
@@ -4903,7 +5325,7 @@ msgid "Send To:"
 msgstr "שלח אל:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "שלח דוא\"ל"
 
@@ -4931,8 +5353,10 @@ msgstr "אחרי"
 msgid "before"
 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/alarm-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "יום (ימים)"
 
@@ -4948,13 +5372,6 @@ msgstr ""
 msgid "hour(s)"
 msgstr "שעה (שעות)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "שעות"
-
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
 msgstr "דקה (דקות)"
@@ -4963,7 +5380,7 @@ msgstr "דקה (דקות)"
 msgid "start of appointment"
 msgstr "תחילת הפגישה"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4972,491 +5389,355 @@ msgid "A_dd"
 msgstr "הו_סף"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "התרעות"
 
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "ה_סר"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2047
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_מאפיינים"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-#, fuzzy
-msgid "_Add attachment..."
-msgstr "מתקדם..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-msgid "Attachment Bar"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:6
-#: ../composer/e-msg-composer-select-file.c:97
-#: ../composer/e-msg-composer-select-file.c:117
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../composer/e-msg-composer-attachment.glade.h:5
+#: ../composer/e-msg-composer-select-file.c:98
+#: ../composer/e-msg-composer-select-file.c:118
+msgid "_Suggest automatic display of attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
 msgid "Attach file(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Attachment Properties"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
-#: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
-msgid "Description:"
-msgstr "תיאור:"
-
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "File name:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
+msgid "Selected Calendars for Alarms"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "MIME type:"
-msgstr ""
-
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "מופעל"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "הסר"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "אל תסיר"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "כבה"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "אפשר"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 דקות"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 דקות"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 דקות"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 דקות"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 דקות"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 דקות\n"
+"30 דקות\n"
+"15 דקות\n"
+"10 דקות\n"
+"5 דקות"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>התרעות</b>"
+#, no-c-format
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
+#: ../mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>כללי</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">הגדרות</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#, fuzzy
-msgid "<b>Publishing</b>"
-msgstr "<b>מחפש</b>"
+#: ../mail/mail-config.glade.h:17
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">כללי</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>רשימת מטלות</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">אבטחה</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>זמן</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">אבטחה</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>שבוע עבודה</b>"
+#, fuzzy
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">אבטחה</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+msgid "Adjust for daylight sa_ving time"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Day _ends:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "ימים"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "תצוגה"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "א_פשר"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#, fuzzy
-msgid "Free/Busy"
-msgstr "פנוי/עסוק:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "יום שישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "שעות"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "דקות"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "יום שני"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Publishing Table"
-msgstr ""
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"שני\n"
+"שלישי\n"
+"רביעי\n"
+"חמישי\n"
+"שישי\n"
+"שבת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "בחר צבע"
+
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "S_un"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "יום שבת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Select the calendars for alarm notification"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sh_ow a reminder"
 msgstr "ה_צג תזכורת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "T_asks due today:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "T_hu"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "Template:"
 msgstr "מחלקה:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "אזור _זמן:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "מבנה זמן:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "Wee_k starts on:"
+msgstr "ה_שבוע מתחיל ביום:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Work days:"
 msgstr "ימי עבודה:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_12 hour (AM/PM)"
 msgstr "_12 שעות (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_24 hour"
 msgstr "_24 שעות"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_הוסף כתובת"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Ask for confirmation when deleting items"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
 msgstr "_יום מתחיל:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Fri"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Mon"
-msgstr ""
+msgstr "_שני"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_Sat"
-msgstr ""
+msgstr "ש_בת"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
+msgid "_Show appointment end times in week and month view"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Time divisions:"
 msgstr "חלוקות _זמן:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
 msgid "_Tue"
-msgstr ""
+msgstr "ש_לישי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Wed"
-msgstr ""
+msgstr "_רביעי"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr ""
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
+#: ../calendar/gui/dialogs/calendar-setup.c:288
+msgid "Cop_y calendar contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
-msgid "Copy calendar contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:290
+msgid "Cop_y task list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Copy task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+msgid "Cop_y memo list contents locally for offline operation"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 msgid "C_olor:"
 msgstr "_צבע:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 #, fuzzy
-msgid "Tasks List"
+msgid "Task List"
 msgstr "משימות"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#, fuzzy
+msgid "Memo List"
+msgstr "הודעה זו היא דואר זבל"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:479
 #, fuzzy
 msgid "Calendar Properties"
 msgstr "מאפייני גופן"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:481
+msgid "New Calendar"
+msgstr "לוח שנה חדש"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:566
 #, fuzzy
 msgid "Task List Properties"
 msgstr "מאפייני גופן"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+#: ../calendar/gui/dialogs/calendar-setup.c:632
+#, fuzzy
+msgid "New Memo List"
+msgstr "רשימת תפוצה חדשה"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 msgid "Add Calendar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 #, fuzzy
 msgid "Add Task List"
 msgstr "<b>רשימת מטלות</b>"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "בחר צבע"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Task List"
 msgstr "<b>רשימת מטלות</b>"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
+#: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
 msgstr "_רענן:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
 msgstr "_כתובת:"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "שבועות"
@@ -5505,129 +5786,167 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2280
 msgid " to "
 msgstr " אל "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
 msgid " (Completed "
 msgstr " (הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
 msgid "Completed "
 msgstr "הסתיים "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2291
 msgid " (Due "
 msgstr " (עד "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
 msgid "Due "
 msgstr "עד "
 
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2889
 #, c-format
 msgid "Attached message - %s"
 msgstr ""
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:214
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2894
+#: ../composer/e-msg-composer.c:3090
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1162
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "ה_עתק"
+msgstr[0] "הודעה מצורפת"
+msgstr[1] "%d הודעות מצורפות"
 
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3154
+#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1921
 msgid "_Move"
 msgstr "_העבר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3156
+#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1923
 msgid "Cancel _Drag"
 msgstr "בטל _גרירה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:820
 msgid "Could not update object"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2502
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
+#: ../calendar/gui/dialogs/comp-editor.c:998
+#, fuzzy
+msgid "Hide Attachment _Bar"
+msgstr "איש קשר אחד"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../calendar/gui/dialogs/comp-editor.c:1486
+#, fuzzy
+msgid "Show Attachment _Bar"
+msgstr "שמור בשם..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3652
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "ה_סר"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3653 ../mail/em-folder-tree.c:2081
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "_מאפיינים"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3655
+#, fuzzy
+msgid "_Add attachment..."
+msgstr "מתקדם..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1510
+#: ../mail/em-format-html-display.c:2286
+#, fuzzy
+msgid "Show Attachments"
+msgstr "שמור פגישה"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1511
+msgid "Press space key to toggle attachment bar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:2118
+#: ../calendar/gui/dialogs/comp-editor.c:2161
 msgid "Edit Appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2124
+#: ../calendar/gui/dialogs/comp-editor.c:2167
 #, fuzzy, c-format
 msgid "Meeting - %s"
 msgstr "ישיבה"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2169
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2130
+#: ../calendar/gui/dialogs/comp-editor.c:2173
 #, c-format
 msgid "Assigned Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2175
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:2135
+#: ../calendar/gui/dialogs/comp-editor.c:2178
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2188
 msgid "No summary"
 msgstr "אין תקציר"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2733
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
+#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:350
+msgid "attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2876
+#: ../calendar/gui/dialogs/comp-editor.c:2900
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2924
 msgid "Unable to use current version!"
 msgstr ""
 
@@ -5643,6 +5962,10 @@ msgstr ""
 msgid "Destination is read only"
 msgstr ""
 
+#: ../calendar/gui/dialogs/delete-comp.c:206
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
@@ -5704,253 +6027,202 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
+#: ../calendar/gui/dialogs/event-editor.c:564
+#, fuzzy
+msgid "Appoint_ment"
 msgstr "פגישה"
 
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "מופע חוזר"
 
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "תזמון"
+#: ../calendar/gui/dialogs/event-page.c:810
+#: ../calendar/gui/dialogs/event-page.c:2717
+msgid "This event has alarms"
+msgstr ""
 
-#: ../calendar/gui/dialogs/event-editor.c:174
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.c:441
 #, fuzzy
-msgid "Delegatees"
+msgid "Or_ganizer:"
+msgstr "_ארגון:"
+
+#: ../calendar/gui/dialogs/event-page.c:920
+#, fuzzy
+msgid "_Delegatees"
 msgstr "מחק"
 
-#: ../calendar/gui/dialogs/event-editor.c:178
+#: ../calendar/gui/dialogs/event-page.c:922
 #, fuzzy
-msgid "Attendees"
+msgid "Atte_ndees"
 msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "Invitations"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1087
 msgid "Event with no start date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1090
 msgid "Event with no end date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1259
+#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
-msgstr ""
+msgstr "תאריך ההתחלה שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "End date is wrong"
-msgstr ""
+msgstr "תאריך הסיום שגוי"
 
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1292
 msgid "Start time is wrong"
-msgstr ""
+msgstr "שעת ההתחלה שגויה"
 
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "End time is wrong"
+msgstr "שעת הסיום שגויה"
+
+#: ../calendar/gui/dialogs/event-page.c:1454
+#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/task-page.c:906
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:912
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/task-page.c:927
+msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/task-page.c:1200
+msgid "_Add "
+msgstr "_הוסף "
+
+#: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:1900
+#: ../calendar/gui/dialogs/event-page.c:2936
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.c:1908
+#: ../calendar/gui/dialogs/event-page.c:2942
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:2955
+#, fuzzy
+msgid "Customize"
+msgstr "גזור"
+
+#. an empty string is the same as 'None'
+#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1739
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
+#: ../widgets/misc/e-dateedit.c:1721
+msgid "None"
+msgstr "ללא"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr ""
+#, fuzzy
+msgid "Attendee_s..."
+msgstr "<b>מוזמנים</b>"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
-msgid "<b>Send Options</b>"
-msgstr "<b>אפשרויות</b>"
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "ק_טגוריות..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr ""
+#, fuzzy
+msgid "Custom Alarm:"
+msgstr "צליל התרעה מותאם אישית"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr ""
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "תי_אור:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "C_ustomize..."
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Cale_ndar:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
 #, fuzzy
 msgid "Event Description"
 msgstr "תיאור:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
-msgid "Locat_ion:"
-msgstr "_מיקום:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-msgid "Show time as _busy"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr ""
+msgstr "סי_כום:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "ה_תרעה"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-msgid "_Description:"
-msgstr "_תיאור:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr ""
-
-#: ../calendar/gui/dialogs/meeting-page.c:303
-#, fuzzy
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>חזרה</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.c:307
+#: ../calendar/gui/dialogs/event-page.glade.h:17
 #, fuzzy
-msgid "<b>From:</b>"
-msgstr "<b>בית</b>"
-
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "ללא"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr ""
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr ""
+msgid "_Time:"
+msgstr "כ_ותרת:"
 
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
+#. 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/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "for"
 msgstr ""
 
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+msgid "until"
 msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -5985,18 +6257,18 @@ msgstr "שפה"
 msgid "Member"
 msgstr "חבר"
 
+#. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
+#: ../calendar/gui/e-meeting-list-view.c:510
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:147
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-list-view.c:521
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:16
 msgid "Status"
 msgstr "מצב"
 
@@ -6010,14 +6282,8 @@ msgid "C_hange Organizer"
 msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "Con_tacts..."
-msgstr ""
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#, fuzzy
-msgid "Or_ganizer:"
-msgstr "_ארגון:"
+msgid "Co_ntacts..."
+msgstr "אנשי _קשר..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 #, fuzzy
@@ -6025,61 +6291,102 @@ msgid "Organizer"
 msgstr "_ארגון:"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
+#, fuzzy
+msgid "Memo"
+msgstr "מקסיקו"
+
+#: ../calendar/gui/dialogs/memo-page.c:870
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1489
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+msgid "To"
+msgstr "אל"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "תאריך _התחלנ:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+#, fuzzy
+msgid "Su_mmary"
+msgstr "אין תקציר"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#, fuzzy
+msgid "T_o:"
+msgstr "מעלה:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
+#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
+msgid "_Memo Content:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "Add New Calendar"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Calendar Group"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Location"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Name"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
 msgid "<b>Task List Options</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "Add New Task List"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Task List Group"
 msgstr ""
 
-#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Name"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
+msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
+msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
+"You are modifying a recurring journal entry. What would you like to modify?"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -6098,55 +6405,128 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:819
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "on"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:996
 msgid "first"
-msgstr ""
+msgstr "ראשון"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:989
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "second"
-msgstr ""
+msgstr "שני"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1007
 msgid "third"
-msgstr ""
+msgstr "שלישי"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1012
 msgid "fourth"
-msgstr ""
+msgstr "רביעי"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "last"
-msgstr ""
+msgstr "אחרון"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "Other Date"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+msgid "1st to 10th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1057
+msgid "11th to 20th"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1063
+msgid "21st to 31st"
+msgstr ""
+
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
+#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
+#. the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "day"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1226
 msgid "on the"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1419
 msgid "occurrences"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#, fuzzy
+msgid "Add exception"
+msgstr "תיאור"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2202
+msgid "Could not get a selection to modify."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
+msgid "Modify exception"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#, fuzzy
+msgid "Could not get a selection to delete."
+msgstr "ניסיון ההזדהות נכשל.\n"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2385
 msgid "Date/Time"
 msgstr ""
 
@@ -6155,7 +6535,7 @@ msgid "<b>Exceptions</b>"
 msgstr ""
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr ""
 
@@ -6163,35 +6543,37 @@ msgstr ""
 msgid "<b>Recurrence</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:4
+#. 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:6
 msgid "Every"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
+#. 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:9
 msgid "This appointment rec_urs"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr ""
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr ""
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr ""
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr ""
 
@@ -6200,7 +6582,7 @@ msgstr ""
 msgid "Completed date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:517
 #, fuzzy
 msgid "Web Page"
 msgstr "עמוד"
@@ -6217,48 +6599,48 @@ msgstr ""
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "הסתיים"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1008
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1032
 msgid "High"
 msgstr "גבוה"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2379
 msgid "In Progress"
 msgstr "בתהליך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1006
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1030
 msgid "Low"
 msgstr "נמוך"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1007
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1031
 msgid "Normal"
 msgstr "רגיל"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2376
 msgid "Not Started"
 msgstr "לא התחיל"
 
@@ -6267,232 +6649,256 @@ msgid "P_ercent complete:"
 msgstr ""
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+#, fuzzy
+msgid "Stat_us:"
+msgstr "_מצב:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:390
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
-#: ../widgets/misc/e-send-options.glade.h:31
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:33
 msgid "_Priority:"
 msgstr "_עדיפות:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "_מצב:"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Web Page:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-editor.c:138 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "משימה"
+#: ../calendar/gui/dialogs/task-editor.c:425
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "_משימה"
 
-#: ../calendar/gui/dialogs/task-editor.c:162
-#: ../calendar/gui/dialogs/task-editor.c:224
-#: ../calendar/gui/dialogs/task-editor.c:378
-msgid "Assignment"
-msgstr ""
+#: ../calendar/gui/dialogs/task-editor.c:429
+#, fuzzy
+msgid "Task Details"
+msgstr "פרטים"
 
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:822
 msgid "Due date is wrong"
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1650
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/task-page.glade.h:1
 #, fuzzy
-msgid "D_escription:"
-msgstr "תיאור:"
+msgid "Atte_ndees..."
+msgstr "<b>מוזמנים</b>"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:12
-msgid "Sta_rt date:"
-msgstr ""
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "קטגור_יות..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:4
 #, fuzzy
-msgid "Task Description"
-msgstr "תיאור:"
+msgid "Or_ganiser:"
+msgstr "_ארגון:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:15
-msgid "_Due date:"
-msgstr ""
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Time zone:"
+msgstr "אזור _זמן:"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Due date:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Publishing Frequency</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 msgid "<b>Publishing _Location</b>"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "Free/Busy Publishing Settings"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "_Daily"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
 msgid "_Manual"
 msgstr ""
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "_סיסמה:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
 msgstr "_זכור סיסמה"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Username:"
 msgstr "_שם משתמש:"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
 msgid "_Weekly"
 msgstr "_שבועי"
 
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d יום"
+msgstr[1] "%d ימים"
 
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:410
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d שבוע"
+msgstr[1] "%d שבועות"
 
-#: ../calendar/gui/e-alarm-list.c:415
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr ""
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr ""
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr ""
 
-#: ../calendar/gui/e-alarm-list.c:497
+#. 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:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: ../calendar/gui/e-alarm-list.c:500
+#. 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:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr ""
 
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr ""
 
-#: ../calendar/gui/e-alarm-list.c:527
+#. 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:537
 #, c-format
 msgid "%s at %s"
 msgstr ""
 
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2879
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:155
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "ללא-שם"
 
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
-#: ../calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:206
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
-msgid "Start Date:"
+#: ../calendar/gui/e-cal-component-memo-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "תיאור:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:252
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Summary:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr ""
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:263
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:961
 msgid "Status:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr ""
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+msgid "Public"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Private"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:367
+msgid "Confidential"
 msgstr ""
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
@@ -6500,198 +6906,237 @@ msgid "End Date"
 msgstr ""
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr ""
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:439
 msgid "Free"
 msgstr "פנוי"
 
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:440
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:610
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
+#: ../calendar/gui/e-meeting-store.c:764
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "כן"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:178
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "לא"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
-#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
+#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-meeting-list-view.c:169
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1330
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1764
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:705
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:926
 msgid "Recurring"
 msgstr ""
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:928
 msgid "Assigned"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "שמור בשם..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
+msgid "Select folder to save selected attachments..."
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
+#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "_שמירה בשם..."
+
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+msgid "Set as _Background"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:278
+#, fuzzy
+msgid "_Save Selected"
+msgstr "נבחר"
+
+#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:419
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:514
-#, fuzzy
-msgid "Task Table"
-msgstr "משימות"
-
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:704
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
 msgid "Deleting selected objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:957
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1012
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1106
+#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "שמירה בשם..."
 
-#: ../calendar/gui/e-calendar-table.c:1155
+#: ../calendar/gui/e-calendar-table.c:1277
+#: ../calendar/gui/e-calendar-view.c:1681
+#, fuzzy
+msgid "New _Task"
+msgstr "_משימה"
+
+#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
 msgid "Open _Web Page"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1156
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "_שמירה בשם..."
-
-#: ../calendar/gui/e-calendar-table.c:1157
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1283
+#: ../calendar/gui/e-calendar-view.c:1684
+#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
+#: ../mail/em-folder-view.c:1123
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "ה_דפס..."
 
-#: ../calendar/gui/e-calendar-table.c:1161
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1287
+#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_גזור"
 
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1289
+#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "ה_דבק"
 
-#: ../calendar/gui/e-calendar-table.c:1167 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1168 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-table.c:1295
 msgid "_Mark as Complete"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1170
+#: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2043
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_מחק"
+#: ../calendar/gui/e-calendar-table.c:1297
+#, fuzzy
+msgid "_Mark as Incomplete"
+msgstr "סמן כל_א חשוב"
 
-#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-calendar-table.c:1298
+#, fuzzy
+msgid "_Mark Selected Tasks as Incomplete"
+msgstr "העבר את ההודעות שנבחרו לאשפה"
+
+#: ../calendar/gui/e-calendar-table.c:1303
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1326
+#: ../calendar/gui/e-calendar-table.c:1536
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "לחץ כאן כדי להוסיף משימה"
@@ -6701,7 +7146,7 @@ msgstr "לחץ כאן כדי להוסיף משימה"
 msgid "% Complete"
 msgstr "% השלמה"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
 msgid "Complete"
 msgstr ""
 
@@ -6726,98 +7171,120 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1367
 msgid "Moving items"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1369
 msgid "Copying items"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1678
 msgid "New _Appointment..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1679
 msgid "New All Day _Event"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr ""
+#: ../calendar/gui/e-calendar-view.c:1680
+#, fuzzy
+msgid "New _Meeting"
+msgstr "ישיבה חדשה"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "תצוגה נוכחית"
+#: ../calendar/gui/e-calendar-view.c:1691
+msgid "_Current View"
+msgstr "_תצוגה נוכחית"
 
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr ""
+#: ../calendar/gui/e-calendar-view.c:1693
+#, fuzzy
+msgid "Select T_oday"
+msgstr "בחר תיקייה"
 
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Select Date..."
 msgstr ""
 
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr ""
-
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1710
 msgid "Cop_y to Calendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1711
 msgid "Mo_ve to Calendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1712
 #, fuzzy
 msgid "_Delegate Meeting..."
 msgstr "_מחק..."
 
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1713
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1714
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1715
+#, fuzzy
+msgid "_Reply"
+msgstr "השב"
+
+#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "השב ל_כולם"
+
+#: ../calendar/gui/e-calendar-view.c:1721
 msgid "Make this Occurrence _Movable"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1723
 msgid "Delete _All Occurrences"
 msgstr ""
 
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2175
+#, fuzzy, c-format
+msgid "Organizer: %s <%s>"
+msgstr "_ארגון:"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2179
+#, fuzzy, c-format
+msgid "Organizer: %s"
+msgstr "_ארגון:"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
+#, fuzzy, c-format
+msgid "Location: %s"
+msgstr "_מיקום:"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2226
+#, fuzzy, c-format
+msgid "Time: %s %s"
+msgstr "תצוגת יום"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -6825,7 +7292,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. 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:807
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
@@ -6836,540 +7307,566 @@ msgstr ""
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-day-view-top-item.c:1311
+#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-week-view-main-item.c:310
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 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:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
+#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:774
+#. For Translators: In this can also be translated as "With the period of %d
+#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d day/days"
+#. For Translators : 'Every day' is event Recurring every day
+#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:779
+#. For Translators: In this can also be translated as "With the period of %d
+#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d week/weeks"
+#. For Translators : 'Every week' is event Recurring every week
+#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:781
+#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
+#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
+#: ../calendar/gui/e-itip-control.c:789
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:789
+#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
+#: ../calendar/gui/e-itip-control.c:798
 msgid " and "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:796
+#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
+#: ../calendar/gui/e-itip-control.c:806
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:809
+#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
+#. eg,third monday of every month
+#: ../calendar/gui/e-itip-control.c:821
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:816
+#. For Translators: In this can also be translated as "With the period of %d
+#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d month/months"
+#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
+#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
+#. %d is a digit
+#: ../calendar/gui/e-itip-control.c:834
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:820
+#. For Translators: In this can also be translated as "With the period of %d
+#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
+#. Every %d year/years"
+#. For Translators : 'Every year' is event Recurring every year
+#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
+#: ../calendar/gui/e-itip-control.c:843
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:831
+#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
+#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
+#: ../calendar/gui/e-itip-control.c:856
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/e-itip-control.c:840
+#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
+#: ../calendar/gui/e-itip-control.c:866
 msgid ", ending on "
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:864
+#. For Translators : 'starts' is starts:date implying a task starts on what date
+#: ../calendar/gui/e-itip-control.c:888
 msgid "Starts"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:877
+#. For Translators : 'ends' is ends:date implying a task ends on what date
+#: ../calendar/gui/e-itip-control.c:902
 msgid "Ends"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:936
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:993
 msgid "iCalendar Error"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
+#: ../plugins/itip-formatter/itip-view.c:342
+#: ../plugins/itip-formatter/itip-view.c:343
+#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:479
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1116
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1139
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/itip-utils.c:687
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
+#: ../plugins/itip-formatter/itip-formatter.c:1755
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
+#: ../plugins/itip-formatter/itip-formatter.c:1758
 msgid "Declined"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1256
 msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1233
+#: ../calendar/gui/e-itip-control.c:1258
 msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1337
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1338
 msgid "Meeting Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1344
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1358
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1359
 msgid "Meeting Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
-msgstr ""
+#: ../calendar/gui/e-itip-control.c:1375
+#, fuzzy
+msgid "Meeting Cancelation"
+msgstr "בחר פעולה"
 
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1502
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1413
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1414
 msgid "Task Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1421
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1423
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1424
 msgid "Task Proposal"
 msgstr ""
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Task Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1435
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1436
 msgid "Task Update Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
-msgid "<b>%s</b> has cancelled a task."
+msgid "<b>%s</b> has canceled a task."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
-msgstr ""
+#: ../calendar/gui/e-itip-control.c:1452
+#, fuzzy
+msgid "Task Cancelation"
+msgstr "תיאור:"
 
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Bad Task Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1487
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1488
 msgid "Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1492
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1493
 msgid "Free/Busy Request"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1497
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1498
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1503
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1578
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1637
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1702
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1936
 msgid "Update complete\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1964
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:2003
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:2006
+#: ../plugins/itip-formatter/itip-formatter.c:1104
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2011
-msgid "Removal Complete"
-msgstr ""
-
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
 msgid "Item sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2162
 msgid "Choose an action:"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2234
 msgid "Update"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2262
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "קבל"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2263
 msgid "Tentatively accept"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2264
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "סרב"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2293
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2321
 msgid "Update respondent status"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2349
 msgid "Send Latest Information"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
+#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
-#, no-c-format
-msgid "%P %%"
-msgstr ""
-
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:10
+#: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr ""
 
-#: ../calendar/gui/e-itip-control.glade.h:12
-msgid "date-end"
-msgstr ""
-
-#: ../calendar/gui/e-itip-control.glade.h:13
-msgid "date-start"
-msgstr ""
-
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:70
-#: ../calendar/gui/e-meeting-list-view.c:153
+#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
 msgstr "משתתפים דרושים"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Individual"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
 msgid "Room"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:761
 msgid "Required Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
 msgid "Optional Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
 msgid "Non-Participant"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/e-meeting-store.c:771
 msgid "Needs Action"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Tentative"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/itip-utils.c:696
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "Delegated"
 msgstr ""
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:471
+msgid "Attendee                          "
+msgstr ""
+
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel-item.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:2113
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -7377,22 +7874,14 @@ msgstr ""
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel-item.c:468
+#: ../calendar/gui/e-meeting-time-sel.c:2146
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:472
 msgid "%m/%d/%Y"
 msgstr ""
 
@@ -7404,6 +7893,11 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: ../calendar/gui/e-meeting-time-sel.c:428
+#, fuzzy
+msgid "A_ttendees..."
+msgstr "<b>מוזמנים</b>"
+
 #: ../calendar/gui/e-meeting-time-sel.c:445
 msgid "O_ptions"
 msgstr ""
@@ -7448,86 +7942,126 @@ msgstr ""
 msgid "Required people and _one resource"
 msgstr ""
 
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "הכנס סיסמה עבור %s"
+#: ../calendar/gui/e-meeting-time-sel.c:615
+msgid "_Start time:"
+msgstr ""
 
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-meeting-time-sel.c:642
+msgid "_End time:"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:919
+#, fuzzy
+msgid "_Delete Selected Memos"
+msgstr "מוחק את האובייקטים שנבחרו..."
+
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#, fuzzy
+msgid "Click to add a memo"
+msgstr "לחץ כאן כדי להוסיף משימה"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#, fuzzy
+msgid "Memo sort"
+msgstr "לא התחיל"
+
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
+#: ../calendar/gui/gnome-cal.c:2748
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:772
+#, fuzzy
+msgid "Loading memos"
+msgstr "טען _תמונות"
+
+#: ../calendar/gui/e-memos.c:853
+#, fuzzy, c-format
+msgid "Opening memos at %s"
+msgstr "פותח %s"
+
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+msgid "Deleting selected objects..."
+msgstr "מוחק את האובייקטים שנבחרו..."
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, c-format
+msgid "Enter the password for %s"
+msgstr "הכנס סיסמה עבור %s"
+
+#: ../calendar/gui/e-tasks.c:885
 msgid "Loading tasks"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:972
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/e-tasks.c:1126
+#: ../calendar/gui/e-tasks.c:1217
 msgid "Completing tasks..."
 msgstr "מסיים משימות..."
 
-#: ../calendar/gui/e-tasks.c:1149
-msgid "Deleting selected objects..."
-msgstr "מוחק את האובייקטים שנבחרו..."
-
-#: ../calendar/gui/e-tasks.c:1176
+#: ../calendar/gui/e-tasks.c:1267
 msgid "Expunging"
 msgstr ""
 
-#: ../calendar/gui/e-timezone-entry.c:133
+#: ../calendar/gui/e-timezone-entry.c:135
 #, fuzzy
-msgid "Timezone Button"
-msgstr "אזור זמן"
+msgid "Select Timezone"
+msgstr "בחר אזור זמן"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:327
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1522
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:820
 msgid "Updating query"
 msgstr ""
 
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr ""
+#: ../calendar/gui/gnome-cal.c:2409
+#, fuzzy
+msgid "_Custom View"
+msgstr "_תצוגה נוכחית"
 
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr ""
+#: ../calendar/gui/gnome-cal.c:2410
+#, fuzzy
+msgid "_Save Custom View"
+msgstr "תצוגה נוכחית"
 
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr ""
+#: ../calendar/gui/gnome-cal.c:2415
+#, fuzzy
+msgid "_Define Views..."
+msgstr "תצוגת שבוע"
 
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2579
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2598
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2607
+#, fuzzy, c-format
+msgid "Loading memos at %s"
+msgstr "מעביר את ההודעות ל%s"
+
+#: ../calendar/gui/gnome-cal.c:2713
 #, c-format
 msgid "Opening %s"
 msgstr "פותח %s"
 
-#: ../calendar/gui/gnome-cal.c:3388
+#: ../calendar/gui/gnome-cal.c:3641
 msgid "Purging"
 msgstr ""
 
@@ -7587,61 +8121,146 @@ msgstr ""
 msgid "_Select Today"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Event information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Task information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
 msgid "Journal information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
 msgid "Free/Busy information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:657
 msgid "Calendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:706
 msgid "Updated"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:714
 msgid "Refresh"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:718
 msgid "Counter-proposal"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:790
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:800
 msgid "iCalendar information"
 msgstr ""
 
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:955
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:451
+#, fuzzy
+msgid "_New Memo List"
+msgstr "רשימת תפוצה חדשה"
+
+#: ../calendar/gui/memos-component.c:527
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:563
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:576
+msgid "Failed upgrading memos."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:874
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:887
+msgid "There is no calendar available for creating memos"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:983
+msgid "Memo Source Selector"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1166
+#, fuzzy
+msgid "New memo"
+msgstr "ישיבה חדשה"
+
+#: ../calendar/gui/memos-component.c:1167
+msgid "Mem_o"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1168
+#, fuzzy
+msgid "Create a new memo"
+msgstr "צור פריט מבחן חדש"
+
+#: ../calendar/gui/memos-component.c:1174
+#, fuzzy
+msgid "New shared memo"
+msgstr "תיקייה _חדשה..."
+
+#: ../calendar/gui/memos-component.c:1175
+#, fuzzy
+msgid "_Shared memo"
+msgstr "לא התחיל"
+
+#: ../calendar/gui/memos-component.c:1176
+#, fuzzy
+msgid "Create a shared new memo"
+msgstr "צור פריט מבחן חדש"
+
+#: ../calendar/gui/memos-component.c:1182
+#, fuzzy
+msgid "New memo list"
+msgstr "רשימת תפוצה חדשה"
+
+#: ../calendar/gui/memos-component.c:1183
+msgid "Memo li_st"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1184
+#, fuzzy
+msgid "Create a new memo list"
+msgstr "הוסף משימה חדשה"
+
+#: ../calendar/gui/memos-control.c:340
+#, fuzzy
+msgid "Print Memos"
+msgstr "הדפס פריט"
+
+#: ../calendar/gui/migration.c:164
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -7649,7 +8268,7 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:168
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -7658,331 +8277,333 @@ msgid ""
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:799
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:967
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/migration.c:1211
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
+#, fuzzy
+msgid "Notes"
+msgstr "הערה"
+
+#: ../calendar/gui/print.c:574
 msgid "1st"
 msgstr ""
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "2nd"
 msgstr ""
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "3rd"
 msgstr ""
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "4th"
 msgstr ""
 
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:574
 msgid "5th"
 msgstr ""
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "6th"
 msgstr ""
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "7th"
 msgstr ""
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "8th"
 msgstr ""
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "9th"
 msgstr ""
 
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:575
 msgid "10th"
 msgstr ""
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "11th"
 msgstr ""
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "12th"
 msgstr ""
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "13th"
 msgstr ""
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "14th"
 msgstr ""
 
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:576
 msgid "15th"
 msgstr ""
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "16th"
 msgstr ""
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "17th"
 msgstr ""
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "18th"
 msgstr ""
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "19th"
 msgstr ""
 
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:577
 msgid "20th"
 msgstr ""
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "21st"
 msgstr ""
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "22nd"
 msgstr ""
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "23rd"
 msgstr ""
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "24th"
 msgstr ""
 
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:578
 msgid "25th"
 msgstr ""
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "26th"
 msgstr ""
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "27th"
 msgstr ""
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "28th"
 msgstr ""
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "29th"
 msgstr ""
 
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:579
 msgid "30th"
 msgstr ""
 
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:580
 msgid "31st"
 msgstr ""
 
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr ""
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr ""
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr ""
 
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:655
 msgid "We"
 msgstr ""
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr ""
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr ""
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr ""
 
 #. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1936
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
 msgid "%a %b %d"
 msgstr ""
 
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1962
 msgid "%a %d %Y"
 msgstr ""
 
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
+#: ../calendar/gui/print.c:1969
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1973
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1981
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1988
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2317
+msgid "Appointment"
+msgstr "פגישה"
+
+#: ../calendar/gui/print.c:2319
+msgid "Task"
+msgstr "משימה"
+
+#: ../calendar/gui/print.c:2341
 #, c-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
-msgid "Location: %s"
-msgstr "_מיקום:"
-
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2392
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2421
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2433
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2447
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2458
 msgid "Contacts: "
 msgstr ""
 
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "תצוגה לפני הדפסה"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2636
 msgid "Print Item"
 msgstr "הדפס פריט"
 
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr ""
+#: ../calendar/gui/tasks-component.c:441
+#, fuzzy
+msgid "_New Task List"
+msgstr "רשימת תפוצה חדשה"
 
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:517
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:566
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:981
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1164
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1165
-msgid "_Task"
-msgstr "_משימה"
-
-#: ../calendar/gui/tasks-component.c:1166
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "הוסף משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr ""
 
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/tasks-component.c:1180
 #, fuzzy
 msgid "Create a new assigned task"
 msgstr "הוסף משימה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1186
 #, fuzzy
 msgid "New task list"
 msgstr "רשימת תפוצה חדשה"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1187
 #, fuzzy
-msgid "Task l_ist"
+msgid "Tas_k list"
 msgstr "משימות"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1188
 #, fuzzy
 msgid "Create a new task list"
 msgstr "הוסף משימה חדשה"
 
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:446
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -7990,11 +8611,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:449
 msgid "Do not ask me again."
 msgstr ""
 
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:483
 msgid "Print Tasks"
 msgstr ""
 
@@ -8003,41 +8624,42 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "אבגדהוש"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
 #, fuzzy
 msgid "Opening calendar"
 msgstr "לוח שנה חדש"
 
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr ""
+#: ../calendar/importers/icalendar-importer.c:521
+#, fuzzy
+msgid "Reminder!"
+msgstr "הודעת שליחה"
 
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
@@ -8571,7 +9193,7 @@ msgid "America/Nassau"
 msgstr ""
 
 #: ../calendar/zones.h:138
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
 msgid "America/New_York"
 msgstr ""
 
@@ -9571,15 +10193,67 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#, c-format
+msgid "%.0fK"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#, c-format
+msgid "%.0fM"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#, c-format
+msgid "%.0fG"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:1012
+msgid "Attachment Bar"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
+#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:571
 msgid "Choose folders to post the message to."
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:603
 msgid "Click here for the address book"
 msgstr ""
 
@@ -9590,7 +10264,7 @@ msgstr ""
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:635
 #, fuzzy
 msgid "_Reply-To:"
 msgstr "השב אל:"
@@ -9598,7 +10272,7 @@ msgstr "השב אל:"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:642
 #, fuzzy
 msgid "Fr_om:"
 msgstr "מאת:"
@@ -9606,33 +10280,33 @@ msgstr "מאת:"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:649
 #, fuzzy
 msgid "S_ubject:"
 msgstr "נושא:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:658
 #, fuzzy
 msgid "_To:"
 msgstr "אל:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:659
 msgid "Enter the recipients of the message"
 msgstr "הכנס את הנמענים של ההודעה"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:662
 msgid "_Cc:"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:666
 msgid "_Bcc:"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:667
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -9641,16 +10315,16 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:674
 #, fuzzy
 msgid "_Post To:"
 msgstr "_לך אל"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:679
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:684
 msgid "Post To:"
 msgstr ""
 
@@ -9658,63 +10332,76 @@ msgstr ""
 msgid "A_ttach"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:738
+#: ../composer/e-msg-composer-select-file.c:243
+#, fuzzy
+msgid "Insert Attachment"
+msgstr "איש קשר אחד"
+
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2531
+#, fuzzy
+msgid "Hide _Attachment Bar"
+msgstr "איש קשר אחד"
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2534
+#: ../composer/e-msg-composer.c:3898
+#, fuzzy
+msgid "Show _Attachment Bar"
+msgstr "שמור בשם..."
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr ""
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1724
 #, fuzzy
 msgid "Open File"
 msgstr "פתח קובץ"
 
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2174 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2277
 #, fuzzy
 msgid "Si_gnature:"
 msgstr "חתימה:"
 
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
-msgstr ""
-
-#: ../composer/e-msg-composer.c:3643
-msgid "_Attachment Bar"
-msgstr ""
+#: ../composer/e-msg-composer.c:2545 ../composer/e-msg-composer.c:3780
+#: ../composer/e-msg-composer.c:3783
+#, fuzzy
+msgid "Compose Message"
+msgstr "_חבר הודעה חדשה"
 
-#: ../composer/e-msg-composer.c:4718
+#: ../composer/e-msg-composer.c:5007
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"<b>(The composer contains a non-text message body, which cannot be edited.)</"
+"b>"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:1
@@ -9738,7 +10425,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{1}&quot;."
 msgstr ""
 
@@ -9778,38 +10465,30 @@ msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:15
 msgid "Download in progress. Do you want to send the mail?"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:17
+#: ../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 ""
 
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr ""
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 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
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -9817,46 +10496,53 @@ msgid ""
 "installed."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:28
 #, fuzzy
-msgid "_Discard Changes"
-msgstr "התעלם משינויים"
+msgid "_Do not Recover"
+msgstr "אל תסיר"
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Recover"
+msgstr "ש_חזר"
 
 #: ../composer/mail-composer.error.xml.h:30
-#, fuzzy
 msgid "_Save Message"
-msgstr "_הודעת דואר"
+msgstr "ש_מור הודעה"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:523
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+msgid "Groupware Suite"
 msgstr ""
 
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr "מנהל המידע האישי ולקוח הדוא\"ל Evolution"
+
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr ""
@@ -9866,6 +10552,7 @@ msgid "calendar information"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:1
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
@@ -9873,14 +10560,17 @@ msgid ""
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:4
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
 msgid "<b>Out of Office Message:</b>"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:5
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
 msgid "<b>Status:</b>"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:6
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
 msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
@@ -9888,38 +10578,38 @@ msgid ""
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:8
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
 msgid "I am currently in the office"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:9
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
 msgid "I am currently out of the office"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:12
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
 msgid "Out of Office Assistant"
 msgstr ""
 
 #: ../designs/OOA/ooa.glade.h:13
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
 msgid "Yes, Change Status"
 msgstr ""
 
 #: ../designs/read_receipts/read.glade.h:1
-msgid "      "
-msgstr ""
-
-#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Receiving Email</b>"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:3
+#: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Sending Email:</b>"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:4
+#: ../designs/read_receipts/read.glade.h:3
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
@@ -9927,67 +10617,66 @@ msgid ""
 "a receipt from you.</small>"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:6
+#: ../designs/read_receipts/read.glade.h:5
 msgid "Always send back a read receipt"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:7
+#: ../designs/read_receipts/read.glade.h:6
 msgid "Ask me if I want to send back a read receipt"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:8
+#: ../designs/read_receipts/read.glade.h:7
 msgid "Never send back a read receipt"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:9
+#: ../designs/read_receipts/read.glade.h:8
 msgid "Read Receipts"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:10
+#: ../designs/read_receipts/read.glade.h:9
 msgid "Request a read receipt for all messages I send"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:11
+#: ../designs/read_receipts/read.glade.h:10
 msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
-#: ../designs/read_receipts/read.glade.h:12
+#: ../designs/read_receipts/read.glade.h:11
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:283
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr ""
 
-#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "תקלת Evolution"
 
-#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+#: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
 msgid "Evolution Warning"
 msgstr "אזהרת Evolution"
 
-#: ../e-util/e-error.c:124
+#: ../e-util/e-error.c:126
 msgid "Evolution Information"
 msgstr ""
 
-#: ../e-util/e-error.c:126
+#: ../e-util/e-error.c:128
 msgid "Evolution Query"
 msgstr ""
 
 #. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:454
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "Internal error, unknown error '%s' requested"
 msgstr ""
 
 #: ../e-util/e-system.error.xml.h:2
@@ -10008,109 +10697,11 @@ msgstr ""
 msgid "File exists &quot;{0}&quot;."
 msgstr "הקובץ קיים \"}0{\"."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr ""
 
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr ""
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr ""
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr ""
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr ""
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr ""
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr ""
 
@@ -10118,8 +10709,8 @@ msgstr ""
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "לפני שנייה אחת"
+msgstr[1] "לפני %d שניות"
 
 #: ../filter/filter-datespec.c:79
 #, c-format
@@ -10180,25 +10771,24 @@ msgstr ""
 msgid "Select a time to compare against"
 msgstr ""
 
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
 msgid "Choose a file"
 msgstr ""
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr ""
 
@@ -10206,52 +10796,55 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: ../filter/filter-rule.c:791
-#, fuzzy
-msgid "_Rule name:"
-msgstr "שם החוק"
-
-#: ../filter/filter-rule.c:819
-#, fuzzy
-msgid "If"
-msgstr "I"
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr "_שם חיפוש:"
 
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
 msgstr ""
 
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr ""
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "אם כל הקריטריונים נמצאו"
 
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr ""
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "אם קריטריון כלשהו נמצא"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:868
+#, fuzzy
+msgid "Find items:"
+msgstr "מצא בהודעה"
+
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr ""
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr ""
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr ""
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr ""
+
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr ""
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:328
 msgid "Incoming"
-msgstr ""
+msgstr "נכנס"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
 msgid "Outgoing"
-msgstr ""
+msgstr "יוצא"
 
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
@@ -10273,7 +10866,7 @@ msgstr ""
 msgid "Missing file name."
 msgstr ""
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr ""
 
@@ -10339,9 +10932,9 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:179
 msgid "seconds"
-msgstr ""
+msgstr "שניות"
 
 #: ../filter/filter.glade.h:19
 msgid "the current time"
@@ -10353,17 +10946,17 @@ msgstr ""
 
 #: ../filter/filter.glade.h:22
 msgid "years"
-msgstr ""
+msgstr "שנים"
 
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "הוסף חוק"
 
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "ערוך חוק"
 
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "שם החוק"
 
@@ -10408,16 +11001,17 @@ msgstr ""
 msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:524
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:581
+#: ../mail/mail-component.c:582 ../mail/mail-component.c:723
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "דואר"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:532
 msgid "Mail Accounts"
 msgstr "חשבונות דואר"
 
@@ -10430,12 +11024,12 @@ msgstr "העדפות דואר"
 msgid "_Mail"
 msgstr "_דואר"
 
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s הסכם שימוש"
 
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10444,112 +11038,124 @@ msgid ""
 "and tick the check box for accepting it\n"
 msgstr ""
 
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:494
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:511
 msgid "Select Folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:778
 #, fuzzy
 msgid "Ask for each message"
 msgstr "הודעה שלא נקראה:"
 
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "זהות"
 
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "קבלת דוא\"ל"
 
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:2046
 msgid "Automatically check for _new mail every"
 msgstr "בדוק אם קיים _דואר חדש כל"
 
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "שליחת דוא\"ל"
 
-#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr ""
 
 #. Security settings
-#: ../mail/em-account-editor.c:2223 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:311
+#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "אבטחה"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2260 ../mail/em-account-editor.c:2334
+#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
 msgid "Receiving Options"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2261 ../mail/em-account-editor.c:2335
+#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
 msgid "Checking for New Mail"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr ""
 
-#: ../mail/em-account-editor.c:2659 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr ""
 
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Disable"
+msgstr "כבה"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:411
+msgid "Enable"
+msgstr "אפשר"
+
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr ""
 
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
+msgid "Enabled"
+msgstr "מופעל"
+
+#: ../mail/em-account-prefs.c:525
 msgid "Account name"
 msgstr "שם החשבון"
 
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:527
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../mail/em-account-prefs.c:517
-#, fuzzy
-msgid "Mail Accounts Table"
-msgstr "חשבונות דואר"
-
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:999
 msgid "Unnamed"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "שפה/ות"
 
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr ""
 
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "חתימה/ות"
 
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1665
 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:1695
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr ""
 
@@ -10590,6 +11196,12 @@ msgstr ""
 msgid "Date sent"
 msgstr ""
 
+#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-memos.xml.h:6 ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "מחק"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "נמחק"
@@ -10687,8 +11299,7 @@ msgstr "דואר זבל"
 msgid "Junk Test"
 msgstr "מבחן דואר זבל"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr ""
 
@@ -10729,11 +11340,11 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "קרא"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
 msgid "Recipients"
 msgstr "נמענים"
 
@@ -10761,11 +11372,11 @@ msgstr ""
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Score"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
 msgid "Sender"
 msgstr "שולח"
 
@@ -10775,7 +11386,8 @@ msgstr ""
 
 #: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
-msgstr "גודל (ק\"ב("
+msgstr ""
+"גודל (ק\"ב)"
 
 #: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
@@ -10797,12 +11409,12 @@ msgstr "מתחיל ב"
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "נושא"
 
@@ -10815,28 +11427,82 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr ""
 
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:170
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
 msgstr "צור תיקייה וירטואלית מההודעה"
 
+#: ../mail/em-folder-browser.c:192
+msgid "All Messages"
+msgstr "כל ההודעות"
+
+#: ../mail/em-folder-browser.c:193
+msgid "Unread Messages"
+msgstr "הודעות שלא נקראו"
+
+#: ../mail/em-folder-browser.c:195
+#, fuzzy
+msgid "No Label"
+msgstr "ללא תמונה"
+
+#: ../mail/em-folder-browser.c:202
+#, fuzzy
+msgid "Read Messages"
+msgstr "_פתח הודעה"
+
+#: ../mail/em-folder-browser.c:203
+#, fuzzy
+msgid "Recent Messages"
+msgstr "_פתח הודעה"
+
+#: ../mail/em-folder-browser.c:204
+msgid "Last 5 Days' Messages"
+msgstr ""
+
+#: ../mail/em-folder-browser.c:205
+#, fuzzy
+msgid "Messages with Attachments"
+msgstr "שמור פגישה"
+
+#: ../mail/em-folder-browser.c:206
+#, fuzzy
+msgid "Important Messages"
+msgstr "ההודעה ה_חשוב הבאה"
+
+#: ../mail/em-folder-browser.c:207
+#, fuzzy
+msgid "Messages Not Junk"
+msgstr "הודעה זו אינה דואר זבל"
+
+#: ../mail/em-folder-browser.c:1030
+#, fuzzy
+msgid "Account Search"
+msgstr "שם החשבון"
+
+#: ../mail/em-folder-browser.c:1074
+#, fuzzy
+msgid "All Account Search"
+msgstr "שם החשבון"
+
 #. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:150
+msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "סה\"כ הודעות:"
 msgstr[1] "סה\"כ הודעות:"
 
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:163
+msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "הודעה שלא נקראה:"
 msgstr[1] "הודעות שלא נקראו:"
 
-#: ../mail/em-folder-properties.c:278
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../mail/em-folder-properties.c:316
+#: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
-msgstr ""
+msgstr "מאפייני תיקיה"
 
 #: ../mail/em-folder-selection-button.c:123
 msgid "<click here to select a folder>"
@@ -10850,554 +11516,582 @@ msgstr "צור"
 msgid "Folder _name:"
 msgstr "_שם תיקייה:"
 
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
 #, fuzzy
 msgid "Search Folders"
 msgstr "בחר תיקייה"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
 #, fuzzy
 msgid "Drafts"
 msgstr "תאריך"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-folder.c:587
 msgid "Inbox"
 msgstr "דואר נכנס"
 
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
 msgid "Outbox"
 msgstr ""
 
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
-#, fuzzy
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
 msgid "Sent"
-msgstr "שלח"
+msgstr "דואר יוצא"
 
-#: ../mail/em-folder-tree-model.c:498 ../mail/em-folder-tree-model.c:802
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "בטעינה..."
 
-#: ../mail/em-folder-tree.c:689
+#. Translators: This is the string used for displaying the
+#. * folder names in folder trees. "%s" will be replaced by
+#. * the folder's name and "%u" will be replaced with the
+#. * number of unread messages in the folder.
+#. *
+#. * Most languages should translate this as "%s (%u)". The
+#. * languages that use localized digits (like Persian) may
+#. * need to replace "%u" with "%Iu". Right-to-left languages
+#. * (like Arabic and Hebrew) may need to add bidirectional
+#. * formatting codes to take care of the cases the folder
+#. * name appears in either direction.
+#. *
+#. * Do not translate the "folder-display|" part. Remove it
+#. * from your translation.
+#.
+#: ../mail/em-folder-tree.c:366
+#, c-format
+msgid "folder-display|%s (%u)"
+msgstr "%s (%u)"
+
+#: ../mail/em-folder-tree.c:717
 #, fuzzy
 msgid "Mail Folder Tree"
 msgstr "_תיקיית דואר"
 
-#: ../mail/em-folder-tree.c:849
+#: ../mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "מעביר את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:851
+#: ../mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "מעתיק את התיקייה %s"
 
-#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1825
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "מעביר הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1827
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "מעתיק הודעות אל התיקייה %s"
 
-#: ../mail/em-folder-tree.c:876
+#: ../mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "הע_תק אל תיקייה"
 
-#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:114
+#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "הע_בר אל תיקייה"
 
-#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:53
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../mail/em-folder-tree.c:2032
+#: ../mail/em-folder-tree.c:2066
 msgid "Open in _New Window"
 msgstr "פתח ב_חלון חדש"
 
-#: ../mail/em-folder-tree.c:2036
+#: ../mail/em-folder-tree.c:2070
 msgid "_Copy..."
 msgstr "ה_עתק..."
 
-#: ../mail/em-folder-tree.c:2037
+#: ../mail/em-folder-tree.c:2071
 msgid "_Move..."
 msgstr "הע_בר..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2041
+#: ../mail/em-folder-tree.c:2075
 msgid "_New Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_שנה שם..."
 
+#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
+msgid "_Empty Trash"
+msgstr "_רוקן את האשפה"
+
 #: ../mail/em-folder-utils.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Copying `%s' to `%s'"
-msgstr "מעתיק את ההודעות ל%s"
+msgstr "מעתיק `%s' ל-`%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
+#: ../mail/em-folder-view.c:1023
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
 msgid "C_opy"
 msgstr "_העתק"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "החלף את שם התיקייה \"%s\" ל:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "החלף את שם התיקייה"
-
-#: ../mail/em-folder-utils.c:511
-#, fuzzy
-msgid "Folder names cannot contain '/'"
-msgstr "שם התיקייה לא יכול להכיל את התו \"/\"."
-
 #: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "יוצר את התיקייה `%s'"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "צור תיקייה"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "ציין היכן ליצור את התיקייה:"
 
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "השב ל_כולם"
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:122
+#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "הע_בר"
 
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_ערוך כהודעה חדשה..."
 
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1127
 msgid "U_ndelete"
 msgstr "_בטל מחיקה"
 
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1128
 msgid "_Move to Folder..."
-msgstr ""
+msgstr "_העבר לתיקייה..."
 
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1129
 msgid "_Copy to Folder..."
 msgstr "ה_עתק לתיקייה..."
 
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1132
 msgid "Mar_k as Read"
 msgstr "_סמן כנקרא"
 
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1133
 msgid "Mark as _Unread"
 msgstr "סמן כ_לא נקרא"
 
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1134
 msgid "Mark as _Important"
 msgstr "סמן כ_חשוב"
 
-#: ../mail/em-folder-view.c:1058
-msgid "_Mark as Unimportant"
+#: ../mail/em-folder-view.c:1135
+msgid "Mark as Un_important"
 msgstr "סמן כל_א חשוב"
 
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1136
 msgid "Mark as _Junk"
 msgstr "סמן כ_דואר זבל"
 
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1137
 msgid "Mark as _Not Junk"
 msgstr "סמן _כלא דואר זבל"
 
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1138
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1140
+#, fuzzy
+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:1141 ../widgets/misc/e-dateedit.c:475
+#, fuzzy
+msgid "_None"
+msgstr "ללא"
+
+#: ../mail/em-folder-view.c:1146
 msgid "Fla_g Completed"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1147
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1150
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1151
 msgid "Search Folder from _Subject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1152
 msgid "Search Folder from Se_nder"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1153
 msgid "Search Folder from _Recipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1154
 msgid "Search Folder from Mailing _List"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1158
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1159
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1160
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1161
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:2012 ../mail/em-folder-view.c:2056
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2155
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "הדפס הודעה"
 
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2315
 msgid "Unable to retrieve message"
 msgstr ""
 
-#: ../mail/em-folder-view.c:2413
-msgid "_Copy Link Location"
-msgstr "_העתק את מיקום הקישור"
-
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2513
 #, fuzzy
 msgid "Create _Search Folder"
 msgstr "צור תיקייה חדשה"
 
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2514
 #, fuzzy
 msgid "_From this Address"
 msgstr "כתובת _דוא\"ל:"
 
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2515
 #, fuzzy
 msgid "_To this Address"
 msgstr "_כתובת:"
 
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2872
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
+#: ../mail/em-folder-view.c:2877
+msgid "Click to hide/unhide addresses"
+msgstr ""
+
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:445
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:650
+msgid "Fi_nd:"
+msgstr "_חפש:"
+
+#: ../mail/em-format-html-display.c:678
+msgid "Fo_rward"
+msgstr "הע_בר"
+
+#: ../mail/em-format-html-display.c:683
+#, fuzzy
+msgid "M_atch case"
+msgstr "בטל ה_כל"
+
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "לא חתום"
 
-#: ../mail/em-format-html-display.c:696
+#: ../mail/em-format-html-display.c:930
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "הודעה זו לא חתומה. אין שום ביטחון שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:697 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "חתימה חוקית"
 
-#: ../mail/em-format-html-display.c:697
+#: ../mail/em-format-html-display.c:931
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "הודעה זו חתומה באופן חוקי. קיימת סבירות גבוהה שזו הודעה מקורית."
 
-#: ../mail/em-format-html-display.c:698 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "חתימה בלתי חוקית"
 
-#: ../mail/em-format-html-display.c:698
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "חתימה חוקית, לא מצליח לאשר את השולח"
 
-#: ../mail/em-format-html-display.c:699
+#: ../mail/em-format-html-display.c:933
 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:705 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "לא מוצפן"
 
-#: ../mail/em-format-html-display.c:705
+#: ../mail/em-format-html-display.c:939
 msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "מוצפן, חלש"
 
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:940
 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 "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "מוצפן"
 
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:941
 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:708 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "מוצפן, חזק"
 
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:942
 msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:809 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:824
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1106
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1114
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1117
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "ה_חבא"
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1451
 #, fuzzy
 msgid "Show _Original Size"
 msgstr "הגודל המקורי"
 
-#: ../mail/em-format-html-display.c:1550
-msgid "Attachment Button"
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1796
-msgid "Select folder to save selected attachments..."
-msgstr ""
-
-#: ../mail/em-format-html-display.c:1804
+#: ../mail/em-format-html-display.c:2140
 #, fuzzy
-msgid "Save Selected..."
+msgid "_Save Selected..."
 msgstr "בחר..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1871
+#: ../mail/em-format-html-display.c:2207
 #, fuzzy, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
+msgid "%d at_tachment"
+msgid_plural "%d at_tachments"
 msgstr[0] "איש קשר אחד"
 msgstr[1] "%d אנשי קשר"
 
-#: ../mail/em-format-html-display.c:1935
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
+msgid "S_ave"
+msgstr "_שמור"
+
+#: ../mail/em-format-html-display.c:2225
+msgid "S_ave All"
+msgstr "שמור ה_כל"
+
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr ""
 
-#: ../mail/em-format-html-display.c:1938
-#, fuzzy
-msgid "Save All"
-msgstr "שמור בשם..."
-
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
-msgstr ""
+msgstr "עמוד %d מתוך %d"
 
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr ""
 
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:621
 msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:892
 msgid "Malformed external-body part."
 msgstr ""
 
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:933
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:935
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1194
 msgid "Formatting message"
 msgstr ""
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "מאת"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "השב אל"
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:14
-msgid "To"
-msgstr "אל"
-
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr ""
 
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr ""
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:987
+#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1025
 msgid "Mailer"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1691
 msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
+msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1694
 msgid "<I> (%R %Z)</I>"
-msgstr ""
+msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:2
+#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "תאריך"
 
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1727 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr ""
 
@@ -11406,47 +12100,47 @@ msgstr ""
 msgid "%s attachment"
 msgstr ""
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
+#: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
 msgstr ""
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr ""
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr ""
 
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "כל פעם"
 
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "פעם ביום"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "פעם בשבוע"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
 msgid "Once per month"
 msgstr "פעם בחודש"
 
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1210
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11454,145 +12148,125 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1649
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1675
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1860
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2064
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2078
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2107
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2713
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2732
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "שמור בשם..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr ""
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr ""
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "ה_שב לשולח"
 
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "השב ל_רשימה"
 
-#: ../mail/em-popup.c:607
-msgid "_Open Link in Browser"
-msgstr "_פתח את הקישור בדפדפן"
-
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:621
 #, fuzzy
 msgid "_Send New Message To..."
 msgstr "ש_לח הודעה ל..."
 
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
+#: ../mail/em-popup.c:622
+#, fuzzy
+msgid "_Add to Address Book"
 msgstr "_הוסף לפנקס הכתובות"
 
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr ""
-
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:582
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:616
 msgid "Folder"
 msgstr "תיקייה"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:814
 msgid "Please select a server."
 msgstr ""
 
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:835
 msgid "No server has been selected"
 msgstr ""
 
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr ""
+#: ../mail/em-utils.c:141
+#, fuzzy
+msgid "Do not show this message again."
+msgstr "אל תצטט את ההודעה המקורית"
 
-#: ../mail/em-utils.c:299
-msgid "Filters"
-msgstr ""
+#: ../mail/em-utils.c:336
+msgid "Message Filters"
+msgstr "מסנני ההודעה"
 
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
 msgid "message"
-msgstr ""
+msgstr "הודעה"
 
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:688
 msgid "Save Message..."
-msgstr ""
+msgstr "_שמור הודעה..."
 
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:737
 msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1221
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
 #, fuzzy
 msgid "Search _Folders"
 msgstr "בחר תיקייה"
 
-#: ../mail/em-vfolder-rule.c:574
+#: ../mail/em-vfolder-rule.c:591
 #, fuzzy
 msgid "Search Folder source"
 msgstr "מקור הנייר:"
@@ -11626,325 +12300,367 @@ msgid "Composer Window default width"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Default charset in which to compose messages"
+msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:9
-msgid "Default charset in which to compose messages."
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:10
-msgid "Default charset in which to display messages"
+msgid "Default charset in which to compose messages"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:11
-msgid "Default charset in which to display messages."
+msgid "Default charset in which to compose messages."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:12
-msgid "Default forward style"
+msgid "Default charset in which to display messages"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:13
-msgid "Default height of the Composer Window"
+msgid "Default charset in which to display messages."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:14
-msgid "Default height of the Message Window"
+msgid "Default forward style"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:15
-msgid "Default height of the Subscribe dialog"
+msgid "Default height of the Composer Window"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default reply style"
+msgid "Default height of the Message Window"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default width of the Composer Window"
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default width of the Message Window"
+msgid "Default reply style"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:19
-msgid "Default width of the Subscribe dialog"
+msgid "Default width of the Composer Window"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Draw spelling error indicators on words as you type."
+msgid "Default width of the Message Window"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Empty Trash folders on exit"
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Empty all Trash folders when exiting Evolution."
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgid "Empty Trash folders on exit"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Enable/disable caret mode"
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
-msgid "Height of the message-list pane"
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Height of the message-list pane."
+msgid "Enable or disable type ahead search feature"
 msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
+"Enable side bar search feature so that you can start interactive searching "
+"by typing in the text. Use is that you can easily find a folder in that side "
+"bar by just typing the folder name and the selection jumps automatically to "
+"that folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:28
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:29
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:30
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:31
+msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"If the \"Preview\" pane is on, then show it side-by-side rather than "
+"vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:34
+msgid "It disables/enables the prompt while marking multiple messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "Last time empty trash was run"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of accepted licenses"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "List of accounts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:39
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:41
 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 ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "Message Window default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Message Window default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
+#: ../mail/evolution-mail.schemas.in.in.h:56
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "New Mail Notify type"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:61
+msgid "Number of addresses to display in TO/CC/BCC"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt on empty subject"
 msgstr "התרע על נושא ריק"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:71
+msgid "Prompt while marking multiple messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Run junk test on incoming mail"
 msgstr "הרץ בדיקת דואר זבל על הדואר הנכנס"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Show Animations"
 msgstr "הראה אנימציות"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
+#: ../mail/evolution-mail.schemas.in.in.h:83
+msgid ""
+"Show the email of the sender in the messages composite column in the message "
+"list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
+#: ../mail/evolution-mail.schemas.in.in.h:84
+msgid "Show the sender email in the messages column in the message list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Spell check inline"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Subscribe dialog default height"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Subscribe dialog default width"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "Terminal font"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "The terminal font for mail display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "The variable width font for mail display"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:94
 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;"
@@ -11952,169 +12668,182 @@ msgid ""
 "mail view."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:95
+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.in.h:96
 msgid "Thread the message list."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "UID string of the default account."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "Use Spamassassin daemon and client"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "Use custom fonts"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "Use only local spam tests."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:108
+msgid "Use side-by-side or wide layout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "Variable width font"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:111
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:112
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:113
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:114
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:115
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:116
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:117
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:118
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:119
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:120
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/evolution-mail.schemas.in.in.h:121
+msgid "Width of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:122
+msgid "Width of the message-list pane."
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr ""
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
 #, fuzzy
 msgid "Import mail from Elm."
 msgstr "יבא _קובץ יחיד"
 
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "בחר תיקייה לייבא אליה"
 
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "מייבא..."
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:536
 msgid "Please wait"
 msgstr "המתן בבקשה"
 
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12129,7 +12858,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12137,7 +12866,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12146,377 +12875,387 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
 msgid "Settings"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
 msgstr ""
 
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr ""
 
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
 #, fuzzy
 msgid "Import mail from Pine."
 msgstr "יבא _קובץ יחיד"
 
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "הוסף חוק סינון"
 
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:524
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d נמחק"
 msgstr[1] "%d נמחק"
 
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:526
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d דואר זבל"
 msgstr[1] "%d דואר זבל"
 
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:549
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:551
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d נשלח"
 msgstr[1] "%d נשלח"
 
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d לא נשלח"
 msgstr[1] "%d לא נשלח"
 
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:557
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d סה\"כ"
 msgstr[1] "%d סה\"כ"
 
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:559
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
-msgstr[0] ", %d לא נקראו"
+msgstr[0] ", %d לא נקראה"
 msgstr[1] ", %d לא נקראו"
 
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:841
 msgid "New Mail Message"
 msgstr "הודאת דואר חדשה"
 
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:842
 msgid "_Mail Message"
 msgstr "_הודעת דואר"
 
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:843
 msgid "Compose a new mail message"
 msgstr "חבר הודעת דואר חדשה"
 
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:849
 msgid "New Mail Folder"
 msgstr "תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:850
 msgid "Mail _Folder"
 msgstr "_תיקיית דואר"
 
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:851
 msgid "Create a new mail folder"
 msgstr "צור תיקיית דואר חדשה"
 
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
-msgid "    "
-msgstr ""
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "_חשוב"
 
-#: ../mail/mail-config.glade.h:2
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_עבודה"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_אישי"
+
+#. forest green
+#: ../mail/mail-config.c:88
+#, fuzzy
+msgid "_To Do"
+msgstr "_לך אל"
+
+#. blue
+#: ../mail/mail-config.c:89
+#, fuzzy
+msgid "_Later"
+msgstr "אחרי"
+
+#: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr ""
+#: ../mail/mail-config.glade.h:4
+msgid "<b>Sig_natures</b>"
+msgstr "<b>_חתימות</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>_Languages</b>"
-msgstr ""
+msgstr "<b>_שפות</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">ניהול החשבון</span>"
 
 #: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">סוג ההזדהות</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">הזדהות</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">הגדרות</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">מחיקת דואר</span>"
 
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">כותרות הודעה שמוצגות	</span>"
 
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">אפשרויות מסננים</span>"
 
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">טעינת תמונות</span>"
 
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">הצגת הודעות</span>"
 
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">גופני הודעות</span>"
 
-#: ../mail/mail-config.glade.h:23
+#: ../mail/mail-config.glade.h:22
 #, fuzzy
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">אבטחה</span>"
 
-#: ../mail/mail-config.glade.h:24
+#: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">מידע לא הכרחי</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Options</span>"
-msgstr ""
+msgstr "<span weight=\"bold\">אפשרויות</span>"
 
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">מידע הכרחי</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">אבטחה</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">הגדרת השרת</span>"
 
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "ניהול חשבון"
 
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:35
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:36
 msgid "Add _Script"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr ""
+#: ../mail/mail-config.glade.h:45
+#, fuzzy
+msgid "Automatically insert _smiley images"
+msgstr "בדוק אם קיים _דואר חדש כל"
 
 #: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
-msgstr ""
-
-#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
 msgstr "השמע _צליל כאשר מגיע דואר חדש"
 
-#: ../mail/mail-config.glade.h:50
+#: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
 msgstr "ב_דוק סוגי הזדהות נתמכים"
 
-#: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
-msgstr ""
+#: ../mail/mail-config.glade.h:51
+#, fuzzy
+msgid "Check in_coming mail for junk"
+msgstr "בדוק האם דואר נכנס מכיל דואר זבל"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Cle_ar"
 msgstr "_נקה"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Clea_r"
 msgstr "_נקה"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:56
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:57
 msgid "Colors"
 msgstr "צבעים"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:60
+#: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12531,66 +13270,75 @@ msgstr ""
 "\n"
 "הקלק \"החל\" כדי לשמור את ההגדרות."
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:65
 msgid "De_fault"
 msgstr "_ברירת מחדל"
 
-#: ../mail/mail-config.glade.h:67
+#: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
-msgstr ""
+msgstr "קידוד תווים ברירת מחדל:"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "אל תצטט את ההודעה המקורית"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:71
 msgid "Done"
 msgstr "סיום"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:72
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:73
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "א_פשר"
+
+#: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "חשבונות דוא\"ל"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:75
 msgid "Email _Address:"
 msgstr "כתובת _דוא\"ל:"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
 msgstr "רוקן את תיקיות האשפה בי_ציאה"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr ""
+#: ../mail/mail-config.glade.h:80
+msgid "Fi_xed width Font:"
+msgstr "גופן _רוחב קבוע"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
-msgstr ""
+msgstr "רוח_ב-קבוע:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "מאפייני גופן"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
 msgstr ""
 
+#: ../mail/mail-config.glade.h:84
+msgid "Full Nam_e:"
+msgstr "_שם מלא:"
+
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "דואר HTML"
@@ -12601,7 +13349,7 @@ msgstr "כותרות"
 
 #: ../mail/mail-config.glade.h:88
 msgid "Highlight _quotations with"
-msgstr ""
+msgstr "ס_מן ציטטות בצבע"
 
 #: ../mail/mail-config.glade.h:89
 msgid "I_nclude remote tests"
@@ -12648,7 +13396,7 @@ msgstr ""
 
 #: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
-msgstr ""
+msgstr "השמע קובץ מו_סיקה כאשר מגיע דואר חדש"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -12702,86 +13450,84 @@ msgid "Remember _password"
 msgstr "זכור _סיסמה"
 
 #: ../mail/mail-config.glade.h:119
-#, fuzzy
 msgid "S_elect..."
-msgstr "בחר..."
+msgstr "ב_חר..."
 
 #: ../mail/mail-config.glade.h:120
+#, fuzzy
+msgid "S_end message receipts:"
+msgstr "ש_לח הודעה ל..."
+
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "גופן _רגיל:"
 
-#: ../mail/mail-config.glade.h:121
-#, fuzzy
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
-msgstr "בחר..."
+msgstr "ב_חר..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:127
-#, fuzzy
-msgid "Send message receipts:"
-msgstr "ש_לח הודעה ל..."
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr "בחר קוסץ מוסיקה"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
-msgstr "שליחת דואר"
+msgstr "שולח דואר"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
 msgstr "ה_שרת דורש הזדהות"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Server _Type: "
 msgstr "_סוג השרת: "
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 #, fuzzy
 msgid "Sig_ning certificate:"
 msgstr "תעודות"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "ח_תימה:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "חתימות"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signatures Table"
 msgstr "חתימות"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Specify _filename:"
 msgstr "ציין _שם קובץ:"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Spell Checking"
 msgstr "בדיקת איות"
 
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
-msgstr ""
-
 #: ../mail/mail-config.glade.h:140
 msgid "T_ype: "
 msgstr "_סוג: "
@@ -12807,7 +13553,7 @@ msgstr ""
 "הקלד את שם החשבון.\n"
 "למשל \"עבודה\" או \"אישי\""
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "שם משתמש:"
 
@@ -12831,14 +13577,14 @@ msgstr "הו_סף חתימה"
 
 #: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
-msgstr ""
+msgstr "_תמיד טען תמונות מהאינטרנט"
 
 #: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
-msgstr ""
+msgstr "ללא ה_תרעה כאשר מגיע דואר חדש"
 
 #: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:159
@@ -12846,66 +13592,74 @@ msgid "_Forward style:"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_שם מלא:"
-
-#: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr ""
+msgstr "_טען תמונות בהודעות מאנשי קשר"
 
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:161
 msgid "_Make this my default account"
 msgstr "ה_פוך חשבון זה לחשבון ברירת המחדל"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
-msgstr ""
+msgstr "_סמן הודעות כהודעות שנקראו לאחר"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
-msgstr ""
+msgstr "_לעולם אל תטען תמונות מהאינטרנט"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "_מסלול:"
 
-#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
+#: ../mail/mail-config.glade.h:166
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "ה_תרע כאשר הודעות HTML נשלחות לנמענים אשר אינם רוצים אותן"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
+msgstr "התר_ע כאשר הודעות נשלחות הודעות ללא שורת נושא"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Script:"
-msgstr ""
+msgstr "_תסריט:"
 
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr ""
+msgid "_Show image animations"
+msgstr "הראה _אנימציות"
 
 #: ../mail/mail-config.glade.h:173
-#, fuzzy
+msgid "_Shrink To / Cc / Bcc headers to "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "השתמש ב_תקשורת מאובטחת:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
-msgstr ""
+msgstr "הש_תמש באותו גופן כמו יישומים אחרים"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
+msgid "addresses"
+msgstr "כתובות"
+
+#: ../mail/mail-config.glade.h:177
 msgid "color"
-msgstr "צבע"
+msgstr " "
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
 msgid "description"
 msgstr "תיאור"
 
+#: ../mail/mail-dialogs.glade.h:1
+msgid "    "
+msgstr ""
+
 #: ../mail/mail-dialogs.glade.h:2
 msgid "<b>Search Folder Sources</b>"
 msgstr ""
@@ -12919,358 +13673,341 @@ msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "All active remote folders"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6
+msgid "All local and active remote folders"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "All local folders"
+msgstr "בחר תיקייה"
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "Case _sensitive"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
 #, fuzzy
 msgid "Co_mpleted"
 msgstr "הסתיים"
 
-#: ../mail/mail-dialogs.glade.h:8
+#: ../mail/mail-dialogs.glade.h:11
 #, fuzzy
 msgid "F_ind:"
 msgstr "מצא:"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:12
 msgid "Find in Message"
 msgstr "מצא בהודעה"
 
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
-#: ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:11
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Folder Subscriptions"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:15
 msgid "License Agreement"
 msgstr "הסכם רישוי"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:16
 msgid "None Selected"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:17
 msgid "S_erver:"
 msgstr "ש_רת:"
 
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:18
 msgid "Security Information"
 msgstr "מידע על האבטחה"
 
-#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "Specific folders"
+msgstr "בחר תיקייה"
+
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:23
 #, fuzzy
 msgid "_Accept License"
 msgstr "_פעולות"
 
-#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
 msgid "_Due By:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
 msgid "_Flag:"
 msgstr ""
 
-#: ../mail/mail-dialogs.glade.h:22
-msgid "_Subscribe"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:23
-msgid "_Tick this to accept the license agreement"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:24
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:25
-msgid "specific folders only"
-msgstr ""
-
 #: ../mail/mail-dialogs.glade.h:26
-msgid "with all active remote folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:27
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: ../mail/mail-dialogs.glade.h:28
-msgid "with all local folders"
+msgid "_Tick this to accept the license agreement"
 msgstr ""
 
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:105
 msgid "Filtering Folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr ""
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:566
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:624
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
-msgstr ""
+msgstr "שולח הודעה %d מתוך %d"
 
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr ""
+msgstr "נכשל בשליחת %d מתוך %d הודעות"
 
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
-msgstr ""
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+msgid "Canceled."
+msgstr "בוטל."
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:765
 msgid "Complete."
 msgstr "הסתיים."
 
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "שומר את ההודעה בתיקייה"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
 msgstr "מעביר את ההודעות ל%s"
 
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
 msgstr "מעתיק את ההודעות ל%s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1170
 msgid "Forwarded messages"
 msgstr ""
 
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1213
 #, c-format
 msgid "Opening folder %s"
 msgstr "פותח את התיקייה %s"
 
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1363
 #, c-format
 msgid "Removing folder %s"
-msgstr ""
+msgstr "מסיר תיקייה %s"
 
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1523
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr ""
 
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr ""
+msgstr "מרוקן את האשפה ב-'%s'"
 
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1663
 msgid "Local Folders"
-msgstr ""
+msgstr "תיקיות מקומיות"
 
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
-msgstr ""
+msgstr "מקבל הודעה %s"
 
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1856
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "מקבל הודעה %d"
+msgstr[1] "מקבל %d הודעות"
 
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1942
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "שומר הודעה %d"
+msgstr[1] "שומר %d הודעות"
 
-#: ../mail/mail-ops.c:1989
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
-msgstr ""
-
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2013
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2085
 msgid "Saving attachment"
 msgstr ""
 
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2114
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "מתנתק מ %s"
 
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "מתחבר מחדש ל %s"
 
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2379
 msgid "Checking Service"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+#: ../mail/mail-send-recv.c:159
+#, fuzzy
+msgid "Canceling..."
 msgstr "מבטל..."
 
-#: ../mail/mail-send-recv.c:265
-#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "שרת: %s, סוג: %s"
-
-#: ../mail/mail-send-recv.c:267
-#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "מסלול: %s, סוג: %s"
-
-#: ../mail/mail-send-recv.c:269
-#, c-format
-msgid "Type: %s"
-msgstr ""
-
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:349
 msgid "Send & Receive Mail"
 msgstr "שלח וקבל דואר"
 
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:356
 msgid "Cancel _All"
 msgstr "בטל ה_כל"
 
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:453
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
 msgid "Waiting..."
 msgstr "ממתין..."
 
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:738
 msgid "Checking for new mail"
 msgstr "בדיקת דואר חדש"
 
+#: ../mail/mail-session.c:205
+#, fuzzy, c-format
+msgid "Enter Passphrase for %s"
+msgstr "הכנס סיסמה עבור %s"
+
 #: ../mail/mail-session.c:207
+#, fuzzy
+msgid "Enter Passphrase"
+msgstr "הכנס סיסמה"
+
+#: ../mail/mail-session.c:210
+#: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "הכנס סיסמה עבור %s"
 
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "הכנס סיסמה"
 
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:250
 msgid "User canceled operation."
 msgstr "המשתמש ביטל את הפעולה."
 
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "ערוך את החתימה"
 
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:431
 msgid "Enter a name for this signature."
 msgstr "הכנס שם לחתימה זו."
 
-#: ../mail/mail-signature-editor.c:415
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "שם:"
 
-#: ../mail/mail-tools.c:116
+#: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr ""
 
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: ../mail/mail-tools.c:242
+#: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "הודעה מועברת - %s"
 
-#: ../mail/mail-tools.c:244
+#: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "הודעה מועברת"
 
-#: ../mail/mail-tools.c:284
+#: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "תיקייה לא תקינה: `%s'"
@@ -13290,12 +14027,12 @@ msgstr ""
 msgid "Updating Search Folders for '%s'"
 msgstr ""
 
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1023
 #, fuzzy
 msgid "Edit Search Folder"
 msgstr "בחר תיקייה"
 
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1107
 #, fuzzy
 msgid "New Search Folder"
 msgstr "תיקיית דואר חדשה"
@@ -13310,13 +14047,19 @@ msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
+"quit."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:5
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;.  Send "
-"the reciept notification to {0}?"
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:7
@@ -13336,218 +14079,245 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:10
 #, fuzzy
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
+msgstr "אתה בטוח שברצונך למחוק איש קשר זה?"
+
+#: ../mail/mail.error.xml.h:11
+#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "האם לשלוח את ההודעה בתצורת HTML?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 #, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "האם לשלוח את ההודעה בתצורת HTML?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "האם לשלוח את ההודעה בתצורת HTML?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "האם לשלוח את ההודעה ללא נושא?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
+#, fuzzy
+msgid "Blank Signature"
+msgstr "חתימות"
+
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem.  You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
 "license."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:42
-msgid "Discard changed?"
-msgstr ""
+#: ../mail/mail.error.xml.h:44
+#, fuzzy
+msgid "Discard changes?"
+msgstr "התעלם משינויים"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Do not delete"
+msgstr "לא ניתן לפתוח קובץ"
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Do not disable"
+msgstr "כבה"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:44
-msgid "Do you wish to save your changes?"
-msgstr ""
+#: ../mail/mail.error.xml.h:48
+#, fuzzy
+msgid "Do you want to mark all messages as read?"
+msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:45
-msgid "Don't delete"
+#: ../mail/mail.error.xml.h:49
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:59
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -13555,39 +14325,48 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:67
 #, fuzzy
 msgid "Mark all messages as read"
 msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:68
 #, fuzzy
-msgid "Mark all messages as read in the selected folder"
+msgid "Mark all messages in subfolders as read?"
 msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:69
+#, fuzzy
+msgid "Mark as _Read"
+msgstr "_סמן כנקרא"
+
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13595,47 +14374,57 @@ msgid ""
 "Send anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
+#, fuzzy
+msgid "Please provide an unique name to identify this signature."
+msgstr "הכנס שם לחתימה זו."
+
+#: ../mail/mail.error.xml.h:81
 #, fuzzy
 msgid "Please wait."
 msgstr "המתן בבקשה"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Send Receipt"
 msgstr "שלח / קבל"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:89
+#, fuzzy
+msgid "Signature Already Exists"
+msgstr "חתימות"
+
+#: ../mail/mail.error.xml.h:90
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13645,7 +14434,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -13654,7 +14443,7 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -13663,186 +14452,187 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:95
-msgid ""
-"The message was sent via the &quot;sendmail&quot; external application.  "
-"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:104
 msgid "The script file must exist and be executable."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:105
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:108
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because you have not specified any recipients"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:111
+#, fuzzy
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:113
 msgid ""
-"Unable to open the drafts folder for this account.  Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:115
 msgid "Use _Default"
 msgstr "הש_תמש בברירת מחדל"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
 "folders, all remote folders, or both."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:124
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:116
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
-
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:125
 msgid "_Append"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:126
 msgid "_Discard changes"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:119
-msgid "_Empty Trash"
-msgstr ""
+#: ../mail/mail.error.xml.h:127
+#, fuzzy
+msgid "_Do not Mark as Read"
+msgstr "_סמן כנקרא"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:129
 msgid "_Expunge"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:130
 #, fuzzy
 msgid "_Open Messages"
 msgstr "_פתח הודעה"
 
-#: ../mail/message-list.c:996
+#: ../mail/message-list.c:1020
 msgid "Unseen"
 msgstr ""
 
-#: ../mail/message-list.c:997
+#: ../mail/message-list.c:1021
 msgid "Seen"
 msgstr ""
 
-#: ../mail/message-list.c:998
+#: ../mail/message-list.c:1022
 msgid "Answered"
 msgstr ""
 
-#: ../mail/message-list.c:999
+#: ../mail/message-list.c:1023
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1000
+#: ../mail/message-list.c:1024
 msgid "Multiple Messages"
 msgstr ""
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1028
 msgid "Lowest"
 msgstr "הכי נמוך"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1029
 msgid "Lower"
 msgstr "נמוך יותר"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1033
 msgid "Higher"
 msgstr "גבוה יותר"
 
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1034
 msgid "Highest"
 msgstr "הכי גבוה"
 
-#: ../mail/message-list.c:1338 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:57
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1345 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1474 ../plugins/itip-formatter/itip-view.c:202
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "היום %l:%M %p"
 
-#: ../mail/message-list.c:1354 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1483 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "אתמול %l:%M %p"
 
-#: ../mail/message-list.c:1366 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1495 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1503 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr ""
+msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
-msgstr ""
+msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2042
-#, fuzzy
-msgid "Message List"
-msgstr "הודעה זו היא דואר זבל"
+#: ../mail/message-list.c:2261 ../mail/message-list.etspec.h:9
+msgid "Messages"
+msgstr "הודעות"
 
-#: ../mail/message-list.c:3387
+#: ../mail/message-list.c:3652
 msgid "Generating message list"
 msgstr "יוצר רשימת הודעות"
 
@@ -13862,51 +14652,53 @@ msgstr ""
 msgid "Follow Up Flag"
 msgstr ""
 
-#: ../mail/message-list.etspec.h:8
-msgid "Original Location"
-msgstr "מיקום מקורי"
-
-#: ../mail/message-list.etspec.h:9
+#: ../mail/message-list.etspec.h:10
 msgid "Received"
 msgstr "התקבל"
 
-#: ../mail/message-list.etspec.h:11
+#: ../mail/message-list.etspec.h:14
+#, fuzzy
+msgid "Sent Messages"
+msgstr "_פתח הודעה"
+
+#: ../mail/message-list.etspec.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "גודל"
 
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "אל תעביר"
 
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "לידיעתך"
 
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "העבר"
 
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
 msgstr ""
 
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "השב"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:83
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "השב לכולם"
 
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr ""
 
@@ -13935,6 +14727,15 @@ msgstr "הנושא מכיל"
 msgid "Subject or Sender contains"
 msgstr "הנושא מכיל"
 
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+#, fuzzy
+msgid "Local Address Books"
+msgstr "ספר כתובות"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr ""
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14003,54 +14804,71 @@ msgstr ""
 msgid "Restore Settings..."
 msgstr "הגדרות מחשב כף יד..."
 
-#: ../plugins/bbdb/bbdb.c:404
+#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 #, fuzzy
 msgid "Automatic Contacts"
 msgstr "הוסף לאנשי הקשר"
 
-#: ../plugins/bbdb/bbdb.c:413
-#, fuzzy
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">הזדהות</span>"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:426
+#: ../plugins/bbdb/bbdb.c:471
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:444
+#: ../plugins/bbdb/bbdb.c:477
 #, fuzzy
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">הזדהות</span>"
+msgid "Select Address book for Automatic Contacts"
+msgstr "הוסף לאנשי הקשר"
+
+#: ../plugins/bbdb/bbdb.c:492
+#, fuzzy
+msgid "Instant Messaging Contacts"
+msgstr "<b>הודעות מידיות</b>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:457
+#: ../plugins/bbdb/bbdb.c:507
 msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:513
+msgid "Select Address book for Gaim buddy list"
 msgstr ""
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:464
+#: ../plugins/bbdb/bbdb.c:524
 msgid "Synchronize with _buddy list now"
 msgstr ""
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
-msgid "Automatic contacts"
-msgstr "אין אנשי קשר"
-
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr ""
 
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr ""
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+#, fuzzy
+msgid "CalDAV Calendar sources"
+msgstr "לוחות שנה"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr ""
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
 msgid "Local Calendars"
@@ -14060,6 +14878,11 @@ msgstr "לוחות שנה"
 msgid "Provides core functionality for local calendars."
 msgstr ""
 
+#: ../plugins/calendar-http/calendar-http.c:339
+#, fuzzy
+msgid "_Secure connection"
+msgstr "השתמש ב_תקשורת מאובטחת:"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 #, fuzzy
 msgid "HTTP Calendars"
@@ -14072,37 +14895,35 @@ msgstr ""
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Cloudy"
-msgstr ""
+msgstr "מזג אויר: מעונן"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
-msgstr ""
+msgstr "מזג אויר: ערפל"
 
 #: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Partly Cloudy"
-msgstr ""
+msgstr "מזג אויר: מעונן חלקית"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
 msgid "Weather: Rain"
-msgstr "בחריין"
+msgstr "מזג אויר: גשם"
 
 #: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Snow"
-msgstr ""
+msgstr "מזג אויר: שלג"
 
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
-msgstr ""
+msgstr "מזג אויר: שמש"
 
 #: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Thunderstorms"
-msgstr ""
+msgstr "מזג אויר: סופות ברקים"
 
 #: ../plugins/calendar-weather/calendar-weather.c:267
-#, fuzzy
 msgid "Select a location"
-msgstr "בחר פעולה"
+msgstr "בחר מיקום"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
 #, fuzzy
@@ -14132,11 +14953,6 @@ msgid ""
 "things to the clipboard."
 msgstr ""
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-#, fuzzy
-msgid "Copy _Email Address"
-msgstr "_כתובת דוא\"ל:"
-
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 #, fuzzy
 msgid "Copy tool"
@@ -14166,9 +14982,20 @@ msgstr ""
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 #, fuzzy
-msgid "Mark as default folder"
+msgid "Mark as _default folder"
 msgstr "_סמן כנקרא"
 
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
+msgid "Default Sources"
+msgstr "ברירת מחדל"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr ""
+
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
 msgstr ""
@@ -14212,89 +15039,98 @@ msgid ""
 "password authentication."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:251
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 #, fuzzy
 msgid "Out Of Office"
 msgstr "משרד"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:258
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:270
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:271
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr ""
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:321
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 #, fuzzy
 msgid "Change the password for Exchange account"
 msgstr "הכנס סיסמה עבור %s"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:323
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 #, fuzzy
 msgid "Change Password"
 msgstr "הכנס סיסמה"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:327
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:329
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 #, fuzzy
 msgid "Delegation Assitant"
 msgstr "אשף ההגדרות של Evolution"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:339
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 #, fuzzy
 msgid "Miscelleneous"
 msgstr "<b>כללי</b>"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:349
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:351
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 #, fuzzy
 msgid "Folders Size"
 msgstr "תיקיות וירטואליות"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:358
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 #, fuzzy
 msgid "Exchange Settings"
 msgstr "הגדרות Evolution"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:601
-msgid "_OWA Url:"
-msgstr ""
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#, fuzzy
+msgid "_OWA URL:"
+msgstr "_כתובת:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:626
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 #, fuzzy
 msgid "A_uthenticate"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:814
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 #, fuzzy
 msgid "Authentication Type"
 msgstr "ההזדהות נכשלה"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 #, fuzzy
 msgid "Ch_eck for Supported Types"
 msgstr "ב_דוק סוגי הזדהות נתמכים"
 
+#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-contacts.c:166
+msgid ""
+"Evolution is in offline mode. You cannot create or modify folders now.\n"
+"Please switch to online mode for such operations."
+msgstr ""
+
 #. User entered a wrong existing
 #. * password. Prompt him again.
 #.
@@ -14308,36 +15144,48 @@ msgstr ""
 msgid "The two passwords do not match. Please re-enter the passwords."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 #, fuzzy
 msgid "Confirm Password:"
 msgstr "הכנס סיסמה"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 #, fuzzy
 msgid "Current Password:"
 msgstr "הכנס סיסמה"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
 #, fuzzy
 msgid "New Password:"
 msgstr "_סיסמה:"
 
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
 msgid "Your current password has expired. Please change your password now."
 msgstr ""
 
+#: ../plugins/exchange-operations/exchange-config-listener.c:663
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#. Custom
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#: ../widgets/table/e-table-header-item.c:1572
 #, fuzzy
 msgid "Custom"
 msgstr "גזור"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Permissions for %s"
-msgstr "אין הרשאות"
+msgstr "הרשאות עבור %s"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 #, fuzzy
@@ -14349,34 +15197,34 @@ msgstr "מחק"
 msgid "Remove the delegate %s?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, fuzzy, c-format
 msgid "Could not add delegate %s"
 msgstr "לא ניתן לבטל"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 #, fuzzy
 msgid "Error reading delegates list."
 msgstr "שגיאה בזמן טעינת ספר הכתובות."
@@ -14385,177 +15233,192 @@ msgstr "שגיאה בזמן טעינת ספר הכתובות."
 msgid "Author (read, create)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 #, fuzzy
 msgid "C_alendar:"
 msgstr "לוח שנה:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 #, fuzzy
 msgid "Co_ntacts:"
 msgstr "אנשי קשר"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr ""
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 #, fuzzy
 msgid "Delegates"
 msgstr "מחק"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
-msgstr "אין הרשאות"
+msgstr "הרשאות עבור"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Reviewer (read-only)"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 #, fuzzy
 msgid "_Delegate can see private items"
 msgstr "צור פריט מבחן חדש"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-#, fuzzy
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
 msgid "_Inbox:"
-msgstr "דואר נכנס"
+msgstr "דואר _נכנס:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
 #, fuzzy
 msgid "_Tasks:"
 msgstr "_משימות"
 
 #: ../plugins/exchange-operations/exchange-folder-permission.c:58
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-#, fuzzy
 msgid "Permissions..."
-msgstr "אין הרשאות"
+msgstr "הרשאות..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
-msgstr "_שם תיקייה:"
+msgstr "שם תיקייה"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
-msgstr "תיקייה"
+msgstr "גודל תיקייה"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr ""
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
 msgid "Exchange Folder Tree"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
 #, fuzzy
 msgid "Unsubscribe Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:459
+#: ../plugins/exchange-operations/exchange-folder.c:514
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:471
+#: ../plugins/exchange-operations/exchange-folder.c:526
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "הח_לף סיסמה"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
-msgstr "אין הרשאות"
+msgstr "(הרשאה נדחתה.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User:"
-msgstr ""
+msgstr "הוסף משתמש:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User"
-msgstr "_הוסף כתובת"
+msgstr "הוסף משתמש"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 msgid "<b>Permissions</b>"
-msgstr "<b>אפשרויות</b>"
+msgstr "<b>הרשאות</b>"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
 msgid "Cannot Delete"
-msgstr "לא ניתן לפתוח קובץ"
+msgstr "לא ניתן למחוק"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-#, fuzzy
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
 msgid "Cannot Edit"
-msgstr "עורך אנשי הקשר"
+msgstr "לא ניתן לערוך"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
 #, fuzzy
 msgid "Create items"
 msgstr "צור"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
 #, fuzzy
 msgid "Create subfolders"
 msgstr "צור תיקייה"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
 msgid "Delete Any Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
 msgid "Delete Own Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
 msgid "Edit Any Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 msgid "Edit Own Items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Folder contact"
 msgstr "איש קשר אחד"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
 msgid "Folder owner"
 msgstr "_שם תיקייה:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
 #, fuzzy
 msgid "Folder visible"
 msgstr "תיקיות וירטואליות"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 msgid "Read items"
 msgstr ""
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Role: "
 msgstr "תפקיד"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
 #: ../plugins/exchange-operations/exchange-user-dialog.c:144
 #, fuzzy
 msgid "Select User"
@@ -14563,7 +15426,7 @@ msgstr "בחר תיקייה"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
 #, fuzzy
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "ספר כתובות"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -14574,6 +15437,17 @@ msgstr ""
 msgid "Subscribe to Other User's Calendar"
 msgstr ""
 
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+#, fuzzy
+msgid "Exchange Operations"
+msgstr "הגדרות Evolution"
+
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
 msgstr ""
@@ -14584,189 +15458,202 @@ msgid "Cannot display folders."
 msgstr "מעתיק את התיקייה %s"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#, fuzzy
+msgid "Cannot perform the operation."
+msgstr "המשתמש ביטל את הפעולה."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid ""
-"Changes to Exchange account configuration will take place after you quit and "
-"restart Evolution."
+"Changes to options for Exchange account \"{0}\" will only take effect after "
+"restarting Evolution."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
 #, fuzzy
 msgid "Could not authenticate to server."
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
 #, fuzzy
 msgid "Could not change password."
 msgstr "לא ניתן לבטל"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
+msgid "Could not connect to Exchange server."
+msgstr "מתחבר לשרת..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 #, fuzzy
 msgid "Could not connect to server {0}."
 msgstr "מתחבר לשרת..."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not determine folder permissions for delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not find Exchange Web Storage System."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not locate server {0}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not make {0} a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
 msgid "Could not read folder permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
 msgid "Could not read out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
 msgid "Could not update folder permissions."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
 msgid "Could not update out-of-office state"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
 msgid "Exchange Account is offline."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
-"to be disabled or blocked.  (This is usually \n"
-"unintentional.)  Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
 "need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
 "\n"
 "For information to provide to your Exchange \n"
 "administrator, please follow the link below:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 #, fuzzy
 msgid "Failed to update delegates:"
 msgstr "ניסיון ההזדהות נכשל.\n"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
 msgid "Folder already exists"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder does not exist"
 msgstr "הקובץ %s לא קיים"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #, fuzzy
 msgid "Folder offline"
 msgstr "עבודה במצב לא מקוון"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../shell/e-shell.c:1270
 msgid "Generic error"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+msgid "Global Catalog Server is not reachable"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Mailbox for {0} is not on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the URL is correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "Make sure the server name is spelled correctly and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
 msgid "Make sure the username and password are correct and try again."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
 msgid "No Global Catalog server configured for this account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No mailbox for user {0} on {1}."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 #, fuzzy
 msgid "No such user {0}"
 msgstr "אין מקור כזה"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
 msgid "Password successfully changed."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please make sure the Global Catalog Server name is correct."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "Please restart Evolution for changes to take effect"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 #, fuzzy
 msgid "Please select a user."
 msgstr "אנא בחר תמונה בעבור איש קשר זה"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Server rejected password because it is too weak."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -14775,84 +15662,84 @@ msgid ""
 "Or you might have just typed your password wrong."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Try again with a different password."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unable to add user to access control list:"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to edit delegates."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unknown error looking up {0}"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 #, fuzzy
 msgid "Unknown error."
 msgstr "שגיאת מערכת לא ידועה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 #, fuzzy
 msgid "Unknown type"
 msgstr "לא ידוע"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 #, fuzzy
 msgid "Unsupported operation"
 msgstr "המשתמש ביטל את הפעולה."
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You cannot make yourself your own delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid "You have exceeded your quota for storing mail on this server."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You may only configure a single Exchange account."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
+"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 ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "Your password has expired."
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "{0} cannot be added to an access control list"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0} is already a delegate"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} is already in the list"
 msgstr ""
 
@@ -14864,10 +15751,6 @@ msgstr ""
 msgid "Check folder permissions"
 msgstr ""
 
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr ""
-
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -14881,7 +15764,11 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr ""
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+msgid "_Unsubscribe"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:422
 msgid "Checklist"
 msgstr ""
 
@@ -14905,7 +15792,7 @@ msgstr "הגדרות מחשב כף יד..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
 msgstr "<b>רשימת מטלות</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -14933,12 +15820,21 @@ msgstr "_אפשר"
 msgid "_Junk List"
 msgstr "מבחן דואר זבל"
 
+#: ../plugins/groupwise-features/mail-retract.c:53
+msgid "Message retracted successfully"
+msgstr ""
+
+#: ../plugins/groupwise-features/mail-retract.c:60
+msgid "Retract Mail"
+msgstr ""
+
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr ""
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../widgets/misc/e-send-options.glade.h:17
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:19
 #, fuzzy
 msgid "Send Options"
 msgstr "אפשרויות"
@@ -14955,44 +15851,44 @@ msgstr ""
 msgid "Accept Tentatively"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:1
 #, fuzzy
-msgid "<b>Users :</b>"
+msgid "<b>Users:</b>"
 msgstr "<b>התרעות</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../widgets/table/e-table-click-to-add.c:509
 #, fuzzy
 msgid "Message"
 msgstr "הו_דעה:"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Shared Folder Notification"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:11
+#: ../plugins/groupwise-features/properties.glade.h:10
 #, fuzzy
 msgid "_Contacts..."
 msgstr "אנשי קשר..."
 
-#: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+#: ../plugins/groupwise-features/properties.glade.h:11
+msgid "_Customize notification message"
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../plugins/groupwise-features/properties.glade.h:12
 #, fuzzy
 msgid "_Not Shared"
 msgstr "לא התחיל"
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:14
 msgid "_Shared With ..."
 msgstr ""
 
-#: ../plugins/groupwise-features/properties.glade.h:16
+#: ../plugins/groupwise-features/properties.glade.h:15
 #, fuzzy
 msgid "_Sharing"
 msgstr "מתחיל:"
@@ -15038,7 +15934,7 @@ msgid "Subscribe to my _notifications"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Read"
 msgstr "קרא"
@@ -15052,13 +15948,6 @@ msgstr "הד_פס"
 msgid "Proxy"
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr ""
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 #, fuzzy
 msgid "<b>Account Name</b>"
@@ -15068,492 +15957,719 @@ msgstr "שם החשבון"
 msgid "Proxy Login"
 msgstr ""
 
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:490
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s הכנס סיסמה ל%s (משתמש %s("
 
-#: ../plugins/groupwise-features/proxy-login.c:484
+#. 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:517
 #, fuzzy
 msgid "_Proxy Login..."
 msgstr "ה_דפס..."
 
-#: ../plugins/groupwise-features/proxy.c:672
+#: ../plugins/groupwise-features/proxy.c:697
+msgid "The Proxy tab will be available only when the account is online."
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 #, fuzzy
 msgid "Users"
 msgstr "שם משתמש"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr ""
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 #, fuzzy
 msgid "New _Shared Folder..."
 msgstr "תיקייה _חדשה..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:450
 #, fuzzy
 msgid "Sharing"
 msgstr "מתחיל:"
 
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
 #, fuzzy
 msgid "Track Message Status..."
 msgstr "של_ח הודעה לאיש קשר..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr ""
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+#, fuzzy
+msgid "Hula Account Setup"
+msgstr "שם החשבון"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+#, fuzzy
+msgid "_Import to Calendar"
+msgstr "לוח שנה"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+#, fuzzy
+msgid "_Import to Tasks"
+msgstr "_יבא"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+#, fuzzy
+msgid "Import ICS"
+msgstr "_יבא"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+#, fuzzy
+msgid "Select Task List"
+msgstr "משימות"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+#, fuzzy
+msgid "Select Calendar"
+msgstr "לוח שנה חדש"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:714
+msgid "_Import"
+msgstr "_יבא"
+
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+#, fuzzy
+msgid "Import to Calendar"
+msgstr "לוח שנה"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr ""
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:149
+msgid "iCalendar format (.ics)"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr ""
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:158
+#, fuzzy
+msgid "No output directory!"
+msgstr "תקלת Evolution"
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
+msgid "Could not export data!"
+msgstr "לא ניתן לבטל"
+
+#: ../plugins/ipod-sync/sync.c:203
+#, fuzzy
+msgid "Exporting data failed."
+msgstr "מייבא %s. \n"
+
+#: ../plugins/ipod-sync/sync.c:231
+#, fuzzy
+msgid "Could not open addressbook!"
+msgstr "ספר הכתובות של אבולוציה"
+
+#: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "ספר הכתובות של אבולוציה נסגר באופן בלתי צפוי."
+
+#: ../plugins/ipod-sync/sync.c:291
+msgid "Could not open calendar/todo!"
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:274
+#: ../plugins/itip-formatter/itip-formatter.c:395
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "ניסיון ההזדהות נכשל.\n"
+
+#: ../plugins/itip-formatter/itip-formatter.c:415
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:441
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:517
+msgid "Unable to find any calendars"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:524
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:528
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:532
+msgid "Unable to find this journal entry in any journal"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:605
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:857
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:868
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:872
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:877
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:882
 #, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:975
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:982
+msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:984
+msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:1069
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1096
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1227
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1228
 msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1263
+#: ../plugins/itip-formatter/itip-formatter.c:1281
+#: ../plugins/itip-formatter/itip-formatter.c:1359
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1264
+#: ../plugins/itip-formatter/itip-formatter.c:1282
+#: ../plugins/itip-formatter/itip-formatter.c:1360
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1293
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1294
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-#, fuzzy
-msgid "Meetings and Tasks"
-msgstr "לוח שנה ומשימות"
-
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:2067
 msgid "_Delete message after acting"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
+#: ../plugins/itip-formatter/itip-formatter.c:2077
+#: ../plugins/itip-formatter/itip-formatter.c:2109
 #, fuzzy
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">הגדרות</span>"
+msgid "Conflict Search"
+msgstr "חיפוש מתקדם"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2092
 msgid "Select the calendars to search for meeting conflicts"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr ""
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr ""
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:193
 #, fuzzy
 msgid "Today %H:%M"
 msgstr "היום %l:%M %p"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
 #, fuzzy
 msgid "Today %H:%M:%S"
 msgstr "היום %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:206
 #, fuzzy
 msgid "Today %l:%M:%S %p"
 msgstr "היום %l:%M %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Tomorrow"
-msgstr ""
+msgstr "מחר"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:221
 msgid "Tomorrow %H:%M"
-msgstr ""
+msgstr "מחר %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M:%S"
-msgstr ""
+msgstr "מחר %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:226
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:230
 msgid "Tomorrow %l:%M %p"
-msgstr "היום %l:%M %p"
+msgstr "מחר %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "היום %l:%M %p"
+msgstr "מחר %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:253
 #, c-format
 msgid "%A"
-msgstr ""
+msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:254
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:258
 msgid "%A %H:%M"
-msgstr "%A %d %B"
+msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:258
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M:%S"
-msgstr "%a %d/%m/%Y %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:263
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:267
 msgid "%A %l:%M %p"
-msgstr "היום %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:267
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%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:276
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:280
 msgid "%A, %B %e"
-msgstr "%d %B %Y"
+msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:282
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e %H:%M"
-msgstr "%A %d %B %Y"
+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:286
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%a %d/%m/%Y %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:291
+#: ../plugins/itip-formatter/itip-view.c:295
 msgid "%A, %B %e %l:%M %p"
-msgstr ""
+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:295
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%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:301
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e, %Y"
-msgstr "%A %d %B %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:306
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:310
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M:%S"
+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:310
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%a %d/%m/%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:315
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:319
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %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:319
-#, fuzzy
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%a %d/%m/%Y %I:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:348
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:346
+#: ../plugins/itip-formatter/itip-view.c:350
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:355
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:360
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:380
 #, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:389
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:423
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:428
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:432
+#: ../plugins/itip-formatter/itip-view.c:436
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:439
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:448
 #, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:486
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:491
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:493
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:497
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:499
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:755
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "לוח שנה חדש"
+
+#: ../plugins/itip-formatter/itip-view.c:761
+#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:771
+#: ../plugins/itip-formatter/itip-view.c:788
+#: ../plugins/itip-formatter/itip-view.c:793
+#, fuzzy
+msgid "_Decline"
+msgstr "סרב"
+
+#: ../plugins/itip-formatter/itip-view.c:762
+#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:790
+#: ../plugins/itip-formatter/itip-view.c:795
+#, fuzzy
+msgid "_Accept"
+msgstr "קבל"
+
+#: ../plugins/itip-formatter/itip-view.c:765
+#, fuzzy
+msgid "_Decline all"
+msgstr "מ_חק הכל"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+#, fuzzy
+msgid "_Tentative all"
+msgstr "מ_חק הכל"
+
+#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:794
+#, fuzzy
+msgid "_Tentative"
+msgstr "ההזדהות נכשלה"
+
+#: ../plugins/itip-formatter/itip-view.c:767
+#, fuzzy
+msgid "_Accept all"
+msgstr "קבל"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:778
+#, fuzzy
+msgid "_Send Information"
+msgstr "<b>מידע על השרת</b>"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:782
+msgid "_Update Attendee Status"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:785
+#, fuzzy
+msgid "_Update"
+msgstr "ה_דבק"
+
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:944
 #, fuzzy
 msgid "Start time:"
 msgstr "מתחיל:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:953
 #, fuzzy
 msgid "End time:"
 msgstr "כל פעם"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:969
+#: ../plugins/itip-formatter/itip-view.c:1019
 #, fuzzy
 msgid "Comment:"
 msgstr "חברה:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Send u_pdates to attendees"
 msgstr ""
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:1042
 msgid "A_pply to all instances"
 msgstr ""
 
+#: ../plugins/itip-formatter/itip-view.c:1711
+#, fuzzy
+msgid "_Tasks :"
+msgstr "_משימות"
+
+#: ../plugins/itip-formatter/itip-view.c:1713
+msgid "Memos :"
+msgstr ""
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr ""
@@ -15566,7 +16682,7 @@ msgstr "מבנה"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot; ?"
+"&quot;{1}&quot;?"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -15643,6 +16759,7 @@ msgid ""
 msgstr ""
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr ""
 
@@ -15651,19 +16768,21 @@ msgstr ""
 msgid "Mail to task"
 msgstr "חשבונות דואר"
 
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
+msgid "Convert the selected message to a new task"
+msgstr "פתח את ההודעה שנבחרה בחלון חדש"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 #, fuzzy
 msgid "Contact list _owner"
 msgstr "עורך אנשי הקשר"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get list _archive"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get list _usage information"
 msgstr ""
 
@@ -15685,18 +16804,15 @@ msgid ""
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 #, fuzzy
 msgid "_Post message to list"
 msgstr "מעביר את ההודעות ל%s"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to list"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Un-subscribe to list"
 msgstr ""
 
@@ -15769,15 +16885,29 @@ msgstr "ההודעה ה_באה"
 msgid "_Send message"
 msgstr "_פתח הודעה"
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact List _Owner"
+msgstr "עורך אנשי הקשר"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
-msgid "Get an archive of the list this message belongs to"
+msgid "Get List _Archive"
 msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
+msgid "Get List _Usage Information"
+msgstr "מידע אישי"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
 msgstr ""
 
@@ -15793,6 +16923,35 @@ msgstr ""
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr ""
 
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post Message to List"
+msgstr "מעביר את ההודעות ל%s"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to List"
+msgstr "תיאור:"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Unsubscribe from List"
+msgstr "תיקייה _חדשה..."
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+#, fuzzy
+msgid "Mark All Read"
+msgstr "_סמן כנקרא"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#, fuzzy
+msgid "Mark Me_ssages as Read"
+msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr ""
@@ -15820,14 +16979,12 @@ msgid "Mono Loader"
 msgstr "העבר לתיקייה"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-#, fuzzy
 msgid "Generates a D-BUS message when new mail arrives."
-msgstr "השמע _צליל כאשר מגיע דואר חדש"
+msgstr "מייצר הודעת D-BUS כאשר מגיע דואר חדש."
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-#, fuzzy
 msgid "New Mail Notification"
-msgstr "הגדרות דואר"
+msgstr "הודעות דואר חדש"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 #, fuzzy
@@ -15838,59 +16995,44 @@ msgstr "תיקיית דואר חדשה"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr ""
 
+#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
-msgstr ""
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
+msgstr "מנהל תוספים"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
 msgid "Enable and disable plugins"
-msgstr ""
+msgstr "אפשר וכבה תוספים"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr ""
+msgid "_Plugins"
+msgstr "_תוספים"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
-#, fuzzy
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
-msgstr "שעה (שעות)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:46
-#, fuzzy
-msgid "Id"
-msgstr "I"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-#, fuzzy
-msgid "Path"
-msgstr "_מסלול:"
+msgstr ""
+"יוצר(ים)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
-#, fuzzy
 msgid "Description"
-msgstr "תיאור:"
-
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-#, fuzzy
-msgid "Plugin Manager"
-msgstr "מנהל"
+msgstr "תיאור"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "הערה: חלק מהשינויים לא יכנסו לתוקף לפני הפעלה מחדש"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
-msgstr ""
+msgstr "תוסף"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -15907,7 +17049,7 @@ msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
 msgid "Show HTML if present"
-msgstr ""
+msgstr "הצג HTML אם קיים"
 
 #: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
@@ -15927,26 +17069,118 @@ msgid "Gives an option to print mail from composer"
 msgstr ""
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_תצוגה לפני הדפסה"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
-#, fuzzy
 msgid "Prints the message"
-msgstr "הדפס הודעה"
+msgstr "מדפיס את ההודעה"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+#, fuzzy
+msgid "Evolution Profiler"
+msgstr "תקלת Evolution"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#, fuzzy
+msgid "Calendar Publishing"
+msgstr "לוחות שנה"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "מיקומים"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "מידע אישי"
+
+#: ../plugins/publish-calendar/publish-calendar.c:399
+msgid "Are you sure you want to remove this URL?"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">מיקום</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+#, fuzzy
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">אבטחה</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "_שער:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#, fuzzy
+msgid "Publishing Location"
+msgstr "מיקום מקורי"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid "Publishing _Frequency:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+msgid "Service _type:"
+msgstr "_סוג השרות: "
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+msgid "_File:"
+msgstr "_קובץ:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "פנוי/עסוק:"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
 msgid "Spamassassin (built-in)"
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
 msgstr ""
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
+msgid "Spamassassin junk plugin"
 msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
@@ -15968,34 +17202,32 @@ msgstr "שמור בשם..."
 msgid "Save all attachments"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:340
 #, fuzzy
 msgid "Select save base name"
 msgstr "בחר אזור זמן"
 
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:359
 #, fuzzy
 msgid "MIME Type"
 msgstr "סוג"
 
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../plugins/save-attachments/save-attachments.c:367
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
-msgstr ""
+msgstr "שמור"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
 #: ../plugins/save-calendar/csv-format.c:171
-#, fuzzy
 msgid "%F %T"
-msgstr "%d %b"
+msgstr "%F %T"
 
 #: ../plugins/save-calendar/csv-format.c:385
-#, fuzzy
-msgid "Uid"
-msgstr "יוניקוד"
+msgid "UID"
+msgstr ""
 
 #: ../plugins/save-calendar/csv-format.c:387
 #, fuzzy
@@ -16018,9 +17250,8 @@ msgid "Created"
 msgstr "צור"
 
 #: ../plugins/save-calendar/csv-format.c:392
-#, fuzzy
 msgid "Contact List"
-msgstr "_רשימת תפוצה"
+msgstr "רשימת תפוצה"
 
 #: ../plugins/save-calendar/csv-format.c:393
 #, fuzzy
@@ -16037,8 +17268,8 @@ msgid "percent Done"
 msgstr ""
 
 #: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr ""
+msgid "URL"
+msgstr "כתובת"
 
 #: ../plugins/save-calendar/csv-format.c:399
 #, fuzzy
@@ -16074,24 +17305,19 @@ msgstr ""
 msgid "Comma separated value format (.csv)"
 msgstr ""
 
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr ""
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 #, fuzzy
 msgid "Save Selected"
 msgstr "נבחר"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-#, fuzzy
-msgid "Save to _Disk"
-msgstr "שמירה בשם..."
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr ""
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "שמור ל_דיסק"
+
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
@@ -16099,25 +17325,18 @@ msgstr ""
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
 msgid "%FT%T"
-msgstr ""
+msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:396
+#: ../plugins/save-calendar/rdf-format.c:397
 msgid "RDF format (.rdf)"
 msgstr ""
 
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:180
 #, fuzzy
 msgid "Select destination file"
 msgstr "בחר קובץ"
 
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 #, fuzzy
 msgid "Select one source"
@@ -16128,14 +17347,19 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr ""
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
-msgstr ""
+#, fuzzy
+msgid "Show _only this Calendar"
+msgstr "לוח שנה"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "_Show only this Task List"
+msgid "Show _only this Task List"
 msgstr ""
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
 msgstr ""
 
@@ -16148,34 +17372,32 @@ msgid "Welcome"
 msgstr "ברוכים הבאים"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
-#, 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"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"ברוכים הבאים לאבולוציה. במסכים הבאים תאפשרו לאבולוציה\n"
+"ברוכים הבאים ל-Evolution. במסכים הבאים תאפשרו -Evolution\n"
 "להתחבר לחשבונות הדוא\"ל שלכם, ולייבא נתונים מתוכניות אחרות.\n"
 "\n"
-"לחץ/י \"קדימה\" כדי להמשך. "
+"לחץ/י \"קדימה\" להמשך. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../plugins/startup-wizard/startup-wizard.c:138
+#: ../shell/e-shell-importer.c:149
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:153
+#: ../shell/e-shell-importer.c:411
 #, c-format
 msgid "From %s:"
 msgstr "מ %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
-#, fuzzy
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:522
 msgid "Importing data."
-msgstr "מייבא %s. \n"
+msgstr "מייבא נתונים."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
@@ -16214,109 +17436,141 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "A GNOME Print description of the current printer settings"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
 msgid "Configuration version"
-msgstr "הגדרות דואר"
+msgstr "Configuration version"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
-msgstr ""
+msgstr "Default sidebar width"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
-msgstr ""
+msgstr "Default window height"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window width"
-msgstr ""
+msgid "Default window state"
+msgstr "Default window state"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
-msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
+msgid "Default window width"
+msgstr "Default window width"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
-msgid "Last upgraded configuration version"
-msgstr ""
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr "ID or alias of the component to be shown by default at start-up."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
+msgid "Last upgraded configuration version"
+msgstr "Last upgraded configuration version"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
-msgstr "הגדרות מחשב כף יד..."
+msgstr "Printer settings"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Sidebar is visible"
+msgstr "Sidebar is visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "Skip development warning dialog"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:471
 msgid "Start in offline mode"
-msgstr "התחל במצב לא מקוון"
+msgstr "Start in offline mode"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "Statusbar is visible"
+msgstr "Statusbar is visible"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 msgstr ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default height for the main window, in pixels."
-msgstr ""
+msgstr "The default height for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the main window, in pixels."
-msgstr ""
+msgstr "The default width for the main window, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The default width for the sidebar, in pixels."
-msgstr ""
+msgstr "The default width for the sidebar, in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "Toolbar is visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
+msgstr "Whether Evolution will start up in offline mode instead of online mode."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether or not the window should be maximized."
+msgstr "Whether or not the window should be maximized."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+msgid "Whether the sidebar should be visible."
+msgstr "Whether the sidebar should be visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the status bar should be visible."
+msgstr "Whether the status bar should be visible."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "Whether the toolbar should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "Whether the window buttons should be visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:29
 msgid "Window button style"
-msgstr ""
+msgstr "Window button style"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:30
 msgid "Window buttons are visible"
-msgstr ""
+msgstr "Window buttons are visible"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
@@ -16330,16 +17584,16 @@ msgstr "חיבורים פעילים"
 msgid "Click OK to close these connections and go offline"
 msgstr "הקלק אישור לסגור את החיבור ולעבוד בצורה לא מקוונת"
 
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(ללא כותרת)"
 
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:137
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "בחר את סוג הייבוא:"
 
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:140
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -16348,11 +17602,11 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:146
 msgid "Choose the destination for this import"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:152
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16360,33 +17614,29 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:291
 msgid "F_ilename:"
 msgstr "ש_ם הקובץ:"
 
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "בחר קובץ"
 
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:313
 msgid "File _type:"
 msgstr "_סוג הקובץ:"
 
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:349
 msgid "Import data and settings from _older programs"
 msgstr "יבא נתונים והגדרות מ תוכנות _ישנות יותר"
 
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:352
 msgid "Import a _single file"
-msgstr "יבא _קובץ יחיד"
-
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_יבא"
+msgstr "יבא קו_בץ יחיד"
 
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "הגדרות Evolution"
+msgid "Evolution Preferences"
+msgstr "העדפות Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -16408,11 +17658,11 @@ msgstr "שם התיקייה לא יכול להכיל את התו \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ו '..' הם שמות תיקיות שמורים."
 
-#: ../shell/e-shell-window-commands.c:70
+#: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "הכלים של GNOME Pilot לא מותקנים במערכת."
 
-#: ../shell/e-shell-window-commands.c:78
+#: ../shell/e-shell-window-commands.c:79
 #, c-format
 msgid "Error executing %s."
 msgstr "ארעה שגיאה בהפעלת %s."
@@ -16421,76 +17671,77 @@ msgstr "ארעה שגיאה בהפעלת %s."
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy לא מותקן."
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:130
 msgid "Bug buddy could not be run."
 msgstr "אין אפשרות להריץ את כלי דיווח הבאגים."
 
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:532
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
-msgstr ""
+msgstr "יאיר הרשקוביץ <yairhr@gmail.com>"
 
-#: ../shell/e-shell-window-commands.c:546
-msgid "Groupware Suite"
-msgstr ""
-
-#: ../shell/e-shell-window-commands.c:774
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "עבודה במצב מ_קוון"
 
-#: ../shell/e-shell-window-commands.c:787 ../ui/evolution.xml.h:50
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "עבודה במצב _לא מקוון"
 
-#: ../shell/e-shell-window-commands.c:800
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "עבודה במצב לא מקוון"
 
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "עבודה במצב מקוון. לחץ כאן כדי לעבור למצב לא מקוון."
+#: ../shell/e-shell-window.c:381
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr ""
+"‏Evolution נמצאת במצב מקוון. לחץ כאן כדי לעבור למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
-msgstr "אבולוציה במהלך העברה למצב לא מקוון."
+msgstr ""
+"‏Evolution במהלך העברה למצב לא מקוון."
 
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "עבודה במצב לא מקוון. לחץ כאן כדי לעבור למצב מקוון."
+#: ../shell/e-shell-window.c:396
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr ""
+"‏Evolution נמצאת במצב לא מקוון. לחץ כאן כדי לעבור למצב מקוון."
 
-#: ../shell/e-shell-window.c:724
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "החלף ל %s"
 
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:634
 msgid "Uknown system error."
 msgstr "שגיאת מערכת לא ידועה."
 
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:830 ../shell/e-shell.c:831
 #, c-format
 msgid "%ld KB"
 msgstr "%ld ק\"ב"
 
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "אישור"
 
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr ""
 
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1266
 msgid "Cannot register on OAF"
-msgstr ""
+msgstr "לא ניתן להירשם ל-OAF"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1268
 msgid "Configuration Database not found"
 msgstr "בסיס נתוני ההגדרות לא נמצא"
 
-#: ../shell/e-user-creatable-items-handler.c:685
+#: ../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 "חדש "
 
@@ -16508,7 +17759,7 @@ msgstr "צור פריט מבחן חדש"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
+msgstr "לחץ \"יבא\" להתחיל ביבוא הקובץ ל-Evolution."
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -16524,7 +17775,7 @@ msgstr "יבא מיקום"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
-msgstr ""
+msgstr "סוג יבוא"
 
 #: ../shell/import.glade.h:6
 msgid "Select Importers"
@@ -16542,7 +17793,7 @@ msgid ""
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:233
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16554,7 +17805,7 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -16562,7 +17813,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:254
+#: ../shell/main.c:257
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16570,47 +17821,55 @@ msgstr ""
 "תודה\n"
 "צוות Evolution\n"
 
-#: ../shell/main.c:261
-msgid "Don't tell me again"
+#: ../shell/main.c:264
+msgid "Do not tell me again"
 msgstr "אל תודיע לי שוב"
 
-#: ../shell/main.c:466
+# console messages start
+
+#: ../shell/main.c:469
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "Start Evolution activating the specified component"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:473
 msgid "Start in online mode"
-msgstr "התחל במצב מקוון"
+msgstr "Start in online mode"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:476
 msgid "Forcibly shut down all Evolution components"
-msgstr ""
+msgstr "Forcibly shut down all Evolution components"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:480
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:483
 msgid "Send the debugging output of all components to a file."
-msgstr ""
+msgstr "Send the debugging output of all components to a file."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:485
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "Disable loading of any plugins."
+
+#: ../shell/main.c:516
+msgid "- The Evolution PIM and Email Client"
+msgstr "- The Evolution PIM and Email Client"
 
-#: ../shell/main.c:513
+#: ../shell/main.c:527
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+
+# console messages end
 
 #: ../shell/shell.error.xml.h:1
-#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr ""
-"אתה בטוח שברצונך\n"
-"למחוק אנשי קשר אלו?"
+"אתה בטוח שברצונך לשכוח את כל הסיסמאות הזכורות?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
@@ -16627,7 +17886,7 @@ msgstr "Evolution לא יכולה להתחיל."
 #: ../shell/shell.error.xml.h:5
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
 msgstr ""
 
 #: ../shell/shell.error.xml.h:7
@@ -16640,7 +17899,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
 "\n"
 "It is suggested you manually verify that all of your mail, contact, and "
@@ -16656,8 +17915,8 @@ msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
 "If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently.  If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
 "evolution&quot; at your convenience.\n"
 msgstr ""
 
@@ -16667,7 +17926,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -16691,9 +17950,8 @@ msgid ""
 msgstr ""
 
 #: ../shell/shell.error.xml.h:31
-#, fuzzy
 msgid "_Forget"
-msgstr "_שער:"
+msgstr "_שכח"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
@@ -16701,7 +17959,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr ""
+msgstr "ה_זכר לי מאוחר יותר"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -16711,131 +17969,139 @@ msgid ""
 "data.\n"
 msgstr ""
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
 msgstr ""
+"התעודה '%s' היא תעודה של רשות אישורים.\n"
+"\n"
+"ערוך את הגדרות האמינות:"
 
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
+"מכיון שאתה בוטח ברשות האישורים שהנפיקה את אישור זה, אתה בוטח באמינות של אישור זה, אלא אם כן צויין אחרת כאן"
 
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
+"מכיון שאינך בוטח ברשות האישורים שהנפיקה את אישור זה, אינך בוטח באמינות של אישור זה, אלא אם כן צויין אחרת כאן"
 
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
-#, fuzzy
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
 msgid "Select a certificate to import..."
-msgstr "בחר תיקייה לייבא אליה"
+msgstr "בחר תעודה ליבוא..."
 
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
 msgid "Certificate Name"
-msgstr ""
+msgstr "שם תעודה"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
 msgstr "מטרות"
 
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "מספר סידורי"
 
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
 msgid "Expires"
-msgstr ""
+msgstr "פג תוקף"
 
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "כתובת דוא\"ל"
 
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "הכנס את הסיסמה עבור `%s'"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
-msgstr ""
+msgstr "הכנס סיסמה חדשה למסד האישורים"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "הכנס סיסמה חדשה"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
+"הונפק עבור:\n"
+"  נושא: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"הונפק על ידי:\n"
+"  נושא: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
-msgstr ""
+msgstr "בחר תעודה"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
-msgstr ""
+msgstr "<לא חלק מהתעודה>"
 
 #: ../smime/gui/smime-ui.glade.h:2
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b>שדות תעודה</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b>היררכיית תעודה</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
-msgstr ""
+msgstr "<b>ערך שדה</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
-msgstr ""
+msgstr "<b>תביעות אצבע</b>"
 
 #: ../smime/gui/smime-ui.glade.h:6
 msgid "<b>Issued By</b>"
-msgstr ""
+msgstr "<b>הונפק על ידי</b>"
 
 #: ../smime/gui/smime-ui.glade.h:7
 msgid "<b>Issued To</b>"
-msgstr ""
+msgstr "<b>הונפק עבור</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
+msgstr "<b>תעודה זאת אושרה עבור השימושים הבאים:</b>"
 
 #: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -16843,7 +18109,7 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
-msgstr ""
+msgstr "רשויות"
 
 #: ../smime/gui/smime-ui.glade.h:11
 msgid "Backup"
@@ -16859,9 +18125,9 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
-msgstr ""
+msgstr "תעודה"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
@@ -16869,12 +18135,11 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
-msgstr ""
+msgstr "פרטי תעודה"
 
 #: ../smime/gui/smime-ui.glade.h:17
-#, fuzzy
 msgid "Certificates Table"
-msgstr "תעודות"
+msgstr "טבלת תעודות"
 
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
@@ -16936,11 +18201,11 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr ""
 
@@ -16979,253 +18244,213 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
-msgstr ""
+msgstr "התעודות שלי"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:676
 msgid "Certificate already exists"
-msgstr ""
+msgstr "התעודה כבר קיימת"
 
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
-msgstr ""
+msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
 msgid "Sign"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
 msgid "Encrypt"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
 msgid "Version"
-msgstr ""
+msgstr "גירסה"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
 msgid "Version 1"
-msgstr ""
+msgstr "גירסה 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
 msgid "Version 2"
-msgstr ""
+msgstr "גירסה 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
 msgid "Version 3"
-msgstr ""
+msgstr "גירסה 3"
 
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "מזהה אובייקט (%s)"
 
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "מזהה אלגוריתם"
 
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
 msgid "Critical"
-msgstr ""
+msgstr "קריטי"
 
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
-msgstr ""
+msgstr "לא קריטי"
 
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
 msgid "Extensions"
-msgstr ""
+msgstr "הרחבות"
 
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
 #, c-format
 msgid "%s = %s"
-msgstr ""
+msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
-msgstr ""
+msgstr "מנפיק"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr ""
 
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr ""
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr ""
 
@@ -17235,178 +18460,297 @@ msgstr ""
 #: ../tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
-msgstr ""
+msgstr "לא ניתן להריץ את `%s`: %s\n"
 
 #: ../tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
-msgstr ""
+msgstr "מכבה %s (%s)\n"
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "מאפייני _ספר הכתובות"
 
 #: ../ui/evolution-addressbook.xml.h:3
 #, fuzzy
+msgid "Change the properties of the selected folder"
+msgstr "שנה את המאפיינים של תיקייה זו"
+
+#: ../ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Co_py All Contacts To..."
+msgstr "העתק אנשי קשר ל"
+
+#: ../ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Contact _Preview"
+msgstr "_רשימת תפוצה"
+
+#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "העתק"
+
+#: ../ui/evolution-addressbook.xml.h:7
+#, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+#, fuzzy
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
-msgstr ""
+msgstr "העתק לתיקייה..."
+
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new addressbook folder"
+msgstr "הוסף משימה חדשה"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "גזור"
 
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "מחק את פנקס הכתובות"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
-msgstr ""
+msgstr "מחק את אנשי הקשר שנבחרו"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "מחק את התיקייה הנבחרת"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "העבר איש קשר"
+
+#: ../ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Mo_ve All Contacts To..."
+msgstr "הזז אנשי קשר ל"
+
+#: ../ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
+
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr ""
+msgstr "העבר לתיקייה..."
 
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "הדבק"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr ""
+msgstr "הדפס את אנשי הקשר הנבחרים"
 
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "שנה את שן התיקייה הנבחרת"
+
+#: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "S_ave Address Book As VCard"
+msgstr "פנקס כתובות חדש"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
-msgid "Select All"
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+msgid "Select All"
+msgstr "בחר הכל"
+
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "בחר ה_כל"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
-msgstr ""
+msgstr "בחר את כל אנשי הקשר"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "_עצור"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
-msgstr ""
+msgstr "עצור"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
-msgstr ""
+msgstr "עצור את הטעינה"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "_פעולות"
 
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "העתק איש קשר אל..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+#, fuzzy
+msgid "_Copy Folder Contacts To"
+msgstr "ה_עתק לתיקייה..."
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "_מחק איש קשר"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr ""
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "העבר איש קשר אל..."
 
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
-msgstr ""
+#: ../ui/evolution-addressbook.xml.h:54
+#, fuzzy
+msgid "_Move Folder Contacts To"
+msgstr "העב_ר לתיקייה..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+msgid "_New"
+msgstr "_חדש"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "_שנה שם"
+
+#: ../ui/evolution-addressbook.xml.h:61
+#, fuzzy
+msgid "_Save Contact as VCard..."
+msgstr "אנשי קשר..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
 msgstr ""
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
-msgstr ""
+msgstr "יום"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr ""
+#, fuzzy
+msgid "Delete _all Occurrences"
+msgstr "מופע חוזר"
 
 #: ../ui/evolution-calendar.xml.h:7
-msgid "Delete the appointment"
-msgstr ""
+#, fuzzy
+msgid "Delete all occurrences"
+msgstr "מופע חוזר"
 
 #: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
+msgid "Delete the appointment"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "הבא"
 
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:76
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "הקודם"
 
-#: ../ui/evolution-calendar.xml.h:21
-msgid "Print this calendar"
-msgstr ""
-
 #: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
+msgid "Print this calendar"
 msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
@@ -17421,6 +18765,10 @@ msgstr ""
 msgid "Select _Date"
 msgstr ""
 
+#: ../ui/evolution-calendar.xml.h:26
+msgid "Select _Today"
+msgstr ""
+
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr ""
@@ -17455,44 +18803,251 @@ msgstr ""
 
 #: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
-msgstr ""
+msgstr "שבוע"
 
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
-msgstr ""
+msgstr "שבוע עבודה"
 
 #: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "ג_זור"
-
 #: ../ui/evolution-composer-entries.xml.h:3
+#, fuzzy
+msgid "Copy selection to clipboard"
+msgstr "העתק את ההודעה המסומנת"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
+#: ../ui/evolution-composer-entries.xml.h:7
+#, fuzzy
+msgid "Cut selection to clipboard"
+msgstr "גזור את ההודעה המסומנת"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
 msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "בחר ה_כל"
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+msgid "Paste text from the clipboard"
+msgstr ""
 
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
 msgid "Select all text"
-msgstr "בחר את כל המלל"
+msgstr "בחר את כל הטקסט"
+
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "צרף"
+
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr "לחץ כאן לצרף קובץ"
+
+#: ../ui/evolution-editor.xml.h:3
+#, fuzzy
+msgid "Click here to close the current window"
+msgstr "הקלק אישור לסגור את החיבור ולעבוד בצורה לא מקוונת"
+
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help available"
+msgstr ""
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "סגור"
+
+#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+#, fuzzy
+msgid "I_nsert"
+msgstr "_שם משתמש:"
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_סגור"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
+msgid "_File"
+msgstr "_קובץ"
+
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+msgid "_Help"
+msgstr "עזר_ה"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "אפשרויות_"
+
+#: ../ui/evolution-event-editor.xml.h:2
+#, fuzzy
+msgid "All Day Event"
+msgstr "פגישה חדשה לכל היום"
+
+#: ../ui/evolution-event-editor.xml.h:3
+#, fuzzy
+msgid "All _Day Event"
+msgstr "פגישה חדשה לכל היום"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:7
+msgid "Click here to set or unset alarms for this event"
+msgstr ""
 
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Insert advanced send options"
+msgstr "המשתמש ביטל את הפעולה."
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Make this a recurring event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+msgid "Pu_blic"
+msgstr "_ציבורי"
+
+#: ../ui/evolution-event-editor.xml.h:12
+msgid "Query free / busy information for the attendees"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "R_ole Field"
+msgstr "שדה"
+
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr "אזור _זמן"
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+msgid "Toggles whether the Status field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+msgid "Toggles whether the time zone is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+msgid "Toggles whether to display categories"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:24
+msgid "Toggles whether to have All Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:25
+msgid "Toggles whether to show time as busy"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "_Alarms"
+msgstr "התרעות"
+
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_קטגוריות"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr "_חסוי"
+
+#: ../ui/evolution-event-editor.xml.h:30
+#, fuzzy
+msgid "_Free/Busy"
+msgstr "פנוי/עסוק:"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+#, fuzzy
+msgid "_Private"
+msgstr "ה_דבק"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
 msgstr ""
 
+#: ../ui/evolution-event-editor.xml.h:33
+#, fuzzy
+msgid "_Recurrence"
+msgstr "מופע חוזר"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#, fuzzy
+msgid "_Status Field"
+msgstr "_מצב:"
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#, fuzzy
+msgid "_Type Field"
+msgstr "שדה"
+
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "ביטול פעולת הדואר הנוכחית"
@@ -17517,177 +19072,211 @@ msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr ""
+msgstr "רוקן _אשפה"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:7
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "_תיקייה"
 
 #: ../ui/evolution-mail-global.xml.h:9
 #, fuzzy
-msgid "Message F_ilters"
-msgstr "כותרת ההודעה"
-
-#: ../ui/evolution-mail-global.xml.h:10
-#, fuzzy
-msgid "Message _Preview"
-msgstr "כותרת ההודעה"
-
-#: ../ui/evolution-mail-global.xml.h:11
-#, fuzzy
 msgid "Move the selected folder into another folder"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:11
 msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
 #, fuzzy
 msgid "Search F_olders"
 msgstr "בחר תיקייה"
 
+#: ../ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Show Message _Preview"
+msgstr "כותרת ההודעה"
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show message preview below the message list"
+msgstr ""
+
 #: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview window"
+msgid "Show message preview side-by-side with the message list"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:16
-msgid "Subscribe or unsubscribe to folders on remote servers"
+msgid "Show message preview window"
 msgstr ""
 
 #: ../ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "_Classic View"
+msgstr "תצוגה _קלאסית"
+
+#: ../ui/evolution-mail-global.xml.h:19
 #, fuzzy
 msgid "_Copy Folder To..."
 msgstr "ה_עתק לתיקייה..."
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:20
+msgid "_Message Filters"
+msgstr "מ_סנני הודעה"
+
+#: ../ui/evolution-mail-global.xml.h:21
 #, fuzzy
 msgid "_Move Folder To..."
 msgstr "העב_ר לתיקייה..."
 
-#: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
+#: ../ui/evolution-mail-global.xml.h:22
 msgid "_New..."
-msgstr "_חדש"
+msgstr "_חדש..."
+
+#: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Preview"
+msgstr "ת_צוגה מקדימה:"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:27
 #, fuzzy
 msgid "_Subscriptions"
 msgstr "תיאור:"
 
+#: ../ui/evolution-mail-global.xml.h:28
+msgid "_Vertical View"
+msgstr ""
+
 #: ../ui/evolution-mail-list.xml.h:1
-#, fuzzy
 msgid "Change the name of this folder"
-msgstr "שנה את המאפיינים של תיקייה זו"
+msgstr "שנה את השם של תיקייה זו"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "שנה את המאפיינים של תיקייה זו"
 
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "Collapse all message threads"
+msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:6
-msgid "E_xpunge"
-msgstr ""
-
 #: ../ui/evolution-mail-list.xml.h:8
-msgid "Group By _Threads"
+msgid "E_xpand All Threads"
 msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:9
-msgid "Hide S_elected Messages"
+msgid "E_xpunge"
 msgstr ""
 
 #: ../ui/evolution-mail-list.xml.h:10
+#, fuzzy
+msgid "Expand all message threads"
+msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+
+#: ../ui/evolution-mail-list.xml.h:12
+msgid "Hide S_elected Messages"
+msgstr "הסתר את ההודעות שנ_בחרו"
+
+#: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
-msgstr ""
+msgstr "הסתר את ההודעות שנמ_חקו"
 
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
-msgstr ""
+msgstr "הסתר את ההודעות שנק_ראו"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:13
-#, fuzzy
-msgid "Mark Me_ssages as Read"
-msgstr "סמן את כל ההודעות הגלויות כאילו נקראו"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "סמן את כל ההודעות כאילו _נקראו"
 
-#: ../ui/evolution-mail-list.xml.h:14 ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:19
 #, fuzzy
 msgid "Permanently remove this folder"
 msgstr "שנה את המאפיינים של תיקייה זו"
 
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:20
 #, fuzzy
 msgid "Select Message _Thread"
 msgstr "כותרת ההודעה"
 
-#: ../ui/evolution-mail-list.xml.h:18
-#, fuzzy
+#: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
-msgstr "בחר ה_כל"
+msgstr "בחר את _כל ההודעות"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
-msgstr ""
+msgstr "בחר את כל ההודעות ה_גלויות"
 
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Sh_ow Hidden Messages"
-msgstr ""
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Show Hidde_n Messages"
+msgstr "הצג הודעות _נסתרות"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr ""
 
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:113
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
+#: ../ui/evolution-mail-list.xml.h:31
 #, fuzzy
+msgid "_Group By Threads"
+msgstr "ה_עתק..."
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "הו_דעה:"
+msgstr "הו_דעה"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -17695,7 +19284,7 @@ msgstr "הו_סף את השולח לפנקס הכתובות"
 
 #: ../ui/evolution-mail-message.xml.h:2
 msgid "A_pply Filters"
-msgstr ""
+msgstr "ה_חל מסננים"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
@@ -17703,18 +19292,16 @@ msgid "Add Sender to Address Book"
 msgstr "הוסף את השולח לפנקס הכתובות"
 
 #: ../ui/evolution-mail-message.xml.h:5
-#, fuzzy
 msgid "All Message _Headers"
-msgstr "כותרת ההודעה"
+msgstr "כל כותרות ה_הודעה"
 
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:7
-#, fuzzy
 msgid "Check for _Junk"
-msgstr "בדיקת דואר חדש"
+msgstr "בדוק עבור דואר _זבל"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -17732,82 +19319,96 @@ msgstr ""
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
-msgstr ""
+msgstr "העתק את ההודעות הנבחרות לתיקייה אחרת"
 
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:13
 #, fuzzy
+msgid "Copy selected messages to the clipboard"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
+
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
-msgstr "צור תיקייה"
+msgstr "צור _חוק"
 
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 #, fuzzy
 msgid "Create a Search Folder for these recipients"
 msgstr "צור תיקייה וירטואלית עבור נמענים אלו"
 
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
 msgstr "צור תיקייה וירטואלית עבור רשימת תפוצה זו"
 
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
 msgid "Create a Search Folder for this sender"
 msgstr "צור תיקייה וירטואלית עבור שולח זה"
 
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 #, fuzzy
 msgid "Create a Search Folder for this subject"
 msgstr "צור תיקייה וירטואלית עבור נושא זה"
 
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Cut selected messages to the clipboard"
+msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
+
+#: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "הקטן את גודל המלל"
 
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr ""
 
+#: ../ui/evolution-mail-message.xml.h:28
+msgid "Display the next thread"
+msgstr ""
+
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the next unread thread"
+msgid "Display the previous important message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous important message"
+msgid "Display the previous message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous message"
+msgid "Display the previous unread message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:33
-msgid "Display the previous unread message"
-msgstr ""
+#, fuzzy
+msgid "F_orward As..."
+msgstr "העבר"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -17830,8 +19431,9 @@ msgid "Filter the selected messages for junk status"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr ""
+#, fuzzy
+msgid "Flag selected messages for follow-up"
+msgstr "העבר את ההודעות שנבחרו לאשפה"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -17859,35 +19461,34 @@ msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
-msgstr ""
+msgstr "הגדל את גודל הטקסט"
 
 #: ../ui/evolution-mail-message.xml.h:49
-#, fuzzy
 msgid "Mar_k as"
-msgstr "_סמן כנקרא"
+msgstr "סמן כ"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as having been read"
 msgstr "סמן את ההודעות שנבחרו כאילו נקראו"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
+msgid "Mark the selected messages as important"
 msgstr "סמן את ההודעות שנבחרו כחשובות"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
+msgid "Mark the selected messages as junk"
 msgstr "סמן את ההודעות שנבחרו כדואר זבל"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not being junk"
 msgstr "סמן את ההודעות שנבחרו כלא דואר זבל"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as not having been read"
 msgstr "סמן את ההודעות שנבחרו כאילו לא נקראו"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
+msgid "Mark the selected messages as unimportant"
 msgstr "סמן את ההודעות שנבחרו כלא חשובות"
 
 #: ../ui/evolution-mail-message.xml.h:56
@@ -17895,456 +19496,486 @@ msgid "Mark the selected messages for deletion"
 msgstr "העבר את ההודעות שנבחרו לאשפה"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
-msgid "Message Source"
-msgstr "שמירת הודעות"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move"
-msgstr "העבר לתיקייה"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Move selected message(s) to another folder"
+msgid "Move selected messages to another folder"
 msgstr "העבר את ההודעות שנבחרו לתיקייה אחרת"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
 msgstr "ההודעה ה_חשוב הבאה"
 
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
 msgstr "ה_דיון הבא"
 
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
 msgstr "ההודעה ש_לא נקראה הבאה"
 
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "לא דואר זבל"
 
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in a new window"
+#: ../ui/evolution-mail-message.xml.h:64
+#, fuzzy
+msgid "Open the selected messages in a new window"
 msgstr "פתח את ההודעה שנבחרה בחלון חדש"
 
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Open the selected message in the composer for editing"
-msgstr ""
+#: ../ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Open the selected messages in the composer for editing"
+msgstr "פתח את ההודעה שנבחרה בחלון חדש"
 
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:68
 #, fuzzy
 msgid "Pos_t New Message to Folder"
 msgstr "שומר את ההודעה בתיקייה"
 
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
-msgstr ""
+msgstr "הדפס הודעה זאת"
 
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:81
+#: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Save the message as a text file"
-msgstr "שמור את ההודעה כקובץ מלל"
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr "שמור את ההודעה הנבחרת כקובץ טקסט"
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 #, fuzzy
 msgid "Search Folder from Recipients..."
 msgstr "חפש אנשי קשר..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 #, fuzzy
 msgid "Search Folder from S_ubject..."
 msgstr "חפש אנשי קשר..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr ""
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr ""
+msgstr "חפש טקסט בגוף ההודעה המוצגת"
 
-#: ../ui/evolution-mail-message.xml.h:92
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
-msgstr "בחר את כל המלל"
+msgstr "בחר את כל ה_טקסט"
 
-#: ../ui/evolution-mail-message.xml.h:93
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "בחר את כל המלל"
+msgstr "בחר את כל הטקסט בהודעה"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
-msgstr ""
+msgstr "הגדר את הגדרות הדף עבור המדפסת הנוכחית שלך"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
+msgstr "הצג סמן מהבהב בגוף ההודעה המוצגת"
+
+#: ../ui/evolution-mail-message.xml.h:95
+#, fuzzy
+msgid "Show messages in the normal style"
+msgstr "מעביר הודעות אל התיקייה %s"
 
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message in the normal style"
+msgid "Show messages with all email headers"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Show message with all email headers"
+msgid "Show the raw email source of the message"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:98
-msgid "Show the raw email source of the message"
-msgstr ""
+msgid "Undelete the selected messages"
+msgstr "בטל את מחיקת ההודעות שנבחרו"
 
 #: ../ui/evolution-mail-message.xml.h:99
-msgid "Un-delete the selected messages"
-msgstr ""
-
-#: ../ui/evolution-mail-message.xml.h:100
-#, fuzzy
 msgid "Uni_mportant"
-msgstr "סמן כל_א חשוב"
+msgstr "ל_א חשוב"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
 msgstr ""
 
+#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr "_מצורף"
+
 #: ../ui/evolution-mail-message.xml.h:102
-#, fuzzy
 msgid "_Caret Mode"
-msgstr "צור תיקייה"
+msgstr "מצב _סימן"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
+msgid "_Clear Flag"
+msgstr "_נקה"
+
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
-msgstr "ההודעה ה_באה"
+msgstr "_מחק הודעה"
 
-#: ../ui/evolution-mail-message.xml.h:107
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
-msgstr "מצא בהודעה"
+msgstr "_חפש בהודעה"
 
 #: ../ui/evolution-mail-message.xml.h:109
+#, fuzzy
+msgid "_Flag Completed"
+msgstr "הסתיים"
+
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
 msgstr "_לך אל"
 
-#: ../ui/evolution-mail-message.xml.h:110
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
-msgstr "_יבא"
+msgstr "_חשוב"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:113
 #, fuzzy
+msgid "_Inline"
+msgstr "עבודה במצב מ_קוון"
+
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "דואר זבל"
+msgstr "דואר _זבל"
 
-#: ../ui/evolution-mail-message.xml.h:112
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "טען _תמונות"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "_מקור הודעה"
+
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
 msgstr "ההודעה ה_באה"
 
-#: ../ui/evolution-mail-message.xml.h:116
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
-msgstr "רגיל"
+msgstr "_גודל רגיל"
 
-#: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
-msgstr "לא דואר זבל"
+msgstr "לא דואר זבל_"
 
-#: ../ui/evolution-mail-message.xml.h:118
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
 msgstr "פתח ב_חלון חדש"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
 msgstr "ההודעה ה_קודמת"
 
-#: ../ui/evolution-mail-message.xml.h:123
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr "_צוטט"
+
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "_שמירה בשם..."
+msgstr "שמור _הודעה..."
 
-#: ../ui/evolution-mail-message.xml.h:124
-#, fuzzy
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "ההודעה ה_באה"
+msgstr "_בטל מחיקת הודעה"
 
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:130
 #, fuzzy
 msgid "_Unread"
 msgstr "סמן כ_לא נקרא"
 
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Zoom In"
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom"
 msgstr ""
 
-#.
-#. <cmd name="FileSave" _label="Save"
-#. _tip="Save the current file" pixtype="stock" pixname="Save"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:7
-msgid "Close"
+#: ../ui/evolution-mail-message.xml.h:132
+msgid "_Zoom In"
 msgstr ""
 
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "סגור חלון זה"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
+msgstr "סרגל כלים ראשי"
+
+#: ../ui/evolution-memos.xml.h:3
+#, fuzzy
+msgid "Copy selected memo"
+msgstr "העתק את ההודעה המסומנת"
+
+#: ../ui/evolution-memos.xml.h:5
+#, fuzzy
+msgid "Cut selected memo"
+msgstr "גזור את ההודעה המסומנת"
+
+#: ../ui/evolution-memos.xml.h:7
+#, fuzzy
+msgid "Delete selected memos"
+msgstr "מוחק את האובייקטים שנבחרו..."
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
 msgstr ""
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_סגור"
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr ""
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:36
-msgid "_File"
-msgstr "_קובץ"
+#: ../ui/evolution-memos.xml.h:13
+#, fuzzy
+msgid "Print the list of memos"
+msgstr "הדפס הודעה"
 
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
 msgstr ""
 
+#: ../ui/evolution-memos.xml.h:18
+#, fuzzy
+msgid "_Open Memo"
+msgstr "_פתח"
+
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
 #. accel="*Ctrl*s"/>
 #.
-#: ../ui/evolution-message-composer.xml.h:5
+#: ../ui/evolution-message-composer.xml.h:4
 #: ../ui/evolution-signature-editor.xml.h:13
 msgid "Close the current file"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
 msgid "For_mat"
 msgstr ""
 
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr ""
+
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:15
+#: ../ui/evolution-message-composer.xml.h:16
 #, fuzzy
-msgid "Request read receipt"
+msgid "R_equest Read Receipt"
 msgstr "משתתפים דרושים"
 
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save Draft"
 msgstr "שמירה בשם..."
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
 msgstr "שמור _בשם..."
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "Save _Draft"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save as draft"
 msgstr "שמירה בשם..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:22
-msgid "Send the mail in HTML format"
-msgstr ""
+msgid "Send"
+msgstr "שלח"
 
 #: ../ui/evolution-message-composer.xml.h:30
-msgid "Send this message"
+#: ../ui/evolution-signature-editor.xml.h:23
+msgid "Send the mail in HTML format"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your PGP key"
+msgid "Send this message"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:32
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr ""
+#, fuzzy
+msgid "Set the message priority to high"
+msgstr "שמור את ההודעה כקובץ מלל"
 
 #: ../ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the BCC field is displayed"
+msgid "Sign this message with your PGP key"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the CC field is displayed"
+msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the From chooser is displayed"
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:36
-msgid "Toggles whether the Post-To field is displayed"
+msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:37
-msgid "Toggles whether the Reply-To field is displayed"
+msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the To field is displayed"
+msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
+msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
 #: ../ui/evolution-message-composer.xml.h:40
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "_Cc Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "_Delete all"
 msgstr "מ_חק הכל"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_From Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-msgid "_Insert"
-msgstr ""
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
 msgstr "_פתח..."
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+#, fuzzy
+msgid "_Prioritize Message"
+msgstr "הדפס הודעה"
+
+#: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
 msgstr "_אבטחה"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_To Field"
 msgstr ""
 
@@ -18356,18 +19987,18 @@ msgstr ""
 msgid "H_TML"
 msgstr ""
 
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr ""
 
 #.
 #. <menuitem name="FileSave" verb="" _label="_Save"/>
 #.
-#: ../ui/evolution-signature-editor.xml.h:20
+#: ../ui/evolution-signature-editor.xml.h:21
 msgid "Save and _Close"
 msgstr "שמור ו_סגור"
 
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "שמור את הקובץ הנוכחי וסגור את החלון"
 
@@ -18399,12 +20030,38 @@ msgstr ""
 msgid "_Invert Selection"
 msgstr "ה_פוך בחירה"
 
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:9
+#, fuzzy
+msgid "Status Details"
+msgstr "פרטים"
+
+#: ../ui/evolution-task-editor.xml.h:10
+#, fuzzy
+msgid "Time Zone"
+msgstr "אזור זמן"
+
+#: ../ui/evolution-task-editor.xml.h:23
+#, fuzzy
+msgid "_Send Options"
+msgstr "אפשרויות"
+
+#: ../ui/evolution-task-editor.xml.h:24
+#, fuzzy
+msgid "_Status Details"
+msgstr "פרטים"
+
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+#, fuzzy
+msgid "Copy selected tasks"
 msgstr "העתק את ההודעה המסומנת"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+#, fuzzy
+msgid "Cut selected tasks"
 msgstr "גזור את ההודעה המסומנת"
 
 #: ../ui/evolution-tasks.xml.h:7
@@ -18424,7 +20081,7 @@ msgid "Mark selected tasks as complete"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:13
@@ -18436,16 +20093,26 @@ msgid "Print the list of tasks"
 msgstr ""
 
 #: ../ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "Show task preview window"
+msgstr "ה_צג תזכורת"
+
+#: ../ui/evolution-tasks.xml.h:19
+#, fuzzy
+msgid "Task _Preview"
+msgstr "כותרת ההודעה"
+
+#: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr ""
 
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
 msgid "_Open Task"
 msgstr ""
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
-msgstr ""
+msgstr "אודות Evolution..."
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
@@ -18480,51 +20147,70 @@ msgid "Exit the program"
 msgstr "צא מהתוכנית"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
 #: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
+msgid "Hide window buttons"
 msgstr ""
 
 #: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr ""
+msgid "I_mport..."
+msgstr "_יבא..."
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
-msgstr ""
+msgstr "סמלים ו_טקסט"
 
 #: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr ""
 
-#: ../ui/evolution.xml.h:17
+#: ../ui/evolution.xml.h:16
+msgid "Lay_out"
+msgstr ""
+
+#: ../ui/evolution.xml.h:18
 msgid "New _Window"
 msgstr "ח_לון חדש"
 
-#: ../ui/evolution.xml.h:18
-#, fuzzy
+#: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
-msgstr "העדפות דואר"
+msgstr "העדפות"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "שלח / קבל"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
+msgid "Send / _Receive"
+msgstr "שלח / _קבל"
+
+#: ../ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:24
+msgid "Show Side _Bar"
+msgstr "הצג רת סרגל ה_צד"
+
+#: ../ui/evolution.xml.h:25
+msgid "Show _Status Bar"
+msgstr "הצג את _שורת המצב"
+
+#: ../ui/evolution.xml.h:26
+msgid "Show _Toolbar"
+msgstr "הצג את _סרגל הכלים"
+
+#: ../ui/evolution.xml.h:27
 msgid "Show information about Evolution"
-msgstr ""
+msgstr "הצג מידע אודות Evolution"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "שלוח דו\"ח באגים"
 
@@ -18532,82 +20218,71 @@ msgstr "שלוח דו\"ח באגים"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "שלח _דו\"ח באגים"
 
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "שלח דו\"ח באגים בעזרת Bug Buddy"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ../ui/evolution.xml.h:31
-msgid "Tool_bar"
-msgstr ""
-
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:36
 msgid "Tool_bar style"
-msgstr ""
-
-#: ../ui/evolution.xml.h:33
-msgid "_About Evolution..."
-msgstr ""
-
-#: ../ui/evolution.xml.h:34
-#, fuzzy
-msgid "_Close Window"
-msgstr "סגור חלון זה"
+msgstr "ס_גנון סרגל כלים"
 
 #: ../ui/evolution.xml.h:37
-msgid "_Help"
-msgstr "עזר_ה"
+msgid "View/Hide the Side Bar"
+msgstr "הצג/הסתר את סרגל הצד"
 
 #: ../ui/evolution.xml.h:38
-msgid "_Hide buttons"
-msgstr ""
+msgid "View/Hide the Status Bar"
+msgstr "הצג/הסתר את שורת המצב"
 
 #: ../ui/evolution.xml.h:39
-msgid "_Icons only"
-msgstr ""
+msgid "_About"
+msgstr "_אודות"
 
 #: ../ui/evolution.xml.h:40
-msgid "_Import..."
-msgstr "_יבא..."
+msgid "_Close Window"
+msgstr "_סגור חלון"
 
-#: ../ui/evolution.xml.h:41
-msgid "_New"
-msgstr "_חדש"
+#: ../ui/evolution.xml.h:43
+msgid "_Forget Passwords"
+msgstr "שכח סיסמאות"
+
+#: ../ui/evolution.xml.h:45
+msgid "_Hide buttons"
+msgstr "ה_סתר כפתורים"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:46
+msgid "_Icons only"
+msgstr "ס_מלים בלבד"
+
+#: ../ui/evolution.xml.h:48
 msgid "_Quick Reference"
 msgstr ""
 
-#: ../ui/evolution.xml.h:43
-#, fuzzy
+#: ../ui/evolution.xml.h:49
 msgid "_Quit"
-msgstr "_צוטט"
+msgstr "_יציאה"
 
-#: ../ui/evolution.xml.h:44
-msgid "_Send / Receive"
-msgstr ""
-
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:50
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:51
 msgid "_Synchronization Options..."
-msgstr ""
+msgstr "אפשרויות _סנכרון..."
 
-#: ../ui/evolution.xml.h:47
-#, fuzzy
+#: ../ui/evolution.xml.h:52
 msgid "_Text only"
-msgstr "מודל טקסט"
+msgstr "ט_קסט בלבד"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:54
 msgid "_Window"
 msgstr "_חלון"
 
@@ -18644,28 +20319,42 @@ msgid "_Work Week View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:1
-msgid "As _Sent Folder"
+msgid "As Sent Folder for Wi_de View"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:2
-msgid "By S_tatus"
-msgstr ""
+msgid "As _Sent Folder"
+msgstr "כמו ב_דואר נכנס"
 
 #: ../views/mail/galview.xml.h:3
-msgid "By Se_nder"
-msgstr ""
+msgid "By S_tatus"
+msgstr "לפי _סטטוס"
 
 #: ../views/mail/galview.xml.h:4
-msgid "By Su_bject"
-msgstr ""
+msgid "By Se_nder"
+msgstr "לפי _שולח"
 
 #: ../views/mail/galview.xml.h:5
+msgid "By Su_bject"
+msgstr "לפי _נושא"
+
+#: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
 msgstr ""
 
-#: ../views/mail/galview.xml.h:6
+#: ../views/mail/galview.xml.h:7
+#, fuzzy
+msgid "For _Wide View"
+msgstr "תצוגת שבוע עבודה"
+
+#: ../views/mail/galview.xml.h:8
 msgid "_Messages"
-msgstr ""
+msgstr "_הודעות"
+
+#: ../views/memos/galview.xml.h:1
+#, fuzzy
+msgid "_Memos"
+msgstr "חברים"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -18675,29 +20364,33 @@ msgstr ""
 msgid "With _Status"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#. Put the ""UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
 msgid "UTC"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
 msgid "<b>_Selection</b>"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "בחר אזור זמן"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 #, fuzzy
 msgid "TimeZone Combobox"
 msgstr "אזור זמן"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -18714,7 +20407,7 @@ msgstr "מיקום"
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
-msgstr ""
+msgstr "הגדר תצוגות עבור %s"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
@@ -18733,9 +20426,9 @@ msgid "_Edit..."
 msgstr "_עריכה"
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1927
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 #, fuzzy
 msgid "Table"
 msgstr "אפשר"
@@ -18749,22 +20442,37 @@ msgstr ""
 msgid "Save Current View"
 msgstr "תצוגה נוכחית"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 #, fuzzy
 msgid "_Create new view"
 msgstr "צור פריט מבחן חדש"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
 msgid "_Replace existing view"
 msgstr ""
 
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "מותאם אישית"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "שמור תצוגה מותאמת אישית"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "הגדר _תצוגות..."
+
 #: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "_תצוגה נוכחית"
+msgid "C_urrent View"
+msgstr "תצוגה _נוכחית"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
-msgstr ""
+msgstr "שמור תצוגה מותאמת אישית..."
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
@@ -18774,114 +20482,114 @@ msgstr ""
 msgid "Define New View"
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
 msgid "Name of new view:"
 msgstr ""
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
 #, fuzzy
 msgid "Type of View"
 msgstr "תצוגת יום"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of view:"
 msgstr ""
 
+#: ../widgets/misc/e-attachment.glade.h:5
+msgid "Suggest automatic display of attachment"
+msgstr ""
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "בגדהושא"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
+#: ../widgets/misc/e-calendar-item.c:1747
 msgid "%B %Y"
 msgstr ""
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-#, fuzzy
-msgid "Previous Button"
-msgstr "הקודם"
-
 #: ../widgets/misc/e-calendar.c:226
 #, fuzzy
 msgid "Month Calendar"
 msgstr "לוח שנה"
 
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3582
 #, fuzzy
 msgid "Fill color"
 msgstr "צבע"
 
-#: ../widgets/misc/e-canvas-background.c:463
 #: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3597
 msgid "GDK fill color"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3604
 #, fuzzy
 msgid "Fill stipple"
 msgstr "_סוג הקובץ:"
 
-#: ../widgets/misc/e-canvas-background.c:484
 #: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 #, fuzzy
 msgid "X1"
 msgstr "1"
 
-#: ../widgets/misc/e-canvas-background.c:491
 #: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-background.c:498
 #: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 #, fuzzy
 msgid "Y1"
 msgstr "1"
 
-#: ../widgets/misc/e-canvas-background.c:505
 #: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr ""
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3016
 #, fuzzy
 msgid "Minimum Width"
 msgstr "רוחב עמודה"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:205
+#: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "עכשיו"
 
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -18890,207 +20598,258 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "בלטי"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "מרכז אירופי"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "סינית"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "יוונית"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "עברית"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "יפנית"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "קוראנית"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+#, fuzzy
+msgid "Thai"
+msgstr "תאילנד"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "טורקית"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "יוניקוד"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "מערב אירופאי"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Western European, New"
 msgstr "מערב אירופאי, חדש"
 
-#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
-#: ../widgets/misc/e-charset-picker.c:93
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96
 msgid "Traditional"
 msgstr "מסורתי"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
+#: ../widgets/misc/e-charset-picker.c:100
 msgid "Simplified"
 msgstr "מופשט"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Ukrainian"
 msgstr "אוקראינית"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Visual"
 msgstr "ויזואלי"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:175
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "קידוד תווים לא ידוע: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:220
 msgid "Character Encoding"
 msgstr "קידוד תווים"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:235
 msgid "Enter the character set to use"
 msgstr ""
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:342
 msgid "Other..."
 msgstr "אחר..."
 
+#: ../widgets/misc/e-charset-picker.c:483
+msgid "Ch_aracter Encoding"
+msgstr "קידוד _תווים"
+
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
-msgstr ""
+msgstr "..."
 
-#: ../widgets/misc/e-dateedit.c:316
-msgid "Date and Time Entry"
-msgstr ""
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "תאריך ושעה"
 
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:336
-msgid "Text Date Entry"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:362
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:354
-msgid "Date Button"
-msgstr ""
-
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:384
 msgid "Combo box to select time"
 msgstr ""
 
-#: ../widgets/misc/e-dateedit.c:375
-msgid "Time Combo Box"
-msgstr ""
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr "שעה"
+
+#: ../widgets/misc/e-dateedit.c:461
+msgid "No_w"
+msgstr "ע_כשיו"
+
+#: ../widgets/misc/e-dateedit.c:467
+msgid "_Today"
+msgstr "ה_יום"
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: ../widgets/misc/e-expander.c:181
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#: ../widgets/misc/e-dateedit.c:1634
+#, fuzzy
+msgid "Invalid Date Value"
+msgstr "חתימה בלתי חוקית"
+
+#: ../widgets/misc/e-dateedit.c:1660
+#, fuzzy
+msgid "Invalid Time Value"
+msgstr "חתימה בלתי חוקית"
+
+#: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:183
 msgid "Whether or not the expander is expanded"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:191
 msgid "Text of the expander's label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:197
+#: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:199
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:215
+#: ../widgets/misc/e-expander.c:216
 msgid "Label widget"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:217
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:231
+#: ../widgets/misc/e-expander.c:232
 msgid "Indicator Spacing"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:233
 msgid "Spacing around expander arrow"
 msgstr ""
 
-#: ../widgets/misc/e-filter-bar.c:195
-msgid "_Searches"
-msgstr ""
-
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr ""
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
+#: ../widgets/misc/e-filter-bar.c:717
+msgid "Advanced Search"
+msgstr "חיפוש מתקדם"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:218
 msgid "Save Search"
+msgstr "שמור חיפוש"
+
+#: ../widgets/misc/e-filter-bar.c:251
+msgid "_Searches"
 msgstr ""
 
-#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.c:253
+#, fuzzy
+msgid "Searches"
+msgstr "_חיפוש"
+
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
 msgid "_Save Search..."
-msgstr ""
+msgstr "_שמור חיפוש..."
 
-#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Edit Saved Searches..."
-msgstr ""
+msgstr "_ערוך חיפושים שמורים..."
 
-#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
-#, fuzzy
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Advanced Search..."
-msgstr "חיפוש מתקדם"
+msgstr "_חיפוש מתקדם..."
+
+#: ../widgets/misc/e-filter-bar.h:103
+msgid "All Accounts"
+msgstr "כל החשבונות"
+
+#: ../widgets/misc/e-filter-bar.h:104
+msgid "Current Account"
+msgstr "צור חשבון"
+
+#: ../widgets/misc/e-filter-bar.h:105
+msgid "Current Folder"
+msgstr "תיקייה נוכחית"
+
+#: ../widgets/misc/e-filter-bar.h:106
+msgid "Current Message"
+msgstr "הודעה נוכחית"
 
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
-msgstr ""
+msgstr "בחר תמונה"
 
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:629
 msgid "World Map"
-msgstr ""
+msgstr "מפת עולם"
 
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:631
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -19109,68 +20868,67 @@ msgstr ""
 msgid "Sync Categories:"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 #, fuzzy
 msgid "Empty message"
 msgstr "סה\"כ הודעות:"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
-#, fuzzy
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "רוחב עמודה"
 
-#. To translators: This is the accessibility name of
-#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:345
-msgid "Search Text Entry"
-msgstr ""
-
-#: ../widgets/misc/e-search-bar.c:549
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Search"
 msgstr "_חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:555
+#: ../widgets/misc/e-search-bar.c:603
 msgid "_Find Now"
-msgstr ""
+msgstr "_חפש עכשיו"
 
-#: ../widgets/misc/e-search-bar.c:556 ../widgets/misc/e-search-bar.c:943
+#: ../widgets/misc/e-search-bar.c:604
 msgid "_Clear"
 msgstr "_נקה"
 
-#: ../widgets/misc/e-search-bar.c:647
-#, fuzzy
-msgid "Search Type"
-msgstr "_חיפוש"
-
-#: ../widgets/misc/e-search-bar.c:851
+#: ../widgets/misc/e-search-bar.c:855
 msgid "Item ID"
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:858
-msgid "Subitem ID"
+#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
+#: ../widgets/text/e-text.c:3504
+msgid "Text"
+msgstr "טקסט"
+
+#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
+#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
+#: ../widgets/misc/e-search-bar.c:996
+msgid "Sho_w: "
 msgstr ""
 
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
-msgid "Text"
-msgstr "מלל"
+#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
+#. the term to search for
+#: ../widgets/misc/e-search-bar.c:1013
+#, fuzzy
+msgid "Sear_ch: "
+msgstr "_חיפוש"
 
-#: ../widgets/misc/e-search-bar.c:945
-msgid "Find _Now"
-msgstr "_מצא"
+#. To Translators: The " in " label is part of the Quick Search Bar, example:
+#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
+#: ../widgets/misc/e-search-bar.c:1025
+msgid " i_n "
+msgstr ""
 
-#: ../widgets/misc/e-selection-model-array.c:546
+#: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
 #, fuzzy
 msgid "Cursor Row"
 msgstr "יש סמן"
 
-#: ../widgets/misc/e-selection-model-array.c:553
+#: ../widgets/misc/e-selection-model-array.c:554
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr ""
@@ -19189,7 +20947,7 @@ msgstr "בחר תיקייה"
 msgid "Cursor Mode"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
 #, fuzzy
 msgid "When de_leted:"
 msgstr "%d נמחק"
@@ -19219,7 +20977,7 @@ msgid "A_uto-delete sent item"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:6
-msgid "C_lassification"
+msgid "Classification"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:7
@@ -19243,20 +21001,23 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:12
 msgid ""
-"Public\n"
-"Private\n"
+"Normal\n"
+"Proprietary\n"
 "Confidential\n"
+"Secret\n"
+"Top Secret\n"
+"For Your Eyes Only"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:16
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid "Sta_tus Tracking"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:21
 msgid ""
 "Undefined\n"
 "High\n"
@@ -19264,92 +21025,94 @@ msgid ""
 "Low"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:23
-#, fuzzy
-msgid "W_ithin"
-msgstr "רוחב"
-
-#: ../widgets/misc/e-send-options.glade.h:24
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When acce_pted:"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:26
 #, fuzzy
 msgid "When co_mpleted:"
 msgstr " (הסתיים "
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:28
+#, fuzzy
+msgid "Wi_thin"
+msgstr "רוחב"
+
+#: ../widgets/misc/e-send-options.glade.h:29
 #, fuzzy
 msgid "_After:"
 msgstr "אחרי"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:30
 #, fuzzy
 msgid "_All information"
 msgstr "מידע אישי"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:31
 #, fuzzy
 msgid "_Delay message delivery"
 msgstr "השאר הודעות על השרת"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:32
 #, fuzzy
 msgid "_Delivered"
 msgstr "_מחק"
 
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.glade.h:34
 msgid "_Set expiration date"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.glade.h:35
 #, fuzzy
 msgid "_Until:"
 msgstr "ללא-שם"
 
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../widgets/misc/e-send-options.glade.h:36
 msgid "_When convenient"
 msgstr ""
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.glade.h:37
 #, fuzzy
 msgid "_When opened:"
 msgstr "_איפה:"
 
-#: ../widgets/misc/e-task-widget.c:208
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
+#: ../widgets/misc/e-task-widget.c:209
 #, c-format
 msgid "%s (...)"
-msgstr ""
+msgstr "%s (...)"
 
-#: ../widgets/misc/e-task-widget.c:213
+#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
+#. %d is a number between 0 and 100, describing the percentage of operation complete
+#: ../widgets/misc/e-task-widget.c:215
 #, c-format
 msgid "%s (%d%% complete)"
-msgstr ""
+msgstr "%s (%d%% הסתיים)"
 
 #: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
+msgid "Click here to go to URL"
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:2
+#: ../widgets/misc/gal-categories.glade.h:1
 msgid "Edit Master Category List..."
 msgstr ""
 
-#: ../widgets/misc/gal-categories.glade.h:3
+#: ../widgets/misc/gal-categories.glade.h:2
 #, fuzzy
 msgid "Item(s) belong to these _categories:"
 msgstr "איש הקשר הזה שייך לקטגוריות האלו:"
 
-#: ../widgets/misc/gal-categories.glade.h:4
+#: ../widgets/misc/gal-categories.glade.h:3
 #, fuzzy
 msgid "_Available Categories:"
 msgstr "_קטגוריות"
 
-#: ../widgets/misc/gal-categories.glade.h:5
-#, fuzzy
+#: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
 msgstr "קטגוריות"
 
@@ -19358,9 +21121,8 @@ msgid "popup list"
 msgstr ""
 
 #: ../widgets/table/e-cell-date.c:64
-#, fuzzy
 msgid "%l:%M %p"
-msgstr "היום %l:%M %p"
+msgstr "%l:%M ‎%p"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 #, fuzzy
@@ -19375,23 +21137,23 @@ msgstr ""
 msgid "Unselected Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1793
 msgid "Strikeout Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1800
 msgid "Underline Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Bold Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Color Column"
 msgstr ""
 
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1828
 msgid "BG Color Column"
 msgstr ""
 
@@ -19407,18 +21169,19 @@ msgstr ""
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#: ../widgets/table/e-table-header-item.c:1593
 #, fuzzy
 msgid "Ascending"
 msgstr "תזמון"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
-#, fuzzy
 msgid "Clear All"
-msgstr "_נקה"
+msgstr "נקה הכל"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-header-item.c:1593
 #, fuzzy
 msgid "Descending"
 msgstr "תזמון"
@@ -19524,20 +21287,19 @@ msgid "_Show these fields in order:"
 msgstr ""
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1892
 #, fuzzy
 msgid "DnD code"
 msgstr "יוניקוד"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
-#, fuzzy
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1906
 msgid "Full Header"
-msgstr "כותרת"
+msgstr "כותרת מלאה"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
@@ -19554,216 +21316,211 @@ msgid ""
 "the location in which you want it to appear."
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:345
 #, c-format
 msgid "%s : %s (%d item)"
-msgstr ""
+msgid_plural "%s : %s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
-msgid "%s : %s (%d items)"
-msgstr ""
-
-#: ../widgets/table/e-table-group-container.c:356
-#, c-format
 msgid "%s (%d item)"
-msgstr ""
-
-#: ../widgets/table/e-table-group-container.c:357
-#, c-format
-msgid "%s (%d items)"
-msgstr ""
+msgid_plural "%s (%d items)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 #, fuzzy
 msgid "Draw focus"
 msgstr "יש פוקוס"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 #, fuzzy
 msgid "Selection model"
 msgstr "בחר תיקייה"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr ""
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 #, fuzzy
 msgid "Frozen"
 msgstr "מאת"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1471
 #, fuzzy
 msgid "Customize Current View"
 msgstr "תצוגה נוכחית"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Sort Ascending"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1492
 msgid "Sort Descending"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1493
 #, fuzzy
 msgid "Unsort"
 msgstr "יחידה"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1495
 msgid "Group By This Field"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Group By Box"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Remove This Column"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1499
 msgid "Add a Column..."
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1501
 #, fuzzy
 msgid "Alignment"
 msgstr "פגישה"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1502
 msgid "Best Fit"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1503
 msgid "Format Columns..."
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1505
 #, fuzzy
 msgid "Customize Current View..."
 msgstr "תצוגה נוכחית"
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1554
+#, fuzzy
+msgid "Sort By"
+msgstr "מבנה"
+
+#: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 #, fuzzy
 msgid "Fontset"
 msgstr "גופנים"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1920
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1934
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 #, fuzzy
 msgid "Tree"
 msgstr "פנוי"
 
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 #, fuzzy
 msgid "Table header"
 msgstr "כותרת ההודעה"
 
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 #, fuzzy
 msgid "Table model"
 msgstr "מודל טקסט"
 
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #, fuzzy
 msgid "Cursor row"
 msgstr "יש סמן"
 
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 #, fuzzy
-msgid "Always Search"
-msgstr "חיפוש מתקדם"
+msgid "Always search"
+msgstr "תמיד"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 #, fuzzy
 msgid "Use click to add"
 msgstr "לחץ כאן כדי להוסיף משימה"
 
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-#, fuzzy
-msgid "Always search"
-msgstr "תמיד"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr ""
 
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr ""
 
@@ -19774,22 +21531,21 @@ msgstr ""
 #: ../widgets/text/e-entry-test.c:50
 #, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "כל הזכויות שמורות (C) 2000, Ximian, Inc."
+msgstr "כל הזכויות שמורות (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
 msgid "This should test the minicard canvas item"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 #, fuzzy
 msgid "Event Processor"
 msgstr "הכנס סיסמה"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
-#, fuzzy
 msgid "Font"
-msgstr "גופנים"
+msgstr "גופנן"
 
 #: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
 #, fuzzy
@@ -19797,124 +21553,322 @@ msgid "GDKFont"
 msgstr "גופנים"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
 msgid "Justification"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
 msgid "Use ellipsis"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
 msgid "Ellipsis"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 #, fuzzy
 msgid "Line wrap"
 msgstr "ליבריה"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
 msgid "Break characters"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 #, fuzzy
 msgid "Max lines"
 msgstr "שוליים"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
 msgid "Allow newlines"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
 msgid "Draw borders"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
 msgid "Draw background"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Draw button"
 msgstr ""
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
-#, fuzzy
+#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
 msgid "Cursor position"
-msgstr "עמדה"
+msgstr "מיקום סמן"
 
 #: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
 msgstr ""
 
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2739
 msgid "Input Methods"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
 #, fuzzy
 msgid "Bold"
 msgstr "גוף"
 
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
 msgid "Strikeout"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
 #, fuzzy
 msgid "Anchor"
 msgstr "אנדורה"
 
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
 #, fuzzy
 msgid "Clip Width"
 msgstr "רוחב עמודה"
 
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 #, fuzzy
 msgid "Clip Height"
 msgstr "גובה"
 
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
 msgid "Clip"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
 msgid "Fill clip rectangle"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
 msgid "X Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
 msgid "Y Offset"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
-#, fuzzy
+#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
 msgid "Text width"
-msgstr "מסתיים ב"
+msgstr "רוחב טקסט"
 
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
 msgid "Text height"
-msgstr ""
+msgstr "גובה טקסט"
 
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
 msgid "IM Context"
 msgstr ""
 
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr ""
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "E-_mail:"
+#~ msgstr "_דוא\"ל:"
+
+#~ msgid "Advanced..."
+#~ msgstr "מתקדם..."
+
+#~ msgid "Video Conferencing"
+#~ msgstr "ועידת וידאו"
+
+#~ msgid "work"
+#~ msgstr "עבודה"
+
+#~ msgid "WWW"
+#~ msgstr "WWW"
+
+#~ msgid "personal"
+#~ msgstr "אישי"
+
+#~ msgid "(none)"
+#~ msgstr "(ללא)"
+
+#~ msgid "Primary Email"
+#~ msgstr "דוא\"ל ראשי"
+
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "צור איש קשר חדש \"%s\""
+
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "הוסף כתובת לאיש קשר קיים \"%s\""
+
+#, fuzzy
+#~ msgid "description of appointment"
+#~ msgstr "תחילת הפגישה"
+
+#~ msgid "Dismiss"
+#~ msgstr "שחרר"
+
+#~ msgid "Dismiss All"
+#~ msgstr "שחרר הכל"
+
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "התרעה על %s\n"
+#~ "%s\n"
+#~ "מתחיל ב %s\n"
+#~ "מסתיים ב %s"
+
+#~ msgid "Remove"
+#~ msgstr "הסר"
+
+#~ msgid "05 minutes"
+#~ msgstr "05 דקות"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 דקות"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 דקות"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 דקות"
+
+#~ msgid "60 minutes"
+#~ msgstr "60 דקות"
+
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>התרעות</b>"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>כללי</b>"
+
+#, fuzzy
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>מחפש</b>"
+
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>רשימת מטלות</b>"
+
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>זמן</b>"
+
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>שבוע עבודה</b>"
+
+#~ msgid "Days"
+#~ msgstr "ימים"
+
+#~ msgid "Hours"
+#~ msgstr "שעות"
+
+#~ msgid "Minutes"
+#~ msgstr "דקות"
+
+#~ msgid "_Add URL"
+#~ msgstr "_הוסף כתובת"
+
+#~ msgid "Scheduling"
+#~ msgstr "תזמון"
+
+#, fuzzy
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>אפשרויות</b>"
+
+#, fuzzy
+#~ msgid "Locat_ion:"
+#~ msgstr "_מיקום:"
+
+#~ msgid "_Description:"
+#~ msgstr "_תיאור:"
+
+#, fuzzy
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>חזרה</b>"
+
+#, fuzzy
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>בית</b>"
+
+#, fuzzy
+#~ msgid "Task Table"
+#~ msgstr "משימות"
+
+#, fuzzy
+#~ msgid "Timezone Button"
+#~ msgstr "אזור זמן"
+
+#, fuzzy
+#~ msgid "_Rule name:"
+#~ msgstr "שם החוק"
+
+#, fuzzy
+#~ msgid "If"
+#~ msgstr "I"
+
+#, fuzzy
+#~ msgid "Mail Accounts Table"
+#~ msgstr "חשבונות דואר"
+
+#~ msgid "Server: %s, Type: %s"
+#~ msgstr "שרת: %s, סוג: %s"
+
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "מסלול: %s, סוג: %s"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "<span weight=\"bold\">הזדהות</span>"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">הזדהות</span>"
+
+#, fuzzy
+#~ msgid "Automatic contacts"
+#~ msgstr "אין אנשי קשר"
+
+#, fuzzy
+#~ msgid "Meetings and Tasks"
+#~ msgstr "לוח שנה ומשימות"
+
+#, fuzzy
+#~ msgid "Id"
+#~ msgstr "I"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "_מסלול:"
+
+#, fuzzy
+#~ msgid "Uid"
+#~ msgstr "יוניקוד"
+
+#~ msgid "Evolution Settings"
+#~ msgstr "הגדרות Evolution"
+
+#~ msgid "Move"
+#~ msgstr "העבר לתיקייה"
+
+#, fuzzy
+#~ msgid "Previous Button"
+#~ msgstr "הקודם"
+
+#, fuzzy
+#~ msgid "Search Type"
+#~ msgstr "_חיפוש"
+
+#~ msgid "Find _Now"
+#~ msgstr "_מצא"
+
+#, fuzzy
+#~ msgid "Always Search"
+#~ msgstr "חיפוש מתקדם"
diff --git a/po/it.po b/po/it.po
index b709a69366..91dcfb7d58 100644
--- a/po/it.po
+++ b/po/it.po
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 17:35+0200\n"
-"PO-Revision-Date: 2006-10-11 17:40+0200\n"
+"POT-Creation-Date: 2006-10-16 17:48+0200\n"
+"PO-Revision-Date: 2006-10-26 21:48+0200\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -188,7 +188,7 @@ msgstr "%A %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../calendar/gui/calendar-component.c:710
 #: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2104
+#: ../calendar/gui/e-day-view.c:2106
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -222,7 +222,7 @@ msgstr "%d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../calendar/gui/calendar-component.c:736
 #: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2120
+#: ../calendar/gui/e-day-view.c:2122
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
@@ -5671,11 +5671,11 @@ msgstr "<span weight=\"bold\">Settimana lavorativa</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Adjust for daylight sa_ving time"
-msgstr "Regola per ora le_gale"
+msgstr "_Regolare per l'ora legale"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
-msgstr "Fine _giornata:"
+msgstr "_Fine della giornata:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
@@ -5823,7 +5823,7 @@ msgstr "_Comprimere i fine settimana nella vista mensile"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Day begins:"
-msgstr "Inizio _giornata:"
+msgstr "Ini_zio della giornata:"
 
 #. Friday
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
@@ -6095,7 +6095,7 @@ msgid "_Add attachment..."
 msgstr "_Aggiungi allegato..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1510
-#: ../mail/em-format-html-display.c:2267
+#: ../mail/em-format-html-display.c:2286
 msgid "Show Attachments"
 msgstr "Mostra allegati"
 
@@ -7181,7 +7181,7 @@ msgstr "Assegnato"
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2132
 msgid "Select folder to save selected attachments..."
 msgstr "Selezionare una cartella per salvare gli allegati selezionati..."
 
@@ -7509,20 +7509,20 @@ msgstr "divisioni da %02i minuti"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2087
+#: ../calendar/gui/e-day-view.c:2089
 #: ../calendar/gui/e-week-view-main-item.c:310
 #: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1538
 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:746 ../calendar/gui/e-day-view.c:1087
+#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "a.m."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1090
+#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "p.m."
@@ -11081,7 +11081,7 @@ msgstr "Nessuna risposta o genitore"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
-msgstr "Includi discussioni"
+msgstr "Includi i thread"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:328
@@ -12070,28 +12070,30 @@ msgid "Click to hide/unhide addresses"
 msgstr "Fare clic per nascondere/mostrare gli indirizzi"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:507
 #, c-format
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:650
 msgid "Fi_nd:"
 msgstr "Tr_ova:"
 
-#: ../mail/em-format-html-display.c:675
+# Attenzione, non è forward come azione di invio email, ma
+# avanti nella ricerca di un termine in una email
+#: ../mail/em-format-html-display.c:678
 msgid "Fo_rward"
-msgstr "I_noltra"
+msgstr "A_vanti"
 
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:683
 msgid "M_atch case"
 msgstr "Distingui M_aiucole/minuscole"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:930 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "Non firmato"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:930
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12099,11 +12101,11 @@ msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il messaggio sia "
 "autentico."
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:931 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "Firma valida"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:931
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12111,11 +12113,11 @@ msgstr ""
 "Questo messaggio è firmato ed è valido. È molto probabile che il messaggio "
 "sia autentico."
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:932 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "Firma non valida"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:932
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12123,11 +12125,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante la trasmissione."
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma valida, non è possibile verificare il mittente"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:933
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12135,11 +12137,11 @@ msgstr ""
 "Questo messaggio è firmato con una firma valida, ma non è possibile "
 "verificare chi ha spedito il messaggio."
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "Non cifrato"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:939
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12147,11 +12149,11 @@ msgstr ""
 "Questo messaggio non è cifrato. Il suo contenuto può essere visualizzato "
 "durante la trasmissione attraverso Internet."
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "Cifrato, crittografia debole"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:940
 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 "
@@ -12161,11 +12163,11 @@ msgstr ""
 "difficile, ma non impossibile, per un estraneo visualizzarne il contenuto in "
 "un tempo ragionevolmente breve."
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:941
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12173,11 +12175,11 @@ msgstr ""
 "Questo messaggio è cifrato. È difficile per un estraneo visualizzarne il "
 "contenuto."
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "Cifrato, crittografia forte"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:942
 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 "
@@ -12187,72 +12189,72 @@ msgstr ""
 "essere molto difficile per un estraneo visualizzarne il contenuto in un "
 "tempo ragionevole."
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1043 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1058
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1377
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1385
 msgid "Overdue:"
 msgstr "Scaduto:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1388
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1448
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1449
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1450
 msgid "_Fit to Width"
 msgstr "Adatta alla _larghezza"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1451
 msgid "Show _Original Size"
 msgstr "Mostra dimensioni _originali"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1886 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2093
 msgid "Select folder to save all attachments..."
 msgstr "Selezionare una cartella per salvare tutti gli allegati..."
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2140
 msgid "_Save Selected..."
 msgstr "_Salva selezionati..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2207
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d alle_gato"
 msgstr[1] "%d alle_gati"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2214 ../mail/em-format-html-display.c:2292
 msgid "S_ave"
 msgstr "S_alva"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2225
 msgid "S_ave All"
 msgstr "S_alva tutti"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2288
 msgid "No Attachment"
 msgstr "Nessun allegato"
 
@@ -12984,15 +12986,15 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Thread the message list."
-msgstr "Elenca per discussioni."
+msgstr "Elenca i messaggi per thread."
 
 #: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
-msgstr "Elenca per discussioni"
+msgstr "Thread nell'elenco messaggi"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Thread the message-list based on Subject"
-msgstr "Elenca per discussioni basate sull'oggetto"
+msgstr "Raggruppa in thread l'elenco messaggi in base all'oggetto"
 
 #: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "Timeout for marking message as Seen"
@@ -13083,8 +13085,8 @@ msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Reimposta l'elenco per discussione in base all'oggetto se i messaggi non "
-"contengono le intestazioni In-Risposta-A o Riferimenti."
+"Indica se ripiegare o meno sul raggruppamento in thread per oggetto quano i "
+"messaggi non contengolo le intestazioni In-Reply-Ro o Refereces."
 
 #: ../mail/evolution-mail.schemas.in.in.h:121
 msgid "Width of the message-list pane"
@@ -13187,7 +13189,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 "Alcuni dei filtri di posta di Netscape usano la caratteristica\n"
-" \"Ignora il Thread\" o \"Controlla il Thread\", non supportata da\n"
+" \"Ignora il thread\" o \"Controlla il thread\", non supportata da\n"
 "Evolution. Questi filtri saranno tralasciati."
 
 #: ../mail/importers/netscape-importer.c:704
@@ -13337,7 +13339,7 @@ msgstr "Cartella di _posta"
 msgid "Create a new mail folder"
 msgstr "Crea una nuova cartella di posta"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:997
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Aggiornamento delle impostazioni o cartelle di posta fallito."
 
@@ -13524,7 +13526,7 @@ msgstr "Allega messaggio originale"
 
 #: ../mail/mail-config.glade.h:45
 msgid "Automatically insert _smiley images"
-msgstr "_Inserire automaticamente immagini delle faccine"
+msgstr "Inserire automaticamente le immagini degli _smiley"
 
 #: ../mail/mail-config.glade.h:46
 msgid "Baltic (ISO-8859-13)"
@@ -13657,7 +13659,7 @@ msgstr "Proprietà caratteri"
 
 #: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
-msgstr "Formato messaggi in _HTML"
+msgstr "Formattare i messaggi in _HTML"
 
 #: ../mail/mail-config.glade.h:84
 msgid "Full Nam_e:"
@@ -13754,7 +13756,7 @@ msgstr "Selezionare una delle seguenti opzioni"
 
 #: ../mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Segnala l'invio di messaggi con solo destinatari _Bcc"
+msgstr "Confermare l'invio di messaggi con solo destinatari _BCC"
 
 #: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
@@ -13932,7 +13934,7 @@ msgstr "Impostare co_me account predefinito"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
-msgstr "Segnare i _messaggi come letti dopo"
+msgstr "Contrassegnare i _messaggi come letti dopo"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
@@ -15257,6 +15259,14 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "Usare _SSL"
 
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
+msgid "CalDAV Calendar sources"
+msgstr "Sorgenti calendario CalDAV"
+
+#: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
+msgid "CalDAV sources"
+msgstr "Sorgenti CalDAV"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "Calendari locali"
@@ -16301,7 +16311,7 @@ msgstr "Modifica car_telle/opzioni/regole/"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
 msgid "Read items marked _private"
-msgstr "Leggere gli oggetti segnati come _privati"
+msgstr "Leggere gli oggetti contrassegnati come _privati"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
 msgid "Reminder Notes"
@@ -16419,6 +16429,15 @@ msgstr "Selezione calendario"
 msgid "_Import"
 msgstr "_Importa"
 
+#. the path to the shared library
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
+msgid "Import to Calendar"
+msgstr "Importa nel calendario"
+
+#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
+msgid "Imports ICS attachments to calendar."
+msgstr "Importa gli allegati ICS nel calendario."
+
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17157,7 +17176,7 @@ msgstr "Converte il messaggio selezionato in un nuovo compito"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
-msgstr "Contatta _proprietario lista"
+msgstr "Contatta p_roprietario lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
@@ -17322,15 +17341,15 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "_Pubblica messaggio sulla lista"
+msgstr "_Pubblica messaggio su lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
-msgstr "_Sottoscrivi alla lista"
+msgstr "_Sottoscrivi a lista"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
 msgid "_Unsubscribe from List"
-msgstr "__Annullamento sottoscrizione lista"
+msgstr "_Annulla sottoscrizione a lista"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -17794,20 +17813,23 @@ msgstr "Importazione dati."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr "Indica se il raggruppamento dei messaggi debba ripiegare sull'oggetto."
+msgstr ""
+"Indica se il raggruppamento per thread dei messaggi debba ripiegare "
+"sull'oggetto."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "Raggruppamento per oggetto"
+msgstr "Threading su oggetto"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr "Raggruppa i messaggi per oggetto"
+msgstr "Thread dei messaggi su oggetto"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
 msgid "Fall back to threading messages by sub_ject"
-msgstr "Ripiega su raggruppamento messaggi per o_ggetto"
+msgstr ""
+"Ripiegare su raggruppamento dei messaggi per t_hread in base all'oggetto"
 
 # Novell Translation
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -18136,25 +18158,25 @@ msgstr "Lavora non _in linea"
 msgid "Work Offline"
 msgstr "Lavora non in linea"
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:381
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution è attualmente in rete. Fare clic su questo pulsante per lavorare "
 "fuori rete."
 
-#: ../shell/e-shell-window.c:387
+#: ../shell/e-shell-window.c:389
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution sta per passare alla modalità fuori rete."
 
 # Novell Translation
-#: ../shell/e-shell-window.c:394
+#: ../shell/e-shell-window.c:396
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution è attualmente fuori rete. Fare clic su questo pulsante per "
 "lavorare in rete."
 
 # Novell Translation
-#: ../shell/e-shell-window.c:794
+#: ../shell/e-shell-window.c:796
 #, c-format
 msgid "Switch to %s"
 msgstr "Passa a %s"
@@ -18981,8 +19003,7 @@ msgstr "Descrizione dell'allegato."
 
 #: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
-"Segna allegato come da mostrare in linea come impostazione predefinita."
+msgstr "Contrassegna allegato come da mostrare in linea in modo predefinito."
 
 #: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
@@ -19665,11 +19686,11 @@ msgstr "Cambia le proprietà di questa cartella"
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "Comprimi ogni _discussione"
+msgstr "Contrai tutti i _thread"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
-msgstr "Comprime tutti i messaggi nelle discussioni"
+msgstr "Contrae tutti i thread di messaggi"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -19682,7 +19703,7 @@ msgstr "Taglia i messaggi selezionati negli appunti"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "E_spandi ogni discussione"
+msgstr "E_spandi tutti i thread"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -19690,7 +19711,7 @@ msgstr "Ri_pulisci"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Espande tutti i messaggi nelle discussioni"
+msgstr "Espande tutti i thread di messaggi"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -19727,21 +19748,21 @@ msgstr "Rimuove permanentemente questa cartella"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Select Message _Thread"
-msgstr "Seleziona _discussione messaggio"
+msgstr "Seleziona _thread del messaggio"
 
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
-msgstr "Seleziona _tutti messaggi"
+msgstr "Seleziona _tutti i messaggi"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Seleziona tutti e soli i messaggi che non sono al momento selezionati"
+msgstr ""
+"Seleziona tutti i messaggi che non sono al momento selezionati e solo quelli"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
-"Seleziona tutti i messaggi della discussione a cui appartiene il messaggio "
-"selezionato"
+"Seleziona tutti i messaggi nello stesso thread del messaggio selezionato"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
@@ -19765,11 +19786,11 @@ msgstr "Nasconde temporaneamente i messaggi selezionati"
 
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
-msgstr "Elenca per discussioni"
+msgstr "Elenco messaggi per thread"
 
 #: ../ui/evolution-mail-list.xml.h:31
 msgid "_Group By Threads"
-msgstr "Raggruppa per _discussione"
+msgstr "Ra_ggruppa per thread"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -19879,7 +19900,7 @@ msgstr "Mostra il prossimo messaggio"
 
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
-msgstr "Mostra la prossima discussione"
+msgstr "Mostra il prossimo thread"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
@@ -19995,7 +20016,7 @@ msgstr "Messaggio _importante successivo"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
-msgstr "_Discussione successiva"
+msgstr "_Thread successivo"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
@@ -20541,11 +20562,11 @@ msgstr "Elimina i compiti selezionati"
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr "_Segna come completato"
+msgstr "Contras_segna come completato"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
-msgstr "Segna i compiti selezionati come completati"
+msgstr "Contrassenga i compiti selezionati come completati"
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
diff --git a/po/ja.po b/po/ja.po
index ab60a1cd34..f9f7073535 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,18 +6,19 @@
 # Takeshi AIHANA <aihana@gnome.gr.jp>, 2001-2006.
 # Satoru SATOH <ss@gnome.gr.jp>, 2006.
 #
+#: ../mail/em-format-html-display.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-15 00:03+0900\n"
-"PO-Revision-Date: 2006-10-15 00:08+0900\n"
+"POT-Creation-Date: 2006-08-19 13:33+0900\n"
+"PO-Revision-Date: 2006-11-03 02:03+0900\n"
 "Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -26,12 +27,12 @@ msgid "evolution addressbook"
 msgstr "Evolution アドレス帳"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "新しい連絡先"
 
 #: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
 msgstr "新しい連絡先の一覧"
 
@@ -59,32 +60,32 @@ msgstr "連絡先: "
 msgid "evolution minicard"
 msgstr "Evolution ミニカード"
 
-#: ../a11y/calendar/ea-cal-view-event.c:266
+#: ../a11y/calendar/ea-cal-view-event.c:264
 msgid "It has alarms."
 msgstr "アラームあり"
 
-#: ../a11y/calendar/ea-cal-view-event.c:269
+#: ../a11y/calendar/ea-cal-view-event.c:267
 msgid "It has recurrences."
 msgstr "繰り返しあり"
 
-#: ../a11y/calendar/ea-cal-view-event.c:272
+#: ../a11y/calendar/ea-cal-view-event.c:270
 msgid "It is a meeting."
 msgstr "会議である"
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:276
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "カレンダのイベント: サマリは %s"
 
-#: ../a11y/calendar/ea-cal-view-event.c:280
+#: ../a11y/calendar/ea-cal-view-event.c:278
 msgid "Calendar Event: It has no summary."
 msgstr "カレンダのイベント: サマリなし"
 
-#: ../a11y/calendar/ea-cal-view-event.c:300
+#: ../a11y/calendar/ea-cal-view-event.c:298
 msgid "calendar view event"
 msgstr "カレンダの表示イベント"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:527
 msgid "Grab Focus"
 msgstr "フォーカスの取得"
 
@@ -152,8 +153,8 @@ msgstr "平日のカレンダ表示"
 msgid "calendar view for one or more days"
 msgstr "一日以上のカレンダ表示"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:704
 msgid "%A %d %b %Y"
 msgstr "%Y年%B%e日 %A"
 
@@ -163,8 +164,8 @@ msgstr "%Y年%B%e日 %A"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:710
+#: ../a11y/calendar/ea-gnome-calendar.c:190
+#: ../calendar/gui/calendar-component.c:707
 #: ../calendar/gui/e-day-view-top-item.c:1315
 #: ../calendar/gui/e-day-view.c:2104
 #: ../calendar/gui/e-week-view-main-item.c:319
@@ -172,23 +173,23 @@ msgstr "%Y年%B%e日 %A"
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:193
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../a11y/calendar/ea-gnome-calendar.c:192
+#: ../a11y/calendar/ea-gnome-calendar.c:197
+#: ../a11y/calendar/ea-gnome-calendar.c:199
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/calendar-component.c:714
+#: ../calendar/gui/calendar-component.c:716
 msgid "%a %d %b %Y"
 msgstr "%Y/%m/%d (%a)"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:217
-#: ../a11y/calendar/ea-gnome-calendar.c:223
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../a11y/calendar/ea-gnome-calendar.c:216
+#: ../a11y/calendar/ea-gnome-calendar.c:222
+#: ../a11y/calendar/ea-gnome-calendar.c:228
+#: ../a11y/calendar/ea-gnome-calendar.c:230
+#: ../calendar/gui/calendar-component.c:728
+#: ../calendar/gui/calendar-component.c:735
+#: ../calendar/gui/calendar-component.c:741
+#: ../calendar/gui/calendar-component.c:743
 msgid "%d %b %Y"
 msgstr "%Y年%B%e日"
 
@@ -197,8 +198,8 @@ msgstr "%Y年%B%e日"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:736
+#: ../a11y/calendar/ea-gnome-calendar.c:220
+#: ../calendar/gui/calendar-component.c:733
 #: ../calendar/gui/e-day-view-top-item.c:1319
 #: ../calendar/gui/e-day-view.c:2120
 #: ../calendar/gui/e-week-view-main-item.c:333
@@ -206,17 +207,17 @@ msgstr "%Y年%B%e日"
 msgid "%d %b"
 msgstr "%B%e日"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "GNOME カレンダ"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "検索バー"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "Evolution カレンダの検索バー"
 
@@ -407,7 +408,7 @@ msgstr "LDAP サーバを使った認証に失敗しました。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 msgid "Failed to delete contact"
 msgstr "連絡先の削除に失敗しました"
 
@@ -530,14 +531,12 @@ msgstr "追加する(_A)"
 msgid "_Discard"
 msgstr "破棄する(_D)"
 
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:37
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0}"
 msgstr "{0}"
 
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "{1}"
 msgstr "{1}"
 
@@ -574,7 +573,7 @@ msgstr "ここで自動補完を設定します"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:269 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "連絡先"
@@ -613,13 +612,13 @@ msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:139
+#: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:477
-#: ../calendar/gui/migration.c:573 ../calendar/gui/migration.c:1081
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "このコンピュータ"
@@ -629,54 +628,54 @@ msgstr "このコンピュータ"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
+#: ../addressbook/gui/component/addressbook-component.c:149
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:487
-#: ../calendar/gui/migration.c:581 ../calendar/gui/migration.c:1089
+#: ../calendar/gui/calendar-component.c:239
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "プライベート"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
+#: ../addressbook/gui/component/addressbook-component.c:159
 #: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:227
 msgid "_Contact"
 msgstr "連絡先(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "新しい連絡先を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:235
 msgid "Contact _List"
 msgstr "連絡先の一覧(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "新しい連絡先一覧を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
+#: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
 msgstr "アドレス帳(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "新しいアドレス帳を作成します"
 
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:407
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "アドレス帳の設定または関連フォルダのアップグレードに失敗しました"
 
@@ -701,13 +700,13 @@ msgstr "オフライン操作用にアドレス帳の内容をローカルへコ
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2051
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "全般"
 
 #: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:570
+#: ../addressbook/gui/widgets/e-addressbook-view.c:562
 #: ../mail/importers/pine-importer.c:392
 msgid "Address Book"
 msgstr "アドレス帳"
@@ -727,7 +726,7 @@ msgid "Details"
 msgstr "詳細"
 
 #: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:854
+#: ../mail/em-folder-browser.c:802
 msgid "Searching"
 msgstr "検索"
 
@@ -741,12 +740,12 @@ msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
 msgid "Migrating..."
 msgstr "移行中..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
@@ -827,12 +826,12 @@ msgstr "新しいアドレス帳(_N)"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:986
-#: ../calendar/gui/calendar-component.c:584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../calendar/gui/calendar-component.c:581
 #: ../calendar/gui/e-calendar-table.c:1302
 #: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
 #: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1126
+#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1125
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -844,7 +843,7 @@ msgid "Save As Vcard..."
 msgstr "vCard 形式で保存..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
+#: ../calendar/gui/calendar-component.c:582
 #: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
@@ -858,12 +857,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "匿名で LDAP サーバにアクセスします"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:501
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
 msgid "Failed to authenticate.\n"
 msgstr "認証に失敗しました。\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:481
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ユーザ %s) のパスワードを入力して下さい"
@@ -1221,7 +1220,7 @@ msgstr "カード"
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
 #: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
+#: ../mail/em-account-editor.c:2022
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1273,7 +1272,7 @@ msgstr "AIM"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: ../addressbook/gui/widgets/e-minicard.c:194
+#: ../addressbook/gui/widgets/e-minicard.c:193
 msgid "Contact"
 msgstr "連絡先"
 
@@ -1349,7 +1348,7 @@ msgstr "誕生日(_B):"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #: ../calendar/gui/dialogs/event-page.c:875
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1707
 msgid "_Calendar:"
 msgstr "カレンダ(_C):"
 
@@ -1457,9 +1456,9 @@ msgstr "住所"
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
-#: ../addressbook/gui/widgets/e-minicard.c:187
+#: ../addressbook/gui/widgets/e-minicard.c:186
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1821 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1841 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3625
 #: ../widgets/text/e-text.c:3626
 msgid "Editable"
@@ -2788,7 +2787,7 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
@@ -2844,18 +2843,18 @@ msgstr ""
 "既にこのフォルダにあります。追加してもよろしいですか？"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:53
 msgid "Any field contains"
 msgstr "項目が次のものを含む"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:177
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
 msgstr "E-メールが次のもので始まる"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:176
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "名前が次のもので始まる"
 
@@ -2872,7 +2871,7 @@ msgstr[1] "連絡先 %d個"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
@@ -2896,90 +2895,90 @@ msgstr "モデル"
 msgid "Error modifying card"
 msgstr "カードの修正中にエラーが発生しました"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:237
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "情報ソース"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:251
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:487
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:6
 msgid "Type"
 msgstr "種類"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:841
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2151
+#: ../addressbook/gui/widgets/e-addressbook-view.c:833
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2083
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "vCard 形式で保存..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 #: ../calendar/gui/e-calendar-table.c:1280
 #: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:958
 msgid "_New Contact..."
 msgstr "新しい連絡先(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "New Contact _List..."
 msgstr "新しい連絡先一覧(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "_Save as VCard..."
 msgstr "vCard 形式で保存(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Forward Contact"
 msgstr "連絡先の転送(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contacts"
 msgstr "複数の連絡先の転送(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "Send _Message to Contact"
 msgstr "連絡先へメッセージの送信(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to List"
 msgstr "一覧へメッセージの送信(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to Contacts"
 msgstr "複数の連絡先へメッセージの送信(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "Cop_y to Address Book..."
 msgstr "アドレス帳へコピー(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Mo_ve to Address Book..."
 msgstr "アドレス帳へ移動(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
-#: ../calendar/gui/calendar-component.c:583
-#: ../calendar/gui/dialogs/comp-editor.c:463
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../calendar/gui/calendar-component.c:580
+#: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1288
 #: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
 #: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3153 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1920
+#: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:1002
+#: ../mail/em-folder-view.c:1111 ../mail/message-list.c:1919
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -2987,23 +2986,23 @@ msgstr "切り取り(_T)"
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:985
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 msgid "P_aste"
 msgstr "貼り付け(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1667
-#: ../calendar/gui/cal-search-bar.c:423
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1602
+#: ../calendar/gui/cal-search-bar.c:357
 msgid "Any Category"
 msgstr "任意のカテゴリ"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1869
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1801
 msgid "Print cards"
 msgstr "カードの印刷"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "その他のエラー"
@@ -3146,7 +3145,7 @@ msgstr "ラジオ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:498
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3184,7 +3183,7 @@ msgid "Web Site"
 msgstr "ウェブ・サイト"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:150
+#: ../addressbook/gui/widgets/e-minicard.c:149
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
 #: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
 #: ../widgets/table/e-table-click-to-add.c:516
@@ -3200,7 +3199,7 @@ msgid "Width"
 msgstr "幅"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:157
+#: ../addressbook/gui/widgets/e-minicard.c:156
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
 #: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
 #: ../widgets/table/e-table-click-to-add.c:523
@@ -3215,7 +3214,7 @@ msgid "Height"
 msgstr "高さ"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:165
+#: ../addressbook/gui/widgets/e-minicard.c:164
 msgid "Has Focus"
 msgstr "フォーカスあり"
 
@@ -3291,23 +3290,23 @@ msgstr ""
 msgid "Adapter"
 msgstr "アダプタ"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
+#: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "仕事用のメール"
 
-#: ../addressbook/gui/widgets/e-minicard.c:103
+#: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "自宅のメール"
 
-#: ../addressbook/gui/widgets/e-minicard.c:104
+#: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Other Email"
 msgstr "その他のメール"
 
-#: ../addressbook/gui/widgets/e-minicard.c:173
+#: ../addressbook/gui/widgets/e-minicard.c:172
 msgid "Selected"
 msgstr "選択済"
 
-#: ../addressbook/gui/widgets/e-minicard.c:180
+#: ../addressbook/gui/widgets/e-minicard.c:179
 msgid "Has Cursor"
 msgstr "カーソルあり"
 
@@ -3316,7 +3315,7 @@ msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く(_O)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2511
+#: ../mail/em-folder-view.c:2496
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
@@ -3367,15 +3366,15 @@ msgstr "ビデオチャット"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:578
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
+#: ../calendar/gui/calendar-component.c:752
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2286
+#: ../calendar/gui/gnome-cal.c:2281
 #: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "カレンダ"
@@ -3607,7 +3606,7 @@ msgid "Error adding list"
 msgstr "一覧を追加する際にエラーが発生しました"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Error adding contact"
 msgstr "連絡先を追加する際にエラーが発生しました"
 
@@ -3624,7 +3623,7 @@ msgid "Error removing list"
 msgstr "一覧を削除する際にエラーが発生しました"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:657
 msgid "Error removing contact"
 msgstr "連絡先を削除する際にエラーが発生しました"
 
@@ -3641,10 +3640,9 @@ msgstr[0] ""
 "本当にこの連絡先を表示してもよろしいですか？"
 msgstr[1] ""
 "%d個の連絡先を %d個の新しいウィンドウで開くことになります。\n"
-"本当にこの連絡先を表示してもよろしいですか？"
+"本当に全ての連絡先を表示してもよろしいですか？"
 
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:323
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3653,64 +3651,64 @@ msgstr ""
 "既に %s があります。\n"
 "上書きしてもよろしいですか？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:327
 msgid "Overwrite"
 msgstr "上書き"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:374
+#: ../addressbook/gui/widgets/eab-gui-util.c:377
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "連絡先"
 msgstr[1] "複数の連絡先"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:425
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Select Address Book"
 msgstr "アドレス帳の選択"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:603
 msgid "list"
 msgstr "一覧"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:765
 msgid "Move contact to"
 msgstr "連絡先の移動先"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:767
 msgid "Copy contact to"
 msgstr "連絡先のコピー先"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Move contacts to"
 msgstr "複数の連絡先の移動先"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:772
 msgid "Copy contacts to"
 msgstr "複数の連絡先のコピー先"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
+#: ../addressbook/gui/widgets/eab-gui-util.c:998
 msgid "Multiple VCards"
 msgstr "複数の vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1001
 #, c-format
 msgid "VCard for %s"
 msgstr "%s の vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1042
+#: ../addressbook/gui/widgets/eab-gui-util.c:1060
 msgid "Contact information"
 msgstr "連絡先の情報"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1062
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s の連絡先の情報"
@@ -4516,12 +4514,12 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "パイロットの ToDo アプリケーション・ブロックを書き込めませんでした"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Calendar and Tasks"
 msgstr "カレンダとタスク"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1358
 msgid "Calendars"
 msgstr "カレンダ"
 
@@ -4563,21 +4561,20 @@ msgstr "メモ(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "メモ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1840
-#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/print.c:1840 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:391
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:601
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "タスク"
@@ -4624,10 +4621,10 @@ msgstr "予定"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1622
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:934
 msgid "Location:"
 msgstr "場所:"
 
@@ -4658,31 +4655,31 @@ msgstr "アラーム停止(_S)"
 msgid "location of appointment"
 msgstr "予定の場所"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1452
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No summary available."
 msgstr "サマリはありません。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1461
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No description available."
 msgstr "説明はありません。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1471
 msgid "No location information available."
 msgstr "場所の情報はありません。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
 #, c-format
 msgid "You have %d alarms"
 msgstr "%d個のアラームがあります"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4694,7 +4691,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1730
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4711,7 +4708,7 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
 msgid "Do not ask me about this program again."
 msgstr "このメッセージを二度と表示しない"
 
@@ -5172,27 +5169,27 @@ msgstr "平日の開始時刻 (分)"
 msgid "daylight savings time"
 msgstr "サマータイム"
 
-#: ../calendar/gui/cal-search-bar.c:54
+#: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "カテゴリが次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "コメントが次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "場所が次のものを含む"
 
-#: ../calendar/gui/cal-search-bar.c:427
+#: ../calendar/gui/cal-search-bar.c:360
 msgid "Unmatched"
 msgstr "該当しないもの"
 
@@ -5229,89 +5226,89 @@ msgstr "日"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:507
-#: ../calendar/gui/migration.c:600 ../calendar/gui/migration.c:1108
+#: ../calendar/gui/calendar-component.c:257
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "ウェブ"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:406
+#: ../calendar/gui/calendar-component.c:275 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "誕生日と記念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:281
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天気"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:579
 msgid "_New Calendar"
 msgstr "新しいカレンダ(_N)"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:896
 msgid "Failed upgrading calendars."
 msgstr "カレンダのアップグレードに失敗しました。"
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1195
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なカレンダ '%s' を開けません"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1211
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議の作成で利用可能なカレンダがありません"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1333
 msgid "Calendar Source Selector"
 msgstr "カレンダの格納場所の選択"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1541
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1542
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1543
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1549
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1550
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1551
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1557
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1558
 msgid "All Day A_ppointment"
 msgstr "終日の予定(_P)"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1559
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1565
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1566
 msgid "Cale_ndar"
 msgstr "カレンダ(_N)"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1567
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
@@ -5347,7 +5344,7 @@ msgstr "カレンダをオープンする権限がありません"
 msgid "Unknown error"
 msgstr "特定できないエラー"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:614
 msgid "Edit Alarm"
 msgstr "アラームの編集"
 
@@ -5547,7 +5544,7 @@ msgid "Display"
 msgstr "表示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "金曜日"
@@ -5563,7 +5560,7 @@ msgstr ""
 "日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
 #: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "月曜日"
@@ -5598,7 +5595,7 @@ msgid "S_un"
 msgstr "日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1089
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "土曜日"
@@ -5616,7 +5613,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
+#: ../calendar/gui/dialogs/recurrence-page.c:1090
 #: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "日曜日"
@@ -5635,7 +5632,7 @@ msgid "Template:"
 msgstr "テンプレート:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1087
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "木曜日"
@@ -5650,13 +5647,13 @@ msgid "Time format:"
 msgstr "時刻の書式:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "火曜日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "水曜日"
@@ -5879,138 +5876,138 @@ msgstr " (期日 "
 msgid "Due "
 msgstr "期日 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2889
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
 #, c-format
 msgid "Attached message - %s"
 msgstr "添付されたメッセージ - %s"
 
 #. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2894
-#: ../composer/e-msg-composer.c:3090
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
+#: ../composer/e-msg-composer.c:3089
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "添付メッセージ"
 msgstr[1] "%d通の添付メッセージ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3154
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
 #: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1921
+#: ../mail/em-folder-view.c:1007 ../mail/message-list.c:1920
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3156
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
+#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1922
 msgid "Cancel _Drag"
 msgstr "ドラッグのキャンセル(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2502
+#: ../calendar/gui/dialogs/comp-editor.c:948 ../composer/e-msg-composer.c:2501
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "添付ファイル: <b>%d</b>個"
 msgstr[1] "添付ファイル: <b>%d</b>個"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Hide Attachment _Bar"
 msgstr "添付ファイル・バーを隠す(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1486
+#: ../calendar/gui/dialogs/comp-editor.c:983
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 msgid "Show Attachment _Bar"
 msgstr "添付ファイル・バーを表示する(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/comp-editor.c:1102
 #: ../calendar/gui/dialogs/event-page.c:1896
 #: ../calendar/gui/dialogs/task-page.c:1199
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3652
+#: ../composer/e-msg-composer.c:3651
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
 #: ../widgets/table/e-table-config.glade.h:18
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3653 ../mail/em-folder-tree.c:2081
+#: ../composer/e-msg-composer.c:3652 ../mail/em-folder-tree.c:2081
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1105
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3655
+#: ../composer/e-msg-composer.c:3654
 msgid "_Add attachment..."
 msgstr "添付ファイルの追加(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1510
-#: ../mail/em-format-html-display.c:2267
+#: ../calendar/gui/dialogs/comp-editor.c:1492
+#: ../mail/em-format-html-display.c:2266
 msgid "Show Attachments"
 msgstr "添付ファイルの表示"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1511
+#: ../calendar/gui/dialogs/comp-editor.c:1493
 msgid "Press space key to toggle attachment bar"
 msgstr "[SPACE] キーを押すと添付ファイル・バーの表示が切り替わります"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2118
-#: ../calendar/gui/dialogs/comp-editor.c:2161
+#: ../calendar/gui/dialogs/comp-editor.c:2100
+#: ../calendar/gui/dialogs/comp-editor.c:2143
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2124
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2106
+#: ../calendar/gui/dialogs/comp-editor.c:2149
 #, c-format
 msgid "Meeting - %s"
 msgstr "会議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2126
-#: ../calendar/gui/dialogs/comp-editor.c:2169
+#: ../calendar/gui/dialogs/comp-editor.c:2108
+#: ../calendar/gui/dialogs/comp-editor.c:2151
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2130
-#: ../calendar/gui/dialogs/comp-editor.c:2173
+#: ../calendar/gui/dialogs/comp-editor.c:2112
+#: ../calendar/gui/dialogs/comp-editor.c:2155
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "タスクの割当て - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2132
-#: ../calendar/gui/dialogs/comp-editor.c:2175
+#: ../calendar/gui/dialogs/comp-editor.c:2114
+#: ../calendar/gui/dialogs/comp-editor.c:2157
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2135
-#: ../calendar/gui/dialogs/comp-editor.c:2178
+#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2160
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ジャーナル・エントリ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2146
-#: ../calendar/gui/dialogs/comp-editor.c:2188
+#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2170
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2733
+#: ../calendar/gui/dialogs/comp-editor.c:2715
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:350
+#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:365
 msgid "attachment"
 msgstr "添付"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2822
-#: ../calendar/gui/dialogs/comp-editor.c:2876
-#: ../calendar/gui/dialogs/comp-editor.c:2900
+#: ../calendar/gui/dialogs/comp-editor.c:2804
+#: ../calendar/gui/dialogs/comp-editor.c:2858
+#: ../calendar/gui/dialogs/comp-editor.c:2882
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
+#: ../calendar/gui/dialogs/comp-editor.c:2906
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
@@ -6130,7 +6127,7 @@ msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
 #: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
+#: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:849
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
@@ -6148,13 +6145,13 @@ msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
 #: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:720
+#: ../calendar/gui/dialogs/memo-page.c:718
 #: ../calendar/gui/dialogs/task-page.c:906
 msgid "The organizer selected no longer has an account."
 msgstr "指定した主催者のアカウントがありません。"
 
 #: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/memo-page.c:724
 #: ../calendar/gui/dialogs/task-page.c:912
 msgid "An organizer is required."
 msgstr "主催者が必要です。"
@@ -6174,43 +6171,43 @@ msgstr "追加(_A) "
 msgid "Unable to open the calendar '%s'."
 msgstr "カレンダ '%s' を開けません。"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "予定の %d日前"
 msgstr[1] "予定の %d日前"
 
-#: ../calendar/gui/dialogs/event-page.c:2934
+#: ../calendar/gui/dialogs/event-page.c:2935
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "予定の %d時間前"
 msgstr[1] "予定の %d時間前"
 
-#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
-msgid "%d minute before appointment"
+msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "予定の %d分前"
 msgstr[1] "予定の %d分前"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:2959
 msgid "Customize"
 msgstr "その他"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2958
+#: ../calendar/gui/dialogs/event-page.c:2964
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2294
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2293
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
+#: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1739
+#: ../plugins/itip-formatter/itip-formatter.c:1735
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
 #: ../widgets/misc/e-dateedit.c:1721
 msgid "None"
@@ -6314,14 +6311,14 @@ msgstr "メンバー"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:510
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "返信の有無"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:521
+#: ../calendar/gui/e-meeting-list-view.c:520
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:16
 msgid "Status"
@@ -6352,12 +6349,12 @@ msgstr "主催者:"
 msgid "Memo"
 msgstr "メモ"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "'%s' のメモを開けません。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1489
+#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1489
 #: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
 msgid "To"
@@ -6540,44 +6537,22 @@ msgstr "11日〜20日"
 msgid "21st to 31st"
 msgstr "21日〜31日"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "day"
 msgstr "日"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "on the"
 msgstr "の"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1415
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "くりかえす"
 
-# FIXME: [Add Exception] というボタンのラベルがあるらしいが、まだ未確認。
-#: ../calendar/gui/dialogs/recurrence-page.c:2155
-#, fuzzy
-msgid "Add exception"
-msgstr "説明"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2198
-msgid "Could not get a selection to modify."
-msgstr "変更するための選択領域を取得できませんでした。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2204
-#, fuzzy
-msgid "Modify exception"
-msgstr "暗号化しない"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2250
-msgid "Could not get a selection to delete."
-msgstr "削除するための選択領域を取得できませんでした。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2381
+#: ../calendar/gui/dialogs/recurrence-page.c:2378
 msgid "Date/Time"
 msgstr "日付/時刻"
 
@@ -6628,12 +6603,12 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "ウェブ・ページ"
 
@@ -6651,7 +6626,7 @@ msgstr "<span weight=\"bold\">状態</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:891
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/print.c:2382 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6659,7 +6634,7 @@ msgstr "完了"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1032
+#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
 msgid "High"
 msgstr "高い"
 
@@ -6674,14 +6649,14 @@ msgstr "進行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1030
+#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
 msgid "Low"
 msgstr "低い"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
 #: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1030
 msgid "Normal"
 msgstr "普通"
 
@@ -6877,7 +6852,7 @@ msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2879
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2861
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
@@ -6895,7 +6870,7 @@ msgstr "開始日:"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:217
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1191
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:4
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
@@ -6908,7 +6883,7 @@ msgid "Web Page:"
 msgstr "ウェブ・ページ:"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "サマリ:"
@@ -6920,9 +6895,9 @@ msgstr "期日:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.c:1127
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:959
 msgid "Status:"
 msgstr "ステータス:"
 
@@ -7000,15 +6975,15 @@ msgstr "いいえ"
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1144 ../calendar/gui/e-itip-control.c:1285
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1330
+#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1764
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:705
+#: ../widgets/misc/e-attachment-bar.c:720
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "不明"
@@ -7025,7 +7000,7 @@ msgstr "割当て済み"
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2113
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2112
 msgid "Select folder to save selected attachments..."
 msgstr "選択した添付ファイルを保存するフォルダの選択..."
 
@@ -7036,7 +7011,7 @@ msgstr "untitled_image.%s"
 
 #: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
 #: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../mail/em-folder-view.c:1121 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
@@ -7049,7 +7024,7 @@ msgstr "壁紙にセットする(_B)"
 msgid "_Save Selected"
 msgstr "選択したものの保存(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "\"%s\" で開く..."
@@ -7110,7 +7085,7 @@ msgstr "オブジェクトの更新"
 
 #: ../calendar/gui/e-calendar-table.c:1106
 #: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1349
+#: ../composer/e-msg-composer.c:1348
 msgid "Save as..."
 msgstr "別名で保存..."
 
@@ -7126,7 +7101,7 @@ msgstr "ウェブ・ページを開く(_W)"
 #: ../calendar/gui/e-calendar-table.c:1283
 #: ../calendar/gui/e-calendar-view.c:1684
 #: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1122
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
@@ -7189,7 +7164,7 @@ msgstr "<ここをクリックしてタスクを追加して下さい>"
 msgid "% Complete"
 msgstr "完了 (%)"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:652
 msgid "Complete"
 msgstr "完了しました"
 
@@ -7271,7 +7246,7 @@ msgstr "iCalender 形式で転送(_F)..."
 msgid "_Reply"
 msgstr "返信(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1117
+#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1116
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
@@ -7372,133 +7347,101 @@ msgstr "午後"
 msgid "Yes. (Complex Recurrence)"
 msgstr "はい (複合的な繰り返し)"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. day/days", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d day/days"
-#. For Translators : 'Every day' is event Recurring every day
-#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "毎日"
 msgstr[1] "%d日間毎"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. week/weeks", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d week/weeks"
-#. For Translators : 'Every week' is event Recurring every week
-#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "毎週"
 msgstr[1] "%d週間毎"
 
-#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
-#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "次の毎週 "
 msgstr[1] "次の %d週間毎 "
 
-#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " と "
 
-#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
 msgstr "次の %s 日 "
 
-#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
-#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
 msgstr "次の %s %s "
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. month/months", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d month/months"
-#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
-#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
-#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:812
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "毎月"
 msgstr[1] "%dヶ月毎"
 
-#. For Translators: In this can also be translated as "With the period of %d
-#. year/years", where %d is a number. The entire sentence is of the form "Recurring:
-#. Every %d year/years"
-#. For Translators : 'Every year' is event Recurring every year
-#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "毎年"
 msgstr[1] "%d年毎"
 
-#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
-#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:827
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d回の合計"
 msgstr[1] " %d回の合計"
 
-#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
 msgstr ", 次の終わり "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "ステータス"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
 msgstr "終了"
 
-#: ../calendar/gui/e-itip-control.c:936
+#: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "期日"
 
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "iCalendar 情報"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "iCalendar エラー"
 
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
+#: ../plugins/itip-formatter/itip-view.c:340
+#: ../plugins/itip-formatter/itip-view.c:341
+#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:477
 msgid "An unknown person"
 msgstr "身元不明な人"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1084
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7506,290 +7449,290 @@ msgstr ""
 "<br> 次の情報を再表示して下さい。それから下にあるメニューから行動を選択して下"
 "さい。"
 
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/itip-utils.c:685
-#: ../plugins/itip-formatter/itip-formatter.c:1752
+#: ../plugins/itip-formatter/itip-formatter.c:1748
 msgid "Accepted"
 msgstr "受諾済"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:688
-#: ../plugins/itip-formatter/itip-formatter.c:1755
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:1751
 msgid "Tentatively Accepted"
 msgstr "仮承認済"
 
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:720
-#: ../plugins/itip-formatter/itip-formatter.c:1758
+#: ../plugins/itip-formatter/itip-formatter.c:1754
 msgid "Declined"
 msgstr "辞退済"
 
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1224
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
 "会議がキャンセルされましたが、お使いのカレンダの中に見つかりませんでした"
 
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1226
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "タスクがキャンセルされましたが、お使いのタスク一覧の中に見つかりませんでした"
 
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1305
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> さんが会議の情報を公開しました。"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "会議の情報"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1312
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> さんが %s の会議への出席を要求してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1314
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> さんが貴方の会議への出席を要求してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "会議の提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> さんは既存の会議への参加を希望しています。"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "会議の更新"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> さんは会議の最新情報を希望しています。"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update Request"
 msgstr "会議の更新要求"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> さんが会議開催要求に対して返信してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "会議への返信"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1342
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> さんが会議をキャンセルしました。"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1343
 msgid "Meeting Cancelation"
 msgstr "会議のキャンセル"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> さんが意味不明なメッセージを送信してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "おかしな会議メッセージ"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> さんがタスク情報を公開しました。"
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "タスク情報"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> さんが %s のタスクを実行に移すよう要求してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> さんがタスクを実行に移すよう要求してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
 msgstr "タスクの提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています。"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Update"
 msgstr "タスクの更新"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> さんはタスクの最新情報を希望しています。"
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update Request"
 msgstr "タスクの更新要求"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1411
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> さんはタスクの割り当てに対して返信してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "タスクへの返信"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1419
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> さんがタスクをキャンセルしました。"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1420
 msgid "Task Cancelation"
 msgstr "タスクの取り消し"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "おかしなタスクメッセージ"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> さんが予定を公開しました。"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "Free/Busy の情報"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> さんが予定を要求してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "Free/Busy の要求"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "予定の有無の要求に対して <b>%s</s> さんが返信してきました。"
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "Free/Busy の返信"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "Free/Busy のメッセージが間違っています"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
 msgstr "メッセージが正しい形式になっていません"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
 msgstr "メッセージの中に未サポートの要求だけあります。"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
 msgstr "添付ファイルに含まれているカレンダ・メッセージは正しくありません"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
 msgstr "添付ファイルには表示可能なカレンダ情報がありません"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "更新が完了しました\n"
 
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1932
 msgid "Object is invalid and cannot be updated\n"
 msgstr "オブジェクトが不正なので更新できません\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: ../calendar/gui/e-itip-control.c:1986
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "不正なステータスのため出席状況が更新できませんでした！\n"
 
-#: ../calendar/gui/e-itip-control.c:2003
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: ../calendar/gui/e-itip-control.c:2006
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\n"
 
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr "そのアイテムは送信できませんでした！\n"
 
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "アクションの選択:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2202
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2230
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "受諾"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "仮承認"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "辞退"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "Free/Busy 情報の送信"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update respondent status"
 msgstr "応答者ステータスの更新"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "最新情報の送信"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:708
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
+#: ../mail/mail-send-recv.c:447 ../mail/mail-send-recv.c:500
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "キャンセル"
@@ -7894,12 +7837,12 @@ msgstr "仮承認"
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 #: ../calendar/gui/itip-utils.c:694
-#: ../plugins/itip-formatter/itip-formatter.c:1761
+#: ../plugins/itip-formatter/itip-formatter.c:1757
 msgid "Delegated"
 msgstr "委任済"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:471
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "出席者                          "
 
@@ -8006,7 +7949,7 @@ msgid "Memo sort"
 msgstr "メモの並び替え"
 
 #: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2748
+#: ../calendar/gui/gnome-cal.c:2743
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8066,39 +8009,39 @@ msgstr "%B%e日"
 msgid "Updating query"
 msgstr "クエリの更新中"
 
-#: ../calendar/gui/gnome-cal.c:2409
+#: ../calendar/gui/gnome-cal.c:2404
 msgid "_Custom View"
 msgstr "カスタム表示(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2410
+#: ../calendar/gui/gnome-cal.c:2405
 msgid "_Save Custom View"
 msgstr "カスタム表示の保存(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2415
+#: ../calendar/gui/gnome-cal.c:2410
 msgid "_Define Views..."
 msgstr "ビューの定義(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2579
+#: ../calendar/gui/gnome-cal.c:2574
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s にある予定の読み込んでいます"
 
-#: ../calendar/gui/gnome-cal.c:2598
+#: ../calendar/gui/gnome-cal.c:2593
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s にあるタスクを読み込んでいます"
 
-#: ../calendar/gui/gnome-cal.c:2607
+#: ../calendar/gui/gnome-cal.c:2602
 #, c-format
 msgid "Loading memos at %s"
 msgstr "%s にメモを読み込んでいます"
 
-#: ../calendar/gui/gnome-cal.c:2713
+#: ../calendar/gui/gnome-cal.c:2708
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開きます"
 
-#: ../calendar/gui/gnome-cal.c:3641
+#: ../calendar/gui/gnome-cal.c:3636
 msgid "Purging"
 msgstr "抹消中"
 
@@ -8224,7 +8167,7 @@ msgstr[0] "%d 個のメモ"
 msgstr[1] "%d 個のメモ"
 
 #: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
-#: ../mail/mail-component.c:563
+#: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8235,52 +8178,52 @@ msgstr[1] ", 選択済 %d個"
 msgid "Failed upgrading memos."
 msgstr "メモの移行に失敗しました。"
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:872
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なメモの一覧 '%s' を開けません"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:885
 msgid "There is no calendar available for creating memos"
 msgstr "メモを作成できるカレンダがありません"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:981
 msgid "Memo Source Selector"
 msgstr "メモの格納場所の選択"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1164
 msgid "New memo"
 msgstr "新しいメモ"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1165
 msgid "Mem_o"
 msgstr "メモ(_O)"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1166
 msgid "Create a new memo"
 msgstr "新しいメモを作成します"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1172
 msgid "New shared memo"
 msgstr "新しい共有メモ"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1173
 msgid "_Shared memo"
 msgstr "共有メモ(_S)"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1174
 msgid "Create a shared new memo"
 msgstr "新しい共有メモを作成する"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1180
 msgid "New memo list"
 msgstr "新しいメモの一覧"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1181
 msgid "Memo li_st"
 msgstr "メモの一覧(_S)"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1182
 msgid "Create a new memo list"
 msgstr "新しいメモの一覧を作成します"
 
@@ -8288,7 +8231,7 @@ msgstr "新しいメモの一覧を作成します"
 msgid "Print Memos"
 msgstr "メモの印刷"
 
-#: ../calendar/gui/migration.c:164
+#: ../calendar/gui/migration.c:162
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8300,7 +8243,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: ../calendar/gui/migration.c:168
+#: ../calendar/gui/migration.c:166
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8313,29 +8256,22 @@ msgstr ""
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:771 ../calendar/gui/migration.c:939
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "${HOME}/evolution/config.xmldb から古い設定を移行できません"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:800
+#: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "カレンダ '%s' を移行できません"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:968
+#: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "タスク '%s' を移行できません"
 
-#: ../calendar/gui/migration.c:1212
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:392
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:423
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:602
-msgid "Notes"
-msgstr "ノート"
-
 #: ../calendar/gui/print.c:574
 msgid "1st"
 msgstr "1日"
@@ -10227,22 +10163,25 @@ msgid "Pacific/Yap"
 msgstr "太平洋/ヤップ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 #: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 #: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1012
+#: ../widgets/misc/e-attachment-bar.c:1024
 msgid "Attachment Bar"
 msgstr "添付ファイル・バー"
 
@@ -10366,14 +10305,14 @@ msgstr "添付する(_T)"
 msgid "Insert Attachment"
 msgstr "添付ファイルの挿入"
 
-#: ../composer/e-msg-composer.c:828
+#: ../composer/e-msg-composer.c:827
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
 "トされていません"
 
-#: ../composer/e-msg-composer.c:835
+#: ../composer/e-msg-composer.c:834
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10381,52 +10320,52 @@ msgstr ""
 "送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
 "書がセットされていません"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2531
+#: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
 msgid "Hide _Attachment Bar"
 msgstr "添付ファイル・バーを隠す(_A)"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2534
-#: ../composer/e-msg-composer.c:3898
+#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
+#: ../composer/e-msg-composer.c:3897
 msgid "Show _Attachment Bar"
 msgstr "添付ファイル・バーを表示する(_A)"
 
-#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
+#: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../composer/e-msg-composer.c:1402
+#: ../composer/e-msg-composer.c:1401
 msgid "Could not open file"
 msgstr "ファイルを開けませんでした"
 
-#: ../composer/e-msg-composer.c:1410
+#: ../composer/e-msg-composer.c:1409
 msgid "Unable to retrieve message from editor"
 msgstr "エディタからメッセージを取得できません"
 
-#: ../composer/e-msg-composer.c:1689
+#: ../composer/e-msg-composer.c:1688
 msgid "Untitled Message"
 msgstr "タイトルなしのメッセージ"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1724
+#: ../composer/e-msg-composer.c:1723
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: ../composer/e-msg-composer.c:2174 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2173 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "自動生成"
 
-#: ../composer/e-msg-composer.c:2277
+#: ../composer/e-msg-composer.c:2276
 msgid "Si_gnature:"
 msgstr "署名(_G):"
 
-#: ../composer/e-msg-composer.c:2545 ../composer/e-msg-composer.c:3780
-#: ../composer/e-msg-composer.c:3783
+#: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
+#: ../composer/e-msg-composer.c:3782
 msgid "Compose Message"
 msgstr "メッセージの作成"
 
-#: ../composer/e-msg-composer.c:5007
+#: ../composer/e-msg-composer.c:5006
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10576,7 +10515,7 @@ msgstr "メッセージの保存(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
+#: ../shell/main.c:522
 msgid "Evolution"
 msgstr "Evolution-2.6"
 
@@ -10826,7 +10765,7 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "比較するもう一つの時間の選択"
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
 msgid "Choose a file"
 msgstr "ファイルの選択"
 
@@ -11063,11 +11002,11 @@ msgstr "Evolution メール作成ウィンドウの設定コントロール"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution メール設定コントロール"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:524
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:581
-#: ../mail/mail-component.c:582 ../mail/mail-component.c:723
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:701
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "メール"
@@ -11113,46 +11052,46 @@ msgstr "フォルダの選択"
 msgid "Ask for each message"
 msgstr "送信する度に確認する"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "個人情報"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: ../mail/em-account-editor.c:2046
+#: ../mail/em-account-editor.c:2014
 msgid "Automatically check for _new mail every"
 msgstr "新着メールを自動的にチェックする(_N)"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "デフォルト"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2320 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "セキュリティ"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Receiving Options"
 msgstr "返信オプション"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
+#: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
 msgid "Checking for New Mail"
 msgstr "新着メールのチェック"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "アカウント・エディタ"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:79
+#: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウント・アシスタント"
 
@@ -11492,54 +11431,46 @@ msgstr "ステータスを外す"
 msgid "<b>Then</b>"
 msgstr "<b>アクション</b> "
 
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:162
 msgid "C_reate Search Folder From Search..."
 msgstr "検索結果から仮想フォルダの作成(_R)..."
 
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:184
 msgid "All Messages"
 msgstr "全てのメッセージ"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:185
 msgid "Unread Messages"
 msgstr "未読のメッセージ"
 
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:187
 msgid "No Label"
 msgstr "ラベルなし"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:194
 msgid "Read Messages"
 msgstr "メッセージを読む"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:195
 msgid "Recent Messages"
 msgstr "最近のメッセージ"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:196
 msgid "Last 5 Days' Messages"
 msgstr "最近五日間のメッセージ"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:197
 msgid "Messages with Attachments"
 msgstr "添付ファイルを含むメッセージ"
 
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:198
 msgid "Important Messages"
 msgstr "重要なメッセージ"
 
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:199
 msgid "Messages Not Junk"
 msgstr "ジャンクではないメッセージ"
 
-#: ../mail/em-folder-browser.c:1030
-msgid "Account Search"
-msgstr "アカウントの検索"
-
-#: ../mail/em-folder-browser.c:1074
-msgid "All Account Search"
-msgstr "すべてのアカウントの検索"
-
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:150
@@ -11583,21 +11514,21 @@ msgstr "仮想フォルダ"
 msgid "UNMATCHED"
 msgstr "該当しないもの"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
 msgid "Drafts"
 msgstr "草案"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
 #: ../plugins/exchange-operations/exchange-folder.c:587
 msgid "Inbox"
 msgstr "受信箱"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "送信トレイ"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
 msgid "Sent"
 msgstr "送信済み"
 
@@ -11639,12 +11570,12 @@ msgstr "フォルダ %s の移動中"
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1825
+#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1824
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1826
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
@@ -11704,14 +11635,14 @@ msgstr "ゴミ箱を空にする(_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "'%s' を '%s' へコピー中"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1008
-#: ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1007
+#: ../mail/em-folder-view.c:1022
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1023
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1022
 msgid "C_opy"
 msgstr "コピー(_O)"
 
@@ -11733,185 +11664,185 @@ msgstr "フォルダの作成"
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
 
-#: ../mail/em-folder-view.c:1116 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1115 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: ../mail/em-folder-view.c:1118 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1117 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: ../mail/em-folder-view.c:1121 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1120 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: ../mail/em-folder-view.c:1127
+#: ../mail/em-folder-view.c:1126
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1127
 msgid "_Move to Folder..."
 msgstr "フォルダへ移動(_M)..."
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1128
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: ../mail/em-folder-view.c:1132
+#: ../mail/em-folder-view.c:1131
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: ../mail/em-folder-view.c:1133
+#: ../mail/em-folder-view.c:1132
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: ../mail/em-folder-view.c:1134
+#: ../mail/em-folder-view.c:1133
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: ../mail/em-folder-view.c:1135
+#: ../mail/em-folder-view.c:1134
 msgid "Mark as Un_important"
 msgstr "重要でないものとしてマーク(_I)"
 
-#: ../mail/em-folder-view.c:1136
+#: ../mail/em-folder-view.c:1135
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: ../mail/em-folder-view.c:1137
+#: ../mail/em-folder-view.c:1136
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: ../mail/em-folder-view.c:1138
+#: ../mail/em-folder-view.c:1137
 msgid "Mark for Follo_w Up..."
 msgstr "フォロー・アップとしてマーク(_W)"
 
-#: ../mail/em-folder-view.c:1140
+#: ../mail/em-folder-view.c:1139
 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:1141 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1140 ../widgets/misc/e-dateedit.c:475
 msgid "_None"
 msgstr "なし(_N)"
 
-#: ../mail/em-folder-view.c:1146
+#: ../mail/em-folder-view.c:1145
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: ../mail/em-folder-view.c:1147
+#: ../mail/em-folder-view.c:1146
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1149
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1150
 msgid "Search Folder from _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: ../mail/em-folder-view.c:1152
+#: ../mail/em-folder-view.c:1151
 msgid "Search Folder from Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: ../mail/em-folder-view.c:1153
+#: ../mail/em-folder-view.c:1152
 msgid "Search Folder from _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1153
 msgid "Search Folder from Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1157
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1158
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1159
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1160
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2012 ../mail/em-folder-view.c:2056
+#: ../mail/em-folder-view.c:2001 ../mail/em-folder-view.c:2045
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../mail/em-folder-view.c:2155
+#: ../mail/em-folder-view.c:2144
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: ../mail/em-folder-view.c:2315
+#: ../mail/em-folder-view.c:2300
 msgid "Unable to retrieve message"
 msgstr "メッセージを取得できません"
 
-#: ../mail/em-folder-view.c:2513
+#: ../mail/em-folder-view.c:2498
 msgid "Create _Search Folder"
 msgstr "仮想フォルダの作成(_S)"
 
-#: ../mail/em-folder-view.c:2514
+#: ../mail/em-folder-view.c:2499
 msgid "_From this Address"
 msgstr "この宛先から(_F)"
 
-#: ../mail/em-folder-view.c:2515
+#: ../mail/em-folder-view.c:2500
 msgid "_To this Address"
 msgstr "この宛先へ(_T)"
 
-#: ../mail/em-folder-view.c:2872
+#: ../mail/em-folder-view.c:2854
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s へのメッセージを作成します"
 
-#: ../mail/em-folder-view.c:2877
+#: ../mail/em-folder-view.c:2859
 msgid "Click to hide/unhide addresses"
 msgstr "クリックしてアドレスを表示/隠す"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:504
+#: ../mail/em-format-html-display.c:503
 #, c-format
 msgid "Matches: %d"
 msgstr "検索結果: %d個"
 
-#: ../mail/em-format-html-display.c:647
+#: ../mail/em-format-html-display.c:646
 msgid "Fi_nd:"
 msgstr "検索(_N):"
 
 # メール本文内の検索: 次の検索結果へ.
-#: ../mail/em-format-html-display.c:675
+#: ../mail/em-format-html-display.c:674
 msgid "Fo_rward"
 msgstr "次へ(_R)"
 
 # メール本文内の検索: 検索時に case-sensitive にするかどうか
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:679
 msgid "M_atch case"
 msgstr "大文字と小文字を区別する(_A)"
 
-#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
 msgid "Unsigned"
 msgstr "署名なし"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:926
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
 msgid "Valid signature"
 msgstr "妥当な署名"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:927
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11919,21 +11850,21 @@ msgstr ""
 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
 "のであることを意味します。"
 
-#: ../mail/em-format-html-display.c:929 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:620
 msgid "Invalid signature"
 msgstr "不正な署名"
 
-#: ../mail/em-format-html-display.c:929
+#: ../mail/em-format-html-display.c:928
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:929
 msgid "Valid signature, cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: ../mail/em-format-html-display.c:930
+#: ../mail/em-format-html-display.c:929
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11941,11 +11872,11 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
 msgid "Unencrypted"
 msgstr "暗号化なし"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:935
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11953,11 +11884,11 @@ msgstr ""
 "このメッセージは暗号化されていません。その内容がインターネットを介して閲覧さ"
 "れる可能性があります。"
 
-#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
 msgid "Encrypted, weak"
 msgstr "暗号化済み (レベルは不十分)"
 
-#: ../mail/em-format-html-display.c:937
+#: ../mail/em-format-html-display.c:936
 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 "
@@ -11967,11 +11898,11 @@ msgstr ""
 "です。(現実的には困難ですが)、このメッセージの内容を部外者が閲覧する可能性が"
 "あります。"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
 msgid "Encrypted"
 msgstr "暗号化済み"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:937
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11979,11 +11910,11 @@ msgstr ""
 "このメッセージは暗号化されています。このメッセージの内容を部外者が閲覧するこ"
 "とは困難と思われます。"
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:630
 msgid "Encrypted, strong"
 msgstr "暗号化済み (レベルは強力)"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:938
 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 "
@@ -11992,72 +11923,72 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。このメッセージの内容"
 "を部外者が閲覧することは非常に困難と思われます。"
 
-#: ../mail/em-format-html-display.c:1040 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1039 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: ../mail/em-format-html-display.c:1055
+#: ../mail/em-format-html-display.c:1054
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: ../mail/em-format-html-display.c:1374
+#: ../mail/em-format-html-display.c:1373
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p%l:%M に完了"
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1381
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1384
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p%l:%M まで"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1444
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: ../mail/em-format-html-display.c:1446
+#: ../mail/em-format-html-display.c:1445
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: ../mail/em-format-html-display.c:1447
+#: ../mail/em-format-html-display.c:1446
 msgid "_Fit to Width"
 msgstr "幅を合わせる(_F)"
 
-#: ../mail/em-format-html-display.c:1448
+#: ../mail/em-format-html-display.c:1447
 msgid "Show _Original Size"
 msgstr "通常のサイズ(_O)"
 
-#: ../mail/em-format-html-display.c:1867 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1866 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ファイルの添付"
 
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:2073
 msgid "Select folder to save all attachments..."
 msgstr "添付ファイルを全て保存するフォルダの選択..."
 
-#: ../mail/em-format-html-display.c:2121
+#: ../mail/em-format-html-display.c:2120
 msgid "_Save Selected..."
 msgstr "選択範囲の保存(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2188
+#: ../mail/em-format-html-display.c:2187
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 個の添付ファイル(_T)"
 msgstr[1] "%d 個の添付ファイル(_T)"
 
-#: ../mail/em-format-html-display.c:2195 ../mail/em-format-html-display.c:2273
+#: ../mail/em-format-html-display.c:2194 ../mail/em-format-html-display.c:2272
 msgid "S_ave"
 msgstr "保存する(_A)"
 
-#: ../mail/em-format-html-display.c:2206
+#: ../mail/em-format-html-display.c:2205
 msgid "S_ave All"
 msgstr "全て保存する(_A)"
 
-#: ../mail/em-format-html-display.c:2269
+#: ../mail/em-format-html-display.c:2268
 msgid "No Attachment"
 msgstr "添付ファイルなし"
 
@@ -13048,80 +12979,80 @@ msgstr "メーリング・リストが %s のメール"
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:521
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "削除済 %d通"
 msgstr[1] "削除済 %d通"
 
-#: ../mail/mail-component.c:526
+#: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "ジャンク %d通"
 msgstr[1] "ジャンク %d通"
 
-#: ../mail/mail-component.c:549
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "草案 %d通"
 msgstr[1] "草案 %d通"
 
-#: ../mail/mail-component.c:551
+#: ../mail/mail-component.c:548
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "送信済 %d通"
 msgstr[1] "送信済 %d通"
 
-#: ../mail/mail-component.c:553
+#: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "未送信 %d通"
 msgstr[1] "未送信 %d通"
 
-#: ../mail/mail-component.c:557
+#: ../mail/mail-component.c:554
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "合計 %d通"
 msgstr[1] "合計 %d通"
 
-#: ../mail/mail-component.c:559
+#: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", 未読 %d通"
 msgstr[1] ", 未読 %d通"
 
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:819
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:820
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: ../mail/mail-component.c:843
+#: ../mail/mail-component.c:821
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:827
 msgid "New Mail Folder"
 msgstr "新しいメール・フォルダ"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:828
 msgid "Mail _Folder"
 msgstr "メールのフォルダ(_F)"
 
-#: ../mail/mail-component.c:851
+#: ../mail/mail-component.c:829
 msgid "Create a new mail folder"
 msgstr "新しいメール・フォルダを作成します"
 
-#: ../mail/mail-component.c:995
+#: ../mail/mail-component.c:973
 msgid "Failed upgrading Mail settings or folders."
 msgstr "メールの設定または関連フォルダのアップグレードに失敗しました。"
 
@@ -13905,7 +13836,7 @@ msgstr "メッセージ %d / %d 通を送信中"
 msgid "Failed to send %d of %d messages"
 msgstr "メッセージ %d / %d の送信に失敗しました"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:648
 msgid "Canceled."
 msgstr "キャンセルしました"
 
@@ -14042,23 +13973,23 @@ msgstr "サービスの確認"
 msgid "Canceling..."
 msgstr "キャンセル中..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:345
 msgid "Send & Receive Mail"
 msgstr "メールの送信/受信"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:352
 msgid "Cancel _All"
 msgstr "全てキャンセル(_A)"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:449
 msgid "Updating..."
 msgstr "更新中..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:449 ../mail/mail-send-recv.c:502
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:734
 msgid "Checking for new mail"
 msgstr "新着メールのチェック中"
 
@@ -14724,74 +14655,74 @@ msgstr "抹消する(_E)"
 msgid "_Open Messages"
 msgstr "メッセージを開く(_O)"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1019
 msgid "Unseen"
 msgstr "未読"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1020
 msgid "Seen"
 msgstr "既読"
 
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1021
 msgid "Answered"
 msgstr "返答済み"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1022
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1023
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: ../mail/message-list.c:1028
+#: ../mail/message-list.c:1027
 msgid "Lowest"
 msgstr "最も低い"
 
-#: ../mail/message-list.c:1029
+#: ../mail/message-list.c:1028
 msgid "Lower"
 msgstr "低い"
 
-#: ../mail/message-list.c:1033
+#: ../mail/message-list.c:1032
 msgid "Higher"
 msgstr "高い"
 
-#: ../mail/message-list.c:1034
+#: ../mail/message-list.c:1033
 msgid "Highest"
 msgstr "最も高い"
 
-#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1466 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1474 ../plugins/itip-formatter/itip-view.c:202
+#: ../mail/message-list.c:1473 ../plugins/itip-formatter/itip-view.c:200
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "今日の%p%l:%M"
 
-#: ../mail/message-list.c:1483 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1482 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の%p%l:%M"
 
-#: ../mail/message-list.c:1495 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1494 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%p%l:%M (%a)"
 
-#: ../mail/message-list.c:1503 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1502 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%B%e日 %p%l:%M"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1504 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y年%B%e日"
 
-#: ../mail/message-list.c:2261 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2259 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "メッセージ"
 
-#: ../mail/message-list.c:3652
+#: ../mail/message-list.c:3647
 msgid "Generating message list"
 msgstr "メッセージ一覧の作成中"
 
@@ -15911,7 +15842,13 @@ msgstr "フォルダの購読停止"
 msgid "_Unsubscribe"
 msgstr "購読の停止(_U)"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:422
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+msgid "Notes"
+msgstr "ノート"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
 msgid "Checklist"
 msgstr "チェックリスト"
 
@@ -16213,102 +16150,102 @@ msgstr ""
 "データを出力する Evolution カレンダ/ToDo の一覧をオープンできませんでした。"
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:391
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "カレンダ '%s' を開けません"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:411
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "カレンダ '%s' の予定がこの会議の時間と重なっています"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:437
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "カレンダ '%s' の中に予定がありました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:513
 msgid "Unable to find any calendars"
 msgstr "カレンダが見つかりませんでした"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:520
 msgid "Unable to find this meeting in any calendar"
 msgstr "この会議の予定を記録したカレンダが見つかりませんでした"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:524
 msgid "Unable to find this task in any task list"
 msgstr "このタスクを記録したタスク一覧が見つかりませんでした"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
+#: ../plugins/itip-formatter/itip-formatter.c:528
 msgid "Unable to find this journal entry in any journal"
 msgstr "このジャーナル・エントリはどのジャーナルにもありません"
 
 # 要再考
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:601
 msgid "Searching for an existing version of this appointment"
 msgstr "この予定の保存してあるバージョンの検索"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to parse item"
 msgstr "アイテムを解析できません"
 
-#: ../plugins/itip-formatter/itip-formatter.c:857
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "アイテムをカレンダ '%s' に保存できません (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:864
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "承認したものとしてカレンダ '%s' に保存しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:872
+#: ../plugins/itip-formatter/itip-formatter.c:868
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "仮承認したものとしてカレンダ '%s' に保存しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:877
+#: ../plugins/itip-formatter/itip-formatter.c:873
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "辞退したものとしてカレンダ '%s' に保存しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:882
+#: ../plugins/itip-formatter/itip-formatter.c:878
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "キャンセルしたものとしてカレンダ '%s' に保存しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:975
+#: ../plugins/itip-formatter/itip-formatter.c:971
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizer が DeleGate %s を削除しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:982
+#: ../plugins/itip-formatter/itip-formatter.c:978
 msgid "Sent a cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:984
+#: ../plugins/itip-formatter/itip-formatter.c:980
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "DeleGate へキャンセル通知を送信できませんでした"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1069
+#: ../plugins/itip-formatter/itip-formatter.c:1065
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "不正なステータスのため出席状況が更新できませんでした"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1096
+#: ../plugins/itip-formatter/itip-formatter.c:1092
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "出席者 %s を更新できません"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1096
 msgid "Attendee status updated"
 msgstr "出席状況を更新しました"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1223
 msgid "The calendar attached is not valid"
 msgstr "添付されたカレンダが不正です"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1228
+#: ../plugins/itip-formatter/itip-formatter.c:1224
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16316,15 +16253,15 @@ msgstr ""
 "メッセージにカレンダが添付されていますが、そのカレンダは妥当な iCalendar 形式"
 "ではありません。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1263
-#: ../plugins/itip-formatter/itip-formatter.c:1281
-#: ../plugins/itip-formatter/itip-formatter.c:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1259
+#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1355
 msgid "The item in the calendar is not valid"
 msgstr "カレンダのアイテムが不正です"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1264
-#: ../plugins/itip-formatter/itip-formatter.c:1282
-#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1356
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16332,11 +16269,11 @@ msgstr ""
 "メッセージにカレンダが添付されていますが、そのカレンダにはイベントまたタス"
 "ク、予定の有無が含まれていません。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "The calendar attached contains multiple items"
 msgstr "添付されたカレンダには複数のアイテムが含まれています"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16346,425 +16283,425 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:2063
 msgid "_Delete message after acting"
 msgstr "会議開催後にメッセージを削除する(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2077
-#: ../plugins/itip-formatter/itip-formatter.c:2109
+#: ../plugins/itip-formatter/itip-formatter.c:2073
+#: ../plugins/itip-formatter/itip-formatter.c:2105
 msgid "Conflict Search"
 msgstr "Conflict Search"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2088
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "重複する会議を検索するカレンダを選択して下さい:"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr "今日"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:191
 msgid "Today %H:%M"
 msgstr "今日の%k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M:%S"
 msgstr "今日の%k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M:%S %p"
 msgstr "今日の%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:214
 msgid "Tomorrow"
 msgstr "明日"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow %H:%M"
 msgstr "明日の%k:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M:%S"
 msgstr "明日の%k:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %l:%M %p"
 msgstr "明日の%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明日の%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:251
 #, 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:258
+#: ../plugins/itip-formatter/itip-view.c:256
 msgid "%A %H:%M"
 msgstr "%Aの%k:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M:%S"
 msgstr "%Aの%k:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %l:%M %p"
 msgstr "%Aの%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M:%S %p"
 msgstr "%Aの%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:280
+#: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A, %B %e"
 msgstr "%B%e日 %A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:284
 msgid "%A, %B %e %H:%M"
 msgstr "%B%e日 %A %k:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%B%e日 %A %k:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %l:%M %p"
 msgstr "%B%e日 %A %p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%B%e日 %A %p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%B%e日 %A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%B%e日 %A %k:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%B%e日 %A %k:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%B%e日 %A %p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%B%e日 %A %p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:346
 #, 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:350
+#: ../plugins/itip-formatter/itip-view.c:348
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> さんが次の会議召集情報を公開しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> さんが次の会議をあなたに委任しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:356
 #, 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:360
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> さんが会議への出席を要求しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:364
 #, 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:368
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> さんは既存の会議への参加を希望しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:369
 #, 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:374
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> さんが次の会議の返事を返してきました:"
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> さんは %s さんが次の会議をキャンセルしたもの認識しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> さんが次の会議をキャンセルしました:"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> さんが会議の変更を提案してきました:"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:385
 #, 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:389
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> さんが会議の変更を断ってきました:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> さんは %s さんが次のタスクを公開したと考えています:"
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> さんが次のタスク情報を公開しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:421
 #, 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:426
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> さんは %s さんがタスクを割り当てたと考えています:"
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> さんはタスクをあなたに割り当てました:"
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:432
 #, 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:436
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:437
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> さんは次のタスク割り当てに関するの最新情報を希望しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:440
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> さんは次のタスク割り当てに対する回答を返してきました:"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:444
 #, 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:448
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> さんは次の割り当てられたタスクをキャンセルしました:"
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> さんがタスク割り当ての変更を提案してきました:"
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:457
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> さん次のタスク割り当てを辞退しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> さんは %s さんを介して次のメモを公開しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> さんが次のメモを公開しました:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:489
 #, 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:493
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> さんが既存のメモへの参加を希望しています:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> さんは %s さんを介して次の共有メモをキャンセルしました:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> さんは次の共有メモをキャンセルしました:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:753
 msgid "_Open Calendar"
 msgstr "カレンダを開く(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:759
+#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:769
+#: ../plugins/itip-formatter/itip-view.c:786
+#: ../plugins/itip-formatter/itip-view.c:791
 msgid "_Decline"
 msgstr "辞退する(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:760
+#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:788
+#: ../plugins/itip-formatter/itip-view.c:793
 msgid "_Accept"
 msgstr "受諾する(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:763
 msgid "_Decline all"
 msgstr "全て辞退する(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:764
 msgid "_Tentative all"
 msgstr "全て仮承認する(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:770
+#: ../plugins/itip-formatter/itip-view.c:787
+#: ../plugins/itip-formatter/itip-view.c:792
 msgid "_Tentative"
 msgstr "仮承認する(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:765
 msgid "_Accept all"
 msgstr "全て受諾する(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:776
 msgid "_Send Information"
 msgstr "情報を送信する(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:780
 msgid "_Update Attendee Status"
 msgstr "出席者の状態を更新する(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:783
 msgid "_Update"
 msgstr "更新する(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Start time:"
 msgstr "開始時刻:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:951
 msgid "End time:"
 msgstr "終了時刻:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:1017
 msgid "Comment:"
 msgstr "コメント:"
 
-#: ../plugins/itip-formatter/itip-view.c:1033
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Send u_pdates to attendees"
 msgstr "更新情報を出席者へ送信(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1040
 msgid "A_pply to all instances"
 msgstr "全てのインスタンスの適用(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1709
 msgid "_Tasks :"
 msgstr "タスク(_T) :"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1711
 msgid "Memos :"
 msgstr "メモ :"
 
@@ -17273,7 +17210,7 @@ msgstr ""
 "iCal 形式\n"
 "Free/Busy 形式"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
 
@@ -17576,7 +17513,7 @@ msgstr "サイドバーを表示する"
 msgid "Skip development warning dialog"
 msgstr "開発版であることを警告するダイアログをスキップするかどうか"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:471
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
 msgid "Start in offline mode"
 msgstr "オフライン・モードで起動する"
 
@@ -17771,11 +17708,11 @@ msgstr ""
 msgid "Error executing %s."
 msgstr "%s 実行中にエラーが発生しました。"
 
-#: ../shell/e-shell-window-commands.c:127
+#: ../shell/e-shell-window-commands.c:128
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy がインストールされていません。"
 
-#: ../shell/e-shell-window-commands.c:130
+#: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy を実行できませんでした"
 
@@ -17804,23 +17741,23 @@ msgstr "オフラインで動作(_W)"
 msgid "Work Offline"
 msgstr "オフラインで動作"
 
-#: ../shell/e-shell-window.c:380
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution は現在オンラインです (オフラインにする時は、このボタンをクリックし"
 "て下さい)"
 
-#: ../shell/e-shell-window.c:388
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution はオフラインのままで処理します"
 
-#: ../shell/e-shell-window.c:395
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution は現在オフラインです (オンラインにする時は、このボタンをクリックし"
 "て下さい)"
 
-#: ../shell/e-shell-window.c:795
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "\"%s\" へ切り替えます"
@@ -17852,10 +17789,13 @@ msgstr "データベースの設定がありません"
 
 #: ../shell/e-user-creatable-items-handler.c:678
 #: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
 msgid "New"
 msgstr "新規"
 
+#: ../shell/e-user-creatable-items-handler.c:693
+msgid " New "
+msgstr " 新規 "
+
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新しいテスト"
@@ -17956,35 +17896,35 @@ msgstr ""
 msgid "Do not tell me again"
 msgstr "次回からこのメッセージを表示しない"
 
-#: ../shell/main.c:469
+#: ../shell/main.c:468
 msgid "Start Evolution activating the specified component"
 msgstr "指定したコンポーネントを有効にして Evolution を起動する"
 
-#: ../shell/main.c:473
+#: ../shell/main.c:472
 msgid "Start in online mode"
 msgstr "オンライン・モードで起動する"
 
-#: ../shell/main.c:476
+#: ../shell/main.c:475
 msgid "Forcibly shut down all Evolution components"
 msgstr "全ての Evolution コンポーネントを強制終了する"
 
-#: ../shell/main.c:480
+#: ../shell/main.c:479
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4系から関連ファイルを強制的に移行する"
 
-#: ../shell/main.c:483
+#: ../shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "全てのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:484
 msgid "Disable loading of any plugins."
 msgstr "プラグインを読み込まない"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM /メール・クライアント"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20444,11 +20384,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:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:209
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:397
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:399
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:401
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:752
 msgid "UTC"
 msgstr "UTC"
 
@@ -20581,7 +20521,7 @@ msgstr "月火水木金土日"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
-#: ../widgets/misc/e-calendar-item.c:1747
+#: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
 msgstr "%Y年%B"
 
@@ -20718,43 +20658,42 @@ msgstr "西欧"
 msgid "Western European, New"
 msgstr "西欧 (New)"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "繁体字中国語"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:98 ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "簡体字中国語"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:102
 msgid "Ukrainian"
 msgstr "ウクライナ"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:105
 msgid "Visual"
 msgstr "表示"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明な文字セット: %s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "エンコーディング"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
 msgstr "使用する文字セットを入力して下さい"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "その他..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
 msgstr "エンコーディング(_A)"
 
@@ -20800,14 +20739,6 @@ msgstr "%k:%M"
 msgid "%I:%M %p"
 msgstr "%p%l:%M"
 
-#: ../widgets/misc/e-dateedit.c:1634
-msgid "Invalid Date Value"
-msgstr "不正な日付"
-
-#: ../widgets/misc/e-dateedit.c:1660
-msgid "Invalid Time Value"
-msgstr "不正な時間値"
-
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "有効期限切れ"
@@ -20861,21 +20792,20 @@ msgid "Spacing around expander arrow"
 msgstr "エキスパンダの矢印の周りに配置する領域"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:717
+#: ../widgets/misc/e-filter-bar.c:164
 msgid "Advanced Search"
 msgstr "拡張検索"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:213
 msgid "Save Search"
 msgstr "検索結果の保存"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:247
 msgid "_Searches"
 msgstr "検索(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:249
 msgid "Searches"
 msgstr "検索"
 
@@ -20947,23 +20877,23 @@ msgstr "Reflow model"
 msgid "Column width"
 msgstr "カラムの幅"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:535
 msgid "_Search"
 msgstr "検索(_S)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:541
 msgid "_Find Now"
 msgstr "今すぐ見つける(_F)"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:542
 msgid "_Clear"
 msgstr "クリア(_C)"
 
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:793
 msgid "Item ID"
 msgstr "アイテムの ID"
 
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:800 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3503
 #: ../widgets/text/e-text.c:3504
 msgid "Text"
@@ -20971,19 +20901,19 @@ msgstr "テキスト"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:922
 msgid "Sho_w: "
 msgstr "表示(_W): "
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:939
 msgid "Sear_ch: "
 msgstr "検索(_C): "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1025
+#: ../widgets/misc/e-search-bar.c:951
 msgid " i_n "
 msgstr "検索対象(_N): "
 
@@ -21142,15 +21072,12 @@ msgstr "都合の良い時(_W)"
 msgid "_When opened:"
 msgstr "開いた時(_W):"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
@@ -21195,23 +21122,23 @@ msgstr "フォーカスした項目"
 msgid "Unselected Column"
 msgstr "未選択の項目"
 
-#: ../widgets/table/e-cell-text.c:1793
+#: ../widgets/table/e-cell-text.c:1813
 msgid "Strikeout Column"
 msgstr "取消し線つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1800
+#: ../widgets/table/e-cell-text.c:1820
 msgid "Underline Column"
 msgstr "下線つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1807
+#: ../widgets/table/e-cell-text.c:1827
 msgid "Bold Column"
 msgstr "太字の項目"
 
-#: ../widgets/table/e-cell-text.c:1814
+#: ../widgets/table/e-cell-text.c:1834
 msgid "Color Column"
 msgstr "色つきの項目"
 
-#: ../widgets/table/e-cell-text.c:1828
+#: ../widgets/table/e-cell-text.c:1848
 msgid "BG Color Column"
 msgstr "背景色つきの項目"
 
@@ -21695,9 +21622,6 @@ msgstr "IM コンテキスト"
 msgid "Handle Popup"
 msgstr "アドレス帳"
 
-#~ msgid " New "
-#~ msgstr " 新規 "
-
 #~ msgid "*"
 #~ msgstr "*"
 
diff --git a/po/mk.po b/po/mk.po
index f840d3f145..dea1a000dc 100755
--- a/po/mk.po
+++ b/po/mk.po

path: root/graphics/digikam-kde4/distinfo

SHA256 (digikam-4.14.0.tar.bz2) = 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad
SIZE (digikam-4.14.0.tar.bz2) = 59805228