86 files changed, 41911 insertions, 24702 deletions

diff --git a/ChangeLog b/ChangeLog
index 071116f99f..ad049a792f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,7 @@
-2006-05-27  Thomas Vander Stichele  <thomas at apestaart dot org>
+2006-05-29  Harish Krishnaswamy  <kharish@novell.com>
 
-	* widgets/misc/e-attachment-bar.c: (update):
-	  Fix compilation by adding missing (
-
-2006-05-22  Harish Krishnaswamy  <kharish@novell.com>
-
-	* configure.in: Update intltool requirements.
-
-2006-05-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Patch from Brian Pepple to achieve
-	GNOME Goal for po/LINGUAS. Closes bug #337965.
-	* po/LINGUAS: New file.
-
-2006-05-02  Kjartan Maraas  <kmaraas@gnome.org>
-
-	configure.in: Fix compilation with modern openldap releases.
-	Partially fixes bug #325957. Patch from Sushuma Rai.
+	* NEWS, configure.in: Release updates and version
+	bump. Release - Evolution 2.6.2
 
 2006-04-28  Sven Herzberg  <herzi@gnome-de.org>
 
@@ -27,41 +12,47 @@
 	* shell/e-shell-window.c: added window state saving and updated window
 	size saving to work as expected (fixes bug 243962)
 
-2006-04-27  Tor Lillqvist  <tml@novell.com>
-
-	* win32/libemiscwidgets.def: Add e_expander_get_type which now is
-	needed when linking libevolution-widgets-a11y.
-
 2006-04-25  Jeffrey Stedfast  <fejj@novell.com>
 
 	* configure.in: Figure out auto-magically what the mozilla-nss
 	pkg-config module name is.
 
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* NEWS, configure.in: Release updates. Bump version.
-	***** Release 2.7.1 *****
+2006-04-10  Harish Krishnaswamy <kharish@novell.com>
 
-2006-04-19  Philip Van Hoof  <pvanhoof@gnome.org>
+	--------------------------
+	Release : Evolution 2.6.1
+	--------------------------
 
-	* shell/main.c: Replaced popt with GOption API
+	* NEWS, configure.in: Release updates and version bump.
 
-2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>
+2006-04-08  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
 
-	* configure.in: Remove obsolete entry for no_NO.
-
-2006-03-27  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* MAINTAINERS: Changing the maintainers file to reflect
-	the current mail maintainers.
+	* configure.in (ALL_LINGUAS): Added Breton (br).
 
 2006-03-22  Tommi Vainikainen  <thv@iki.fi>
 
 	* configure.in (ALL_LINGUAS): Added Dzongkha (dz).
 
-2006-03-12  Vladimer Sichinava  <alinux@siena.linux.it>
+2006-03-22  Tor Lillqvist  <tml@novell.com>
+
+	* evolution-zip.in: The evolution.keys and evolution.mime files
+	don't have any version number in their name. I doubt these files
+	actually get used on Win32, though, so prolly silly to put them in
+	the zip file.
 
-	* configure.in: Added "ka" Georgian
+2006-03-14  Vladimer Sichinava  <alinux@siena.linux.it>
+
+        * configure.in: Added "ka" Georgian tu ALL_LINGUAS
+	
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* NEWS, configure.in : Release updates and version bump.
+	--------------------------
+	Release : Evolution 2.6.0
+	--------------------------
+	
+	* data/Makefile.am: Delink the version from the desktop file
+	to enable smoother upgrades.
 
 2006-03-12  Benoît Dejean  <benoit@placenet.org>
 
@@ -69,7 +60,7 @@
 	* mail/default/Makefile.am:
 	* mail/default/fr/Inbox:
 	* mail/default/fr/Makefile.am: Added French welcome message.
-	
+
 2006-03-03  Andre Klapper  <a9016009@gmx.de>
 
 	* configure.in,
diff --git a/NEWS b/NEWS
index d9de039226..1c807f2a38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,39 @@
-Evolution 2.7.1 2006-04-24
+Evolution 2.6.2 2006-05-29 
 ---------------------------
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.2#Evolution
 
-First release of 2.7 development series.
+Evolution 2.6.1 2006-04-10 
+---------------------------
 
-What is new ?
--------------
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.1#Evolution
+
+Evolution 2.6.0 2006-03-13 
+---------------------------
+
+What is new since Evolution 2.4 ?
+---------------------------------
+
+	- a new Memo Component
+	- a new Look for the Event/Task/Meeting Editor
+	- Calendar Publishing support
+	- CalDAV support
+	- Network Manager support
+	- HULA connectivity support
+	- Improved GroupWise support
+	- Improved Event Recurrence support
+	- Calendar Tooltips
+	- CSV/tab importers for Mozilla, Outlook and Evolution formats
+	- Contact list support for LDAP addressbooks
+	- Support for saving Advanced Searches for Address books
+	- Support for Prioritizing messages in the composer
+	- Lots of bug fixes and lots of other User Interface Improvements
+	- Updated Translations
+
+Bug fixes since last release :
+http://go-evolution.org/Evo2.6.0#Evolution
 
-* Integration of Evolution Calendar with Cairo
 
 Evolution 2.5.92 2006-02-27
 ---------------------------
diff --git a/a11y/ChangeLog b/a11y/ChangeLog
index c728d2afaf..51e9079c30 100644
--- a/a11y/ChangeLog
+++ b/a11y/ChangeLog
@@ -1,22 +1,3 @@
-2006-05-16  Harish Krishnaswamy  <kharish@novell.com>
-
-	* Makefile.am, e-table/Makefile.am
-	e-text/Makefile.am: Revert the earlier patch.
-	They are needed, after all.
-
-2006-05-15  Harish Krishnaswamy  <kharish@novell.com>
-
-	Patch submitted by Li Yuan <li.yuan@sun.com>
-	* Makefile.am, e-table/Makefile.am, 
-	e-text/Makefile.am: Do not install header files.
-
-2006-05-08  Li Yuan <li.yuan@sun.com>
-
-	Fix for #333279.
-
-	* e-table/gal-a11y-e-table-item.c: (table_is_row_selected):
-	If row<0, just return FALSE.
-
 2006-04-28  Boby Wang <boby.wang@sun.com>
 
 	Fix for #339136
@@ -44,16 +25,6 @@
 	* ea-factory.h: Disable accessible code when accessibility is not enabled
 	* gal-a11y-factory.h: Remove some unused code
 
-2006-04-27  Boby Wang <boby.wang@sun.com>
-
-	Fix for #332821
-
-	* widgets/Makefile.am:
-	* widgets/ea-expander.[ch]:
-	Add two new files to implement the accessibility of EExpander.
-	* widgets/ea-widgets.[ch]:(e_expander_a11y_init):
-	Implement the accessibility of EExpander.
-
 2006-04-24  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
 
 	reviewed by: Harish Krishnaswamy <kharish@novell.com> 
@@ -62,12 +33,6 @@
 	Fixes the corrupted reference to cell_view->ecell
 	Fix for #330728, #332727.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-	Fix for #319308
-
-	* addressbook/ea-minicard-view.c: (ea_minicard_view_get_name):
-	add the folder name to the name of current minicard view
-
 2006-03-06  Harry Lu <harry.lu@sun.com>
 
 	Fix for 331550.
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index fa5631a859..be56309eae 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* vim:expandtab:shiftwidth=8:tabstop=8:
+ */
 /* Evolution Accessibility: ea-cal-view-event.c
  *
  * Copyright (C) 2003 Ximian, Inc.
@@ -131,7 +133,7 @@ ea_cal_view_event_class_init (EaCalViewEventClass *klass)
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	gobject_class->dispose = ea_cal_view_event_dispose;
+        gobject_class->dispose = ea_cal_view_event_dispose;
 
 	class->get_name = ea_cal_view_event_get_name;
 	class->get_description = ea_cal_view_event_get_description;
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index 34b7f4ceff..0ff6872350 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -111,7 +111,7 @@ type_as_function ## _factory_get_type (void)					\
                 atk_registry_set_factory_type (atk_get_default_registry (),     \
                                       obj_type,                                 \
                                       type_as_function ## _factory_get_type ());\
-        }									\
+        }                                                                       \
 }
 
 #endif /* _EA_FACTORY_H__ */
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 04ddcca937..9b83dad753 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,38 +1,9 @@
-2006-05-25  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/contact-editor/e-contact-quick-add.c : Right click add to
-	contacts doesnt work on email addresses in received mails.
-
-2006-05-25  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/widgets/eab-contact-display.c : Name of some fields differ 
-	when seen in preview pane and contact editor (Video Chat in contact
-	editor and Video Conferencing in preview pane).
-
-2006-05-25  Devashish Sharma  <sdevashish@novel.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c : Contacts
-	added to a contact list cant be added again.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added code to save vcards/addressbooks to remote shares
-
-	* gui/widgets/eab-gui-util.c: (save_it), (eab_contact_save),
-	(eab_contact_list_save):
-
 2006-05-17  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
 	Fix for gnome bug #341931, farsiweb #562
 	* gui/contact-editor/e-contact-editor.c: Mark a few messages for
 	  translation.
 
-2006-05-12  simon.zheng  <simon.zheng@sun.com>
-
-	Fix for Bug 341521
-	* gui/contact-editor/contact-editor.glade: Change the label
-	name of categories button.
-
 2006-04-27  Boby Wang <boby.wang@sun.com>
 
 	** Fix for bug # 336470
@@ -40,50 +11,12 @@
 	* gui/contact-editor/fullname.glade:
 	Add labelled-by relationship to gtkcombo.
 
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/component/addressbook-view.c: Added icons for forward and send.
-
-2006-02-18  M Victor Aloysius J <victoraloy@gmail.com>
-
-	** Fixes bug #317512
-	
-	* gui/eab-contact-editot.c:
-	* gui/eab-popup.h:
-	* gui/eab-popup.c:
-	Hyperlinked email-addresses and websites in preview pane support right 
-	click mouse options. 
-
-2006-04-21  Simon Zheng  <simon.zheng@sun.com>
-
-	Fix for bug #337604
-	* printing/e-contact-print.c: (e_contact_print_response):
-	Should destory the print dialog window after clicking Print
-	Preview button.
-
-2006-04-21  Devashish Sharma  <sdevashish@novell.com>
-
-	Fix for Bug 333869.
-	* printing/e-contact-print-types.h: Remove member letter_tabs in
-	struct _EContactPrintStyle.
-	* printing/e-contact-print.c (e_contact_start_new_page),
-	(e_contact_get_contact_size), (e_contact_print_contact),
-	(e_contact_start_new_column), (complete_sequence),
-	(e_contact_build_style), (e_contact_print_response),
-	(e_contact_print_preview):
-	To be consistent with minicard view, remove functions and data structure 
-	associated with letter tab printing.
-	Patch by Simon Zheng <simon.zheng@sun.com>.
-
-2006-04-21  Devashish Sharma  <sdevashish@novell.com>
+2006-04-21  simon.zheng  <simon.zheng@sun.com>
 
 	Fix for Bug 336713
-	* gui/merging/eab-contact-merging.c: (cancelit): After selecting 
-	"cancel duplicate" when pasting contacts, can't remove those
-	EContactMergingLookup. Make finished_lookup() available. 
-	Patch by Simon Zheng <simon.zheng@sun.com>.
+        * gui/merging/eab-contact-merging.c: (cancelit): After selecting
+        "cancel duplicate" when pasting contacts, can't remove those
+        EContactMergingLookup. Make finished_lookup() available.
 
 2006-03-29  Li Yuan <li.yuan@sun.com>
 
@@ -93,21 +26,6 @@
 	we should return false if it is not a del event to make gtktreeview
 	deal the rest of keys.
 
-2006-03-10  Devashish Sharma  <sdevashish@novell.com>
-
-	* gui/component/ldap-config.glade : ldap port numbers
-	were marked for translation. Fixes 331020.
-
-2006-03-10  Devashish Sharma  <sdevashish@novell.com>
-
-	Fix for bug #333855
-	* gui/contact-editor/e-contact-editor.c (full_name_response),
-	(full_name_key_press_event), (full_name_editor_delete_event_cb),
-	(full_name_clicked):
-	The fullname dialog should be non-modal as well as categories dialog.
-	Patch by Simon Zheng <simon.zheng@sun.com>. Made some changes to the 
-	patch and committed.
-
 2006-03-06  Devashish Sharma <sdevashish@novell.com>
 
 	* gui/contact-editor/e-contact-editor.c (fill_in_address_textview):
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index fbbe9628c1..82c4c50f2b 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -622,10 +622,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU),
-	
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU),	
-	E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU),
-	
+
 	E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR),
 	
@@ -633,7 +630,7 @@ static EPixmap pixmaps [] = {
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU),
-	
+
 	E_PIXMAP_END
 };
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index a34b831f30..92b60e6573 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2551,19 +2551,40 @@ source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor
 						   (EBookCallback) new_target_cb, editor);
 }
 
+static gboolean
+full_name_key_press_event( GtkWidget *widget, GdkEventKey *event, EContactEditor *editor)
+{
+	if (event->keyval == GDK_Return) {
+		gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_OK);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static void
-full_name_response (GtkDialog *dialog, int response, EContactEditor *editor)
+full_name_clicked (GtkWidget *button, EContactEditor *editor)
 {
-	EContactName *name;
-	GtkWidget *fname_widget;
-	int style = 0;
-	gboolean editable = FALSE;
+	GtkDialog *dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name));
+	gboolean fullname_supported;
+	int result;
 
-	g_object_get (dialog, 
-		      "editable", &editable,
+	fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME);
+
+	g_object_set (dialog,
+		      "editable", fullname_supported & editor->target_editable,
 		      NULL);
 
-	if (editable && response == GTK_RESPONSE_OK) {
+	g_signal_connect (GTK_WIDGET (dialog), "key-press-event", G_CALLBACK (full_name_key_press_event), editor);
+
+	gtk_widget_show (GTK_WIDGET(dialog));
+	result = gtk_dialog_run (dialog);
+	gtk_widget_hide (GTK_WIDGET (dialog));
+
+	if (fullname_supported && editor->target_editable && result == GTK_RESPONSE_OK) {
+		EContactName *name;
+		GtkWidget *fname_widget;
+		int style = 0;
+
 		g_object_get (dialog,
 			      "name", &name,
 			      NULL);
@@ -2585,45 +2606,11 @@ full_name_response (GtkDialog *dialog, int response, EContactEditor *editor)
 
 		file_as_set_style(editor, style);
 	}
-	gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static gint
-full_name_editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	if (widget) {
-		if (GTK_IS_WIDGET (widget))
-			gtk_widget_destroy(widget);
-		}
-	return TRUE;
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
-full_name_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	GtkDialog *dialog = GTK_DIALOG (e_contact_editor_fullname_new (editor->name));
-	gboolean fullname_supported;
-	
-	
-	fullname_supported = is_field_supported (editor, E_CONTACT_FULL_NAME);
-
-	g_object_set (dialog,
-		      "editable", fullname_supported & editor->target_editable,
-		      NULL);
-
-	g_signal_connect(dialog, "response",
-			G_CALLBACK (full_name_response), editor);
-	
-	/* Close the fullname dialog if the editor is closed */
-	g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed",
-			    G_CALLBACK (full_name_editor_delete_event_cb), GTK_WIDGET (dialog));
-
-	gtk_widget_show (GTK_WIDGET(dialog));
-}
-
-
-static void
-categories_response (GtkDialog *dialog, int response, EContactEditor *editor)
+response (GtkDialog *dialog, int response, EContactEditor *editor)
 {
 	const char *categories;
 	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
@@ -2638,13 +2625,22 @@ categories_response (GtkDialog *dialog, int response, EContactEditor *editor)
 	gtk_widget_hide(GTK_WIDGET(dialog));
 }
 
+static gboolean
+categories_key_press_event( GtkWidget *widget, GdkEventKey *event, EContactEditor *editor)
+{
+	if (event->keyval == GDK_Return) {
+		gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_OK);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static gint
-categories_editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
+editor_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	if (widget) {
+	if (widget)
 		if (GTK_IS_WIDGET (widget))
 			gtk_widget_destroy(widget);
-		}
 	return TRUE;
 }
 
@@ -2666,12 +2662,14 @@ categories_clicked (GtkWidget *button, EContactEditor *editor)
 		return;
 	}
 	
+	g_signal_connect (GTK_WIDGET (dialog), "key-press-event", G_CALLBACK (categories_key_press_event), editor);
+
 	g_signal_connect(dialog, "response",
-			G_CALLBACK (categories_response), editor);
+			G_CALLBACK (response), editor);
 	
 	/* Close the category dialog if the editor is closed*/
 	g_signal_connect_swapped (EAB_EDITOR (editor), "editor_closed",
-			    G_CALLBACK (categories_editor_delete_event_cb), GTK_WIDGET (dialog));
+			    G_CALLBACK (editor_delete_event_cb), GTK_WIDGET (dialog));
 	
 	gtk_widget_show(GTK_WIDGET(dialog));
 	g_free (categories);
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4a1cfe64d5..50fa3a8b0a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,38 +1,20 @@
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
+2006-05-25  Tor Lillqvist  <tml@novell.com>
 
-	** Added support to save calendar/events/attachments to remote
-	shares in Calenda/Memo/Tasks components.
-
-	* gui/dialogs/cal-attachment-select-file.c: (run_selector),
-	(comp_editor_select_file_attachments):
-	* gui/dialogs/comp-editor.c: (drop_action), (cab_add),
-	(menu_insert_attachment_cb):
-	* gui/e-cal-popup.c: (temp_save_part):
-	* gui/e-calendar-table.c: (e_calendar_table_on_save_as):
-	* gui/e-calendar-view.c: (on_save_as),
-	(e_calendar_view_get_tooltips):
-	* gui/e-memo-table.c: (e_memo_table_on_save_as):
-
-2006-05-23  Srinivasa Ragavan  <sragavan@novell.com>
+	* gui/dialogs/event-editor.c (event_editor_init): Construct
+	pathname to query-free-busy.png at run-time. Fixes Win32 build
+	broken by the fix for #321832 below.
 
-	More alarm fixes
+2006-05-22  Harish Krishnaswamy  <kharish@novell.com>
 
-	* gui/alarm-notify/alarm-notify-dialog.c: (dialog_response_cb),
-	(notified_alarms_dialog_new), (tree_selection_changed_cb):
-	* gui/alarm-notify/alarm-queue.c: (query_objects_changed_async),
-	(free_tray_icon_data):
+	* gui/memos-component.c: Revert one change from the
+	previous commit as the string is not already translated
+	and breaks the string freeze.
 
 2006-05-22  Hiroyuki Ikezoe  <poincare@ikezoe.net>
 
 	**Fixes bug #331418
 	* gui/memos-component.c: Set mnemonics in popup menu.
 
-2006-05-13  Harish Krishnaswamy  <kharish@novell.com>
-
-	Patch suggested by Yu-Hui Liu
-	* conduits/todo/todo-conduit.c: (pre_sync):
-	Check for timezone before passing the context.
-
 2006-04-20  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes the events appearing in different timezone appear in
@@ -42,40 +24,6 @@
 	(e_calendar_view_get_tooltips): Get the timezone from the backend
 	using the tzid if its not present in the icalcomponent.
 
-2006-05-04  Rajeev Ramanathan <rajeevramanathan_2004@yahoo.co.in>
-	
-	Commited few pending cairo stuff. This adds a macro ENABLE_CAIRO to
-	disable cairo for slow performing machines. Also added a patch to
-	disable gradient and select foreground color based on the back ground
-	color.
-	
-	* gui/apps_evolution_calendar.schemas.in.in:
-	* gui/e-calendar-view.c:
-	* gui/e-calendar-view.h:
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw),
-	(e_day_view_main_item_draw_events_in_vbars),
-	(e_day_view_main_item_draw_long_events_in_vbars),
-	(e_day_view_main_item_draw_day_events),
-	(e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-time-item.c: (e_day_view_time_item_draw):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw),
-	(e_day_view_top_item_draw_long_event),
-	(e_day_view_top_item_draw_triangle):
-	* gui/e-day-view.c: (e_day_view_get_text_color),
-	(e_day_view_style_set), (e_day_view_reshape_long_event),
-	(e_day_view_reshape_day_event):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
-	(e_week_view_draw_time), (e_week_view_event_item_draw_icons),
-	(e_week_view_event_item_draw_triangle):
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_draw_day):
-	* gui/e-week-view.c: (e_week_view_get_text_color),
-	(e_week_view_reshape_event_span):
-
-2006-05-04  Harish Krishnaswamy  <kharish@novell.com>
-
-	* gui/dialogs/event-page.glade: Set mnemonic to
-	L instead of the conflicting 'i'. Fixes #334056.
-
 2006-05-04  Chenthill Palanisamy  <pchenthill novell com>
 
 	Fixes #333689
@@ -83,165 +31,21 @@
 	(init_widgets): Check if the units is -1 before
 	adding the menu item.
 
-2006-05-02  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Committing change pointed by Li Yuan <Li.Yuan@Sun.COM>	
-	
-	* gui/e-calendar-table.c: (e_calendar_table_delete_selected): Corrected
-	argument passed to delete_component_dialog while deleting multiple
-	tasks.	
-
-2006-04-27  Tor Lillqvist  <tml@novell.com>
-
-	* gui/e-day-view-main-item.c
-	(e_day_view_main_item_draw_long_events_in_vbars): Fix crash:
-	Should use a GdkColor struct as such here, not a pointer.
-
-	* gui/dialogs/event-editor.c (event_editor_init): Construct
-	pathname to query-free-busy.png at run-time. Fixes Win32 build
-	broken by the fix for #321832 below.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	** Fixes bug #328194
-
-	* gui/dialogs/calendar-setup.c: Added mnemonics.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fix for bug #331510 from Victor
-	
-	* gui/cal-search-bar.h: Added a new flag for Memo Search
-	* gui/e-memos.c: (setup_widgets): Initiate memo search.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/tasks-control.c: (tasks_control_activate): Added icon for
-	forward task.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from PR Suman to add icons missing in menu items.
-
-	* gui/dialogs/comp-editor.c: Added Attach icon to menu.
-	* gui/dialogs/event-editor.c: Added free/busy and recurrence icons.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-	
-	Cairo Updates from Rajeev. Now it draws a solid border around the
-	event.
-
-	* gui/e-day-view-main-item.c:
-	(e_day_view_main_item_draw_day_event):
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw_long_event):
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw):
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Cairo support for Calendar (Rajeev Ramanathan)
-	
-	* gui/apps_evolution_calendar.schemas.in.in: Added key for
-	transparency control.
-	* gui/e-calendar-view.c: (draw_curved_rectangle): A common code for
-	drawing curved rectangles
-	* gui/e-day-view-main-item.c: (e_day_view_main_item_draw),
-	(e_day_view_main_item_draw_events_in_vbars),
-	(e_day_view_main_item_draw_long_events_in_vbars),
-	(e_day_view_main_item_draw_day_event): Used cairo to draw day view events.
-	* gui/e-day-view-time-item.c: 
-	(e_day_view_time_item_get_column_width),
-	(e_day_view_time_item_draw): Used cairo to draw day view time items.
-	* gui/e-day-view-top-item.c: (e_day_view_top_item_draw),
-	(e_day_view_top_item_draw_long_event),
-	(e_day_view_top_item_draw_triangle): Used cairo to draw day view long events.
-	* gui/e-day-view.c: (e_day_view_init), (e_day_view_destroy),
-	(e_day_view_style_set),
-	(e_day_view_reshape_main_canvas_resize_bars),
-	(e_day_view_get_num_events_selected): Used cairo to draw day controls.
-	* gui/e-day-view.h: Added a new font size variable
-	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
-	(e_week_view_draw_time), (e_week_view_event_item_draw_icons),
-	(e_week_view_event_item_draw_triangle): Used cairo to draw week view
-	controls.
-	* gui/e-week-view-main-item.c: (e_week_view_main_item_draw_day): Used 
-	cairo to draw week view events.
-
 2006-04-24  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	Fixes #332409
+	Fixes #323409
 	* gui/calendar-component.c: (setup_create_ecal): Reset the ecal to NULL.
 	* gui/e-calendar-view.c: 
 	(e_calendar_view_new_appointment_for): If the default client does not
 	exist do not open the dialog.
-
+	
 2006-04-22  Harish Krishnaswamy  <kharish@novell.com>
 
 	* gui/dialogs/event-page.c (attendee_added_cb):
-	Added the delfrom property to the delegatee. Fixes
+	Add the delfrom property to the delegatee. Fixes
 	#165714 (bugzilla.novell.com)
 
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #326434
-	
-	* gui/e-calendar-view.c: (e_calendar_view_move_tip),
-	(e_calendar_view_get_tooltips): Added New function to move tooltip
-	with respect to screen size.
-	* gui/e-day-view.c: (e_day_view_on_text_item_event): move the tooltip
-	* gui/e-week-view.c: (tooltip_event_cb),
-	(e_week_view_on_text_item_event): Move the tooltip
-
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Rewrite of Alarm daemon with EThread to make it thread safe. It also
-	fixes a lot of random crashes.
-
-	* gui/alarm-notify/alarm-notify.c: (process_removal_in_hash),
-	(list_changed_cb), (load_calendars), (alarm_notify_init),
-	(dequeue_client), (alarm_notify_finalize), (alarm_channel_setup),
-	(alarm_msg_destroy), (alarm_msgport_replied), (alarm_msg_received),
-	(alarm_notify_new), (cal_opened_cb), (alarm_notify_add_calendar),
-	(alarm_notify_remove_calendar):
-	* gui/alarm-notify/alarm-notify.h:
-	* gui/alarm-notify/alarm-queue.c: (queue_midnight_refresh),
-	(add_client_alarms_cb), (midnight_refresh_async),
-	(midnight_refresh_cb), (remove_queued_alarm), (alarm_trigger_cb),
-	(add_component_alarms), (load_alarms), (load_alarms_for_today),
-	(cal_opened_cb), (remove_alarms), (remove_comp), (duplicate_ical),
-	(duplicate_ecal), (query_objects_changed_async),
-	(query_objects_changed_cb), (query_objects_removed_async),
-	(query_objects_removed_cb), (create_snooze), (edit_component),
-	(on_dialog_objs_removed_async), (on_dialog_objs_removed_cb),
-	(tray_list_remove_cqa_async), (tray_list_remove_cqa),
-	(tray_list_remove_async), (tray_list_remove_icons),
-	(tray_list_remove_data_async), (tray_list_remove_data),
-	(notify_dialog_cb), (open_alarm_dialog), (tray_icon_clicked_cb),
-	(tray_list_add_async), (tray_list_add_new), (display_notification),
-	(popup_notification), (audio_notification), (mail_notification),
-	(procedure_notification_dialog), (procedure_notification),
-	(check_midnight_refresh), (alarm_queue_init),
-	(free_client_alarms_cb), (alarm_queue_done), (compare_ids),
-	(hash_ids), (alarm_queue_add_async), (alarm_queue_add_client),
-	(remove_cqa), (remove_comp_by_id), (remove_client_alarms),
-	(alarm_queue_remove_async), (alarm_queue_remove_client),
-	(update_cqa), (update_qa):
-	* gui/alarm-notify/alarm.c: (alarm_remove):
-
-2006-02-16  Johnny Jacob  <johnnyjacob@gmail.com>
-
-	** Fixes #330955
-
-	* gui/e-memo-table.etspec : Change the column from summary to 
-	description.
-	* gui/e-cal-model.c : (ecm_duplicate_value) : Dup value for
-	description also.
-	(e_cal_model_create_component_with_defaults) : create a memo
-	component with defaults.
-	* gui/e-cal-model-memos.c : (ecmm_is_cell_editable).
-
-2006-04-10  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-04-07  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #163039
 	* gui/e-meeting-store.c: (ems_finalize), (ems_init),
@@ -256,6 +60,11 @@
 
 2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
+	* gui/e-day-view.c: (e_day_view_on_main_canvas_motion):
+	Enable drag and drop of recurring appointments.
+
+2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
+
 	Fixes #328808
 	* gui/dialogs/event-editor.c: 
 	(event_editor_construct): Set the name selector dialog present in the schedule page
@@ -271,12 +80,7 @@
 	(e_meeting_list_view_set_name_selector): Functions to get and set the name
 	selector.
 
-2006-04-06  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	* gui/e-day-view.c: (e_day_view_on_main_canvas_motion):
-	Enable drag and drop of recurring appointments.
-
-2006-04-06  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-04-05  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #162005
 	* gui/comp-util.c: (cal_comp_is_on_server): Pass the recurrence
@@ -289,47 +93,13 @@
 	Because the passing text is in UTF-8 encoding, it should be traversed
 	by utf-8 char order rather than one by one byte.
 
-2006-04-04  Irene Huang <Irene.Huang@sun.com>
+2006-03-20  Irene Huang <Irene.Huang@sun.com>
 
-       	Fixes bug 335214
+        Fixes bug 335214
 
 	* gui/e-cal-model.c: (e_cal_view_objects_added_cb):
         Call e_table_model_pre_change (E_TABLE_MODEL (model)); before
-       	deleting row.
-
-2006-04-03  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #158107
-	* gui/dialogs/delete-comp.c: (delete_component_dialog),
-	(cb_toggled_cb), (prompt_retract_dialog):
-	* gui/dialogs/delete-comp.h:
-	* gui/e-calendar-table.c: (add_retract_data), (check_for_retract),
-	(e_calendar_table_delete_selected):
-	* gui/e-calendar-view.c: (add_retract_data), (check_for_retract),
-	(delete_event), (e_calendar_view_delete_selected_occurrence): Added
-	retract support.
-
-2006-03-29  Chenthill Palanisamy  <pchenthill@novell.com>
-
-	Fixes #160357 [b.n.c]
-	* gui/e-meeting-store.c: 
-	(ems_init): Initialize the num queries.
-	(freebusy_async): maintain the num queries count.
-	(refresh_busy_periods): Set the store to FreeBusy data.
-	* gui/e-meeting-store.[ch]: 
-	(e_meeting_store_get_num_queries): Get the number of freebusy
-	queries currently going on.
-	* gui/e-meeting-time-sel-item.c:
-	(e_meeting_time_selector_item_init): Added a busy cursor.
-	(e_meeting_time_selector_item_destroy):
-	* gui/e-meeting-time-sel-item.h: Added a busy cursor and a function
-	to reset the normal cursor.
-	* gui/e-meeting-time-sel.c: 
-	* gui/e-meeting-time-sel.h:
-	(e_meeting_time_selector_construct): Get the main and top canvas items.
-	(e_meeting_time_selector_refresh_cb): Set the normal cursor checking the number
-	of FreeBusy queries.
-	(e_meeting_time_selector_refresh_free_busy):Set the Busy cursor.
+        deleting row.
 
 2006-03-28  Jeff Cai  <jeff.cai@sun.com> 
 	
@@ -345,7 +115,7 @@
 	* gui/calendar-component.c: (update_task_selection): need to see if
 	source is NULL to avoid a CRITICAL warning.
 
-2006-03-23  Chenthill Palanisamy  <pchenthill@novell.com>
+2006-03-22  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #329502
 	* gui/e-meeting-list-view.c: (attendee_edited_cb):
@@ -374,15 +144,6 @@
 	* gui/dialogs/alarm-dialog.c: (alarm_to_dalarm_widgets): call
 	set_text only when description.value is not NULL.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-
-	** Fix for bug #268584
-
-	* gui/dialogs/cal-attachment-select-file.c: (run_selector):
-	* gui/dialogs/cal-attachment.glade:
-	set the accelerate key for "Suggest Suggest automatic display of
-	attachment"
-
 2006-03-09  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #334003
@@ -13121,4 +12882,3 @@
 
 	* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
 	expunge asyn
-
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
deleted file mode 100644
index 70494168ca..0000000000
--- a/calendar/conduits/memo/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	-I$(top_srcdir)/widgets/misc		\
-	-I$(top_builddir)/widgets/misc		\
-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
-
-# Memo Conduit
-privconduit_LTLIBRARIES = libememo_conduit.la
-
-libememo_conduit_la_SOURCES = 	\
-	memo-conduit.c
-
-libememo_conduit_la_LDFLAGS = -module -avoid-version
-libememo_conduit_la_LIBADD = 						\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-
-e-memo-$(BASE_VERSION).conduit: e-memo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
-	    $< > $@
-
-conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-memo-$(BASE_VERSION).conduit
-
-BUILT_SOURCES = $(conduit_DATA)
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	e-memo.conduit.in
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/conduits/memo/e-memo.conduit.in b/calendar/conduits/memo/e-memo.conduit.in
deleted file mode 100644
index 1cf61436bd..0000000000
--- a/calendar/conduits/memo/e-memo.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_memo_conduit" type="shlib" location="@privconduitdir@/libememo_conduit.so"/>
-	<name value="EMemos"/>
-	<conduit-attribute name="description" value="Synchronizes Memo List with Evolution @BASE_VERSION@"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
deleted file mode 100644
index 4ad5aab79b..0000000000
--- a/calendar/conduits/memo/memo-conduit.c
+++ /dev/null
@@ -1,1445 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Memo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define G_LOG_DOMAIN "ememoconduit"
-
-#include <libecal/e-cal-types.h>
-#include <libecal/e-cal.h>
-#include <libecal/e-cal-time-util.h>
-#include <libedataserver/e-categories.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-dlp.h>
-#include <pi-memo.h>
-#include <libical/icaltypes.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <e-pilot-map.h>
-#include <e-pilot-settings.h>
-#include <e-pilot-util.h>
-#include <e-config-listener.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.6"
-
-#define DEBUG_MEMOCONDUIT 1
-/* #undef DEBUG_MEMOCONDUIT */
-
-#ifdef DEBUG_MEMOCONDUIT
-#define LOG(x) x
-#else
-#define LOG(x)
-#endif
-
-#define WARN g_warning
-#define INFO g_message
-
-typedef struct _EMemoLocalRecord EMemoLocalRecord;
-typedef struct _EMemoConduitCfg EMemoConduitCfg;
-typedef struct _EMemoConduitGui EMemoConduitGui;
-typedef struct _EMemoConduitContext EMemoConduitContext;
-
-/* Local Record */
-struct _EMemoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	ECalComponent *comp;
-
-        /* pilot-link memo structure */
-	struct Memo *memo;
-};
-
-int lastDesktopUniqueID;
-
-static void
-memoconduit_destroy_record (EMemoLocalRecord *local) 
-{
-	g_object_unref (local->comp);
-	free_Memo (local->memo);
-	g_free (local->memo);	
-	g_free (local);
-}
-
-/* Configuration */
-struct _EMemoConduitCfg {
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;
-
-	ESourceList *source_list;
-	ESource *source;
-	gboolean secret;
-	gint priority;
-
-	gchar *last_uri;
-};
-
-static EMemoConduitCfg *
-memoconduit_load_configuration (guint32 pilot_id) 
-{
-	EMemoConduitCfg *c;
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar prefix[256];
-
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-memo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	c = g_new0 (EMemoConduitCfg,1);
-	g_assert (c != NULL);
-
-	c->pilot_id = pilot_id;
-
-	management = gnome_pilot_conduit_management_new ("e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	gtk_object_ref (GTK_OBJECT (management));
-	gtk_object_sink (GTK_OBJECT (management));
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	gtk_object_ref (GTK_OBJECT (config));
-	gtk_object_sink (GTK_OBJECT (config));
-	if (!gnome_pilot_conduit_config_is_enabled (config, &c->sync_type))
-		c->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-	
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-	
-	if (!e_cal_get_sources (&c->source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL))
-		c->source_list = NULL;
-	if (c->source_list) {
-		c->source = e_pilot_get_sync_source (c->source_list);
-		if (!c->source)
-			c->source = e_source_list_peek_source_any (c->source_list);
-		if (c->source) {
-			g_object_ref (c->source);
-		} else {
-			g_object_unref (c->source_list);
-			c->source_list = NULL;
-		}
-	}
-	
-	c->secret = gnome_config_get_bool ("secret=FALSE");
-	c->priority = gnome_config_get_int ("priority=3");
-	c->last_uri = gnome_config_get_string ("last_uri");
-
-	gnome_config_pop_prefix ();
-
-	return c;
-}
-
-static void
-memoconduit_save_configuration (EMemoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-memo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	e_pilot_set_sync_source (c->source_list, c->source);
-	gnome_config_set_bool ("secret", c->secret);
-	gnome_config_set_int ("priority", c->priority);
-	gnome_config_set_string ("last_uri", c->last_uri);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-
-static EMemoConduitCfg*
-memoconduit_dupe_configuration (EMemoConduitCfg *c) 
-{
-	EMemoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EMemoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->pilot_id = c->pilot_id;
-
-	if (c->source_list)
-		retval->source_list = g_object_ref (c->source_list);
-	if (c->source)
-		retval->source = g_object_ref (c->source);
-	retval->secret = c->secret;
-	retval->priority = c->priority;
-	retval->last_uri = g_strdup (c->last_uri);
-
-	return retval;
-}
-
-static void 
-memoconduit_destroy_configuration (EMemoConduitCfg *c) 
-{
-	g_return_if_fail (c != NULL);
-
-	g_object_unref (c->source_list);
-	g_object_unref (c->source);
-	g_free (c->last_uri);
-	g_free (c);
-}
-
-/* Context */
-struct _EMemoConduitContext {
-	GnomePilotDBInfo *dbi;
-
-	EMemoConduitCfg *cfg;
-	EMemoConduitCfg *new_cfg;
-	GtkWidget *ps;
-	
-	struct MemoAppInfo ai;
-
-	ECal *client;
-
-	icaltimezone *timezone;
-	ECalComponent *default_comp;
-	GList *comps;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	EPilotMap *map;
-};
-
-static EMemoConduitContext *
-e_memo_context_new (guint32 pilot_id) 
-{
-	EMemoConduitContext *ctxt = g_new0 (EMemoConduitContext, 1);
-	
-	ctxt->cfg = memoconduit_load_configuration (pilot_id);
-	ctxt->new_cfg = memoconduit_dupe_configuration (ctxt->cfg);
-	ctxt->ps = NULL;
-	ctxt->client = NULL;
-	ctxt->timezone = NULL;
-	ctxt->default_comp = NULL;
-	ctxt->comps = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static gboolean
-e_memo_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-	
-	return TRUE;
-}
-
-static void
-e_memo_context_destroy (EMemoConduitContext *ctxt)
-{
-	GList *l;
-	
-	g_return_if_fail (ctxt != NULL);
-
-	if (ctxt->cfg != NULL)
-		memoconduit_destroy_configuration (ctxt->cfg);
-	if (ctxt->new_cfg != NULL)
-		memoconduit_destroy_configuration (ctxt->new_cfg);
-	
-	if (ctxt->client != NULL)
-		g_object_unref (ctxt->client);
-
-	if (ctxt->default_comp != NULL)
-		g_object_unref (ctxt->default_comp);
-	if (ctxt->comps != NULL) {
-		for (l = ctxt->comps; l; l = l->next)
-			g_object_unref (l->data);
-		g_list_free (ctxt->comps);
-	}
-
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_memo_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			memoconduit_destroy_record (l->data);
-		g_list_free (ctxt->locals);
-	}
-	
-	if (ctxt->changed != NULL)
-		e_cal_free_change_list (ctxt->changed);
-	
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Debug routines */
-static char *
-print_local (EMemoLocalRecord *local)
-{
-	static char buff[ 64 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->memo && local->memo->text) {
-		g_snprintf (buff, 64, "['%s']",
-			    local->memo->text ?
-			    local->memo->text : "");
-		return buff;
-	}
-
-	return "";
-}
-
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 64 ];
-	struct Memo memo;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&memo, 0, sizeof (struct Memo));
-	unpack_Memo (&memo, remote->record, remote->length);
-
-	g_snprintf (buff, 64, "['%s']",
-		    memo.text ?
-		    memo.text : "");
-
-	free_Memo (&memo);
-	
-	return buff;
-}
-
-static int
-start_calendar_server (EMemoConduitContext *ctxt)
-{
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	if (ctxt->cfg->source) {
-		ctxt->client = e_cal_new (ctxt->cfg->source, E_CAL_SOURCE_TYPE_JOURNAL);
-		if (!e_cal_open (ctxt->client, TRUE, NULL)) 
-			return -1;
-	} else if (!e_cal_open_default (&ctxt->client, E_CAL_SOURCE_TYPE_JOURNAL, NULL, NULL, NULL)) {
-		return -1;
-	}
-
-	return 0;
-}
-
-static icaltimezone *
-get_default_timezone (void)
-{
-	EConfigListener *listener;
-	icaltimezone *timezone = NULL;
-	char *location;
-
-	listener = e_config_listener_new ();
-
-	location = e_config_listener_get_string_with_default (listener,
-		"/apps/evolution/calendar/display/timezone", "UTC", NULL);
-	if (!location || !location[0]) {
-		g_free (location);
-		location = g_strdup ("UTC");
-	}
-	
-	timezone = icaltimezone_get_builtin_timezone (location);
-	g_free (location);
-
-	g_object_unref (listener);
-
-	return timezone;	
-}
-
-static char *
-map_name (EMemoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/.evolution/memos/local/system/pilot-map-memo-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-	
-	return filename;
-}
-
-static GList *
-next_changed_item (EMemoConduitContext *ctxt, GList *changes) 
-{
-	ECalChange *ccc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		const char *uid;
-
-		ccc = l->data;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (g_hash_table_lookup (ctxt->changed_hash, uid))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static void
-compute_status (EMemoConduitContext *ctxt, EMemoLocalRecord *local, const char *uid)
-{
-	ECalChange *ccc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	ccc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (ccc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (ccc->type) {
-	case E_CAL_CHANGE_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case E_CAL_CHANGE_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case E_CAL_CHANGE_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EMemoLocalRecord *local,
-			      EMemoConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-
-	g_assert (local->comp != NULL);
-	g_assert (local->memo != NULL );
-	
-	LOG (g_message ( "local_record_to_pilot_record\n" ));
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Memo (local->memo, p.record, 0xffff);
-
-	return p;	
-}
-
-/*
- * Adds a category to the category app info structure (name and ID),
- * sets category->renamed[i] to true if possible to rename.
- * 
- * This will be packed and written to the app info block during post_sync.
- */
- 
-static int
-add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *category)
-{
-	int i, j;
-	int retval = 0; /* 0 is the Unfiled category */
-	LOG(fprintf(stderr, "add_category_if_possible: called\n"));
-	
-	for(i=0; i<16; i++){
-		/* if strlen is 0, then the category is empty
-		   the PalmOS doesn't let 0-length strings for
-		   categories */
-		LOG(fprintf(stderr, "add_category_if_possible: calling strlen, i==%d\n", i));
-		if(strlen(category->name[i]) == 0){
-			int cat_to_add_len;
-			LOG(fprintf(stderr, "add_category_if_possible: strlen == 0\n"));
-			
-			cat_to_add_len = strlen(cat_to_add);
-			LOG(fprintf(stderr, "add_category_if_possible: cat_to_add_len: %d\n",
-					cat_to_add_len));
-			retval = i;
-			
-			/* only 15 characters for category, 16th is
-			 * '\0' can't do direct mem transfer due to
-			 * declaration type
-			 */
-			LOG(fprintf(stderr, "add_category_if_possible: copying first 15 of category\n"));
-			for(j=0; j<cat_to_add_len; j++){
-				category->name[i][j] = cat_to_add[j];
-			}
-			LOG(fprintf(stderr,
-				"add_category_if_possible: setting from %d to i==15 to \\0\n",
-				cat_to_add_len));
-
-			for(j=cat_to_add_len; j<16; j++)
-				category->name[i][j] = '\0';
-			
-			LOG(fprintf(stderr, "add_category_if_possible: setting ID[%d] to %d\n",
-				category->ID[i], lastDesktopUniqueID));
-			category->ID[i] = lastDesktopUniqueID;
-			lastDesktopUniqueID++;
-			
-			LOG(fprintf(stderr, "add_category_if_possible: setting renamed[%d] to TRUE\n", i));
-			category->renamed[i] = TRUE;
-			
-			LOG(g_message("*** adding category '%s', ID %d ***",
-				category->name[i], category->ID[i]));
-			break;
-		}
-	}
-	
-	if(retval == 0){
-		LOG(g_message("*** not adding category - category list already full ***"));
-	}
-	
-	return retval;
-}
-
-/*
- * converts a ECalComponent object to a EMemoLocalRecord
- */
-static void
-local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoConduitContext *ctxt) 
-{
-	const char *uid;
-	GSList *d_list = NULL;
-	ECalComponentText *description;
-	ECalComponentClassification classif;
-	
-	LOG (g_message ( "local_record_from_comp\n" ));
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-	g_object_ref (comp);
-
-	LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_uid\n"));
-	e_cal_component_get_uid (local->comp, &uid);
-	LOG(fprintf(stderr, "local_record_from_comp: got UID - %s, calling e_pilot_map_lookup_pid\n", uid));
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, uid, TRUE);
-	LOG(fprintf(stderr, "local_record_from_comp: local->local.ID == %lu\n", local->local.ID));
-
-	compute_status (ctxt, local, uid);
-	
-	LOG(fprintf(stderr, "local_record_from_comp: local->local.attr: %d\n", local->local.attr));
-
-	local->memo = g_new0 (struct Memo,1);
-
-	/* Don't overwrite the category */
-	if (local->local.ID != 0) {
-		char record[0xffff];
-		int cat = 0;
-		
-		LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-		}
-		LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
-	}
-	
-	/*
-	 * Grab category from existing category list in ctxt->ai.category
-	 */
-	if(local->local.category == 0){
-		GSList *categ_list_head, *categ_list_cur;
-		int cat = -1;
-		int i;
-		
-		LOG(fprintf(stderr, "local_record_from_comp: trying to set category"));
-		LOG(fprintf(stderr, "local_record_from_comp: calling e_cal_component_get_categories_list\n"));
-		
-		e_cal_component_get_categories_list(comp, &categ_list_head);
-		LOG(fprintf(stderr, "local_record_from_comp: got list, setting categ_list_cur to head\n"));
-		
-		categ_list_cur = categ_list_head;
-		while (categ_list_cur && cat == -1)
-		{	
-			LOG(fprintf(stderr, "local_record_from_comp: iterating, data == %s",
-				(char *)categ_list_cur->data));
-			for(i=0; i<16; i++){
-				LOG(fprintf(stderr, "local_record_from_comp: i == %d\n", i));
-				if(strcmp((char *)categ_list_cur->data,
-					  ctxt->ai.category.name[i]) == 0){
-					cat = i;
-					LOG(fprintf(stderr, "local_record_from_comp: found category, name: %s\n",
-							ctxt->ai.category.name[i]));
-					break;
-				}
-			}
-			
-			LOG(fprintf(stderr, "local_record_from_comp: calling g_slist_next\n"));
-			categ_list_cur = g_slist_next(categ_list_cur);
-		}
-		
-		if(cat != -1){
-			LOG(fprintf(stderr, "local_record_from_comp: setting category\n"));
-			local->local.category = cat;
-		}
-		else if(categ_list_head != NULL){
-			local->local.category =
-				add_category_if_possible(
-					(char *)(categ_list_head->data),
-					&(ctxt->ai.category));
-		}
-	}
-
-	/* STOP: don't replace these with g_strdup, since free_Memo
-	   uses free to deallocate */
-
-	e_cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (ECalComponentText *) d_list->data;
-		if (description && description->value){
-			local->memo->text = e_pilot_utf8_to_pchar (description->value);
-		}
-		else{
-			local->memo->text = NULL;
-		}
-	} else {
-		local->memo->text = NULL;
-	}
-	
-	e_cal_component_get_classification (comp, &classif);
-
-	if (classif == E_CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EMemoLocalRecord *local,
-		       const char *uid,
-		       EMemoConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	icalcomponent *icalcomp;
-	GError *error = NULL;
-
-	g_assert(local!=NULL);
-	
-	LOG(g_message("local_record_from_uid\n"));
-
-	if (e_cal_get_object (ctxt->client, uid, NULL, &icalcomp, &error)) {
-		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomp)) {
-			g_object_unref (comp);
-			icalcomponent_free (icalcomp);
-			return;
-		}
-
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else if (error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_JOURNAL);
-		e_cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-		g_object_unref (comp);
-	} else {
-		INFO ("Object did not exist");
-	}
-
-	g_clear_error (&error);
-}
-
-
-static ECalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 ECalComponent *in_comp,
-			 icaltimezone *timezone,
-			 struct MemoAppInfo *ai)
-{
-	ECalComponent *comp;
-	struct Memo memo;
-	struct icaltimetype now;
-	icaltimezone *utc_zone;
-	char *txt, *txt2, *txt3;
-	char *category;
-	int i;
-	
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&memo, 0, sizeof (struct Memo));
-	unpack_Memo (&memo, remote->record, remote->length);
-
-	utc_zone = icaltimezone_get_utc_timezone ();
-	now = icaltime_from_timet_with_zone (time (NULL), FALSE, 
-					     utc_zone);
-
-	if (in_comp == NULL) {
-		comp = e_cal_component_new ();
-		e_cal_component_set_new_vtype (comp, E_CAL_COMPONENT_JOURNAL);
-		e_cal_component_set_created (comp, &now);
-	} else {
-		comp = e_cal_component_clone (in_comp);
-	}
-
-	e_cal_component_set_last_modified (comp, &now);
-	
-	/* The iCal description field */
-	if (!memo.text) {
-		e_cal_component_set_comment_list (comp, NULL);
-		e_cal_component_set_summary(comp, NULL);
-	} else {
-		int idxToUse = -1, ntext = strlen(memo.text);
-		gboolean foundNL = FALSE;
-		GSList l;
-		ECalComponentText text, sumText;
-
-		for(i = 0; i<ntext && i<50; i++){
-			if(memo.text[i] == '\n'){
-				idxToUse = i;
-				foundNL = TRUE;
-				break;
-			}
-		}
-		
-		if(foundNL == FALSE){
-			if(ntext > 50){
-				txt2 = g_strndup(memo.text, 50);
-			}
-			else{
-				txt2 = g_strdup(memo.text);
-				
-			}
-		}
-		else{
-			txt2 = g_strndup(memo.text, idxToUse); /* cuts off '\n' */
-			
-		}
-
-		sumText.value = txt3 = e_pilot_utf8_from_pchar(txt2);
-		sumText.altrep = NULL;
-
-		text.value = txt = e_pilot_utf8_from_pchar (memo.text);
-		text.altrep = NULL;
-		l.data = &text;
-		l.next = NULL;
-
-		e_cal_component_set_summary(comp, &sumText);
-		e_cal_component_set_description_list (comp, &l);
-		free (txt);
-		g_free(txt2);
-		free(txt3);
-	} 
-
-
-	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->secret)
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		e_cal_component_set_classification (comp, E_CAL_COMPONENT_CLASS_PUBLIC);
-	
-	
-	/* set the category properly */
-	category = ai->category.name[remote->category];
-	
-	/* TODO The Memos editor page and search bar are not updated until
-	  a restart of the evolution client */
-	if(e_categories_exist(category) == FALSE){
-		/* add if it doesn't exist */
-		e_categories_add(category, NULL, NULL, TRUE);
-	}
-	
-	e_cal_component_set_categories(comp, category);
-
-	e_cal_component_commit_sequence (comp);
-	
-	free_Memo(&memo);
-
-	return comp;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EMemoConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-	const char *uri;
-	
-	/* If there are no objects or objects but no log */
-	map_count = g_hash_table_size (ctxt->map->pid_map);
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	/* Or if the URI's don't match */
-	uri = e_cal_get_uri (ctxt->client);
-	LOG (g_message ( "  Current URI %s (%s)\n", uri, ctxt->cfg->last_uri ? ctxt->cfg->last_uri : "<NONE>" ));
-	if (ctxt->cfg->last_uri != NULL && (strcmp (ctxt->cfg->last_uri, uri) != 0)) {
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-		e_pilot_map_clear (ctxt->map);
-	}
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG (g_message ( "    doing slow sync\n" ));
-	} else {
-		LOG (g_message ( "    doing fast sync\n" ));
-	}	
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EMemoConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename, *change_id;
-	icalcomponent *icalcomp;
-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-	LOG (g_message ( "pre_sync: Memo Conduit v.%s", CONDUIT_VERSION ));
-	g_message ("Memo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->dbi = dbi;	
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start evolution-data-server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
-		return -1;
-	}
-
-	/* Get the timezone */
-	ctxt->timezone = get_default_timezone ();
-	if (ctxt->timezone == NULL)
-		return -1;
-	LOG (g_message ( "  Using timezone: %s", icaltimezone_get_tzid (ctxt->timezone) ));
-
-	/* Set the default timezone on the backend. */
-	if (ctxt->timezone && !e_cal_set_default_timezone (ctxt->client, ctxt->timezone, NULL))
-		return -1;
-	
-	/* Get the default component */
-	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
-		return -1;
-	
-	ctxt->default_comp = e_cal_component_new ();
-	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
-		g_object_unref (ctxt->default_comp);
-		icalcomponent_free (icalcomp);
-		return -1;
-	}
-	
-	/* Load the uid <--> pilot id map */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Get the local database */
-	if (!e_cal_get_object_list_as_comp (ctxt->client, "#t", &ctxt->comps, NULL))
-		return -1;
-	
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-memo-%d", ctxt->cfg->pilot_id);
-	if (!e_cal_get_changes (ctxt->client, change_id, &ctxt->changed, NULL))
-		return -1;
-	
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	g_free (change_id);
-	
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		ECalChange *ccc = l->data;
-		const char *uid;
-		
-		e_cal_component_get_uid (ccc->comp, &uid);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, uid)) {
-			
-			g_hash_table_insert (ctxt->changed_hash, g_strdup (uid), ccc);
-			
-			switch (ccc->type) {
-			case E_CAL_CHANGE_ADDED:
-				add_records++;
-				break;
-			case E_CAL_CHANGE_MODIFIED:
-				mod_records++;
-				break;
-			case E_CAL_CHANGE_DELETED:
-				del_records++;
-				break;
-			}
-		} else if (ccc->type == E_CAL_CHANGE_DELETED) {
-			e_pilot_map_remove_by_uid (ctxt->map, uid);
-		}
-	}
-
-	/* Set the count information */
-	num_records = g_list_length (ctxt->comps);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
-	
-	g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
-		num_records, add_records, mod_records, del_records);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Memo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Memo application block"));
-		return -1;
-	}
-	unpack_MemoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-	
-	lastDesktopUniqueID = 128;
-
-	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-	
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EMemoConduitContext *ctxt)
-{
-	GList *changed;
-	gchar *filename, *change_id;
-	unsigned char *buf;
-	int dlpRetVal, len;
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	
-	len = pack_MemoAppInfo (&(ctxt->ai), buf, 0xffff);
-	
-	dlpRetVal = dlp_WriteAppBlock (dbi->pilot_socket, dbi->db_handle, 
-			      (unsigned char *)buf, len);
-	
-	g_free (buf);
-			      
-	if (dlpRetVal < 0) {
-		WARN (_("Could not write pilot's Memo application block"));
-		WARN ("dlp_WriteAppBlock(...) = %d", dlpRetVal);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not write pilot's Memo application block"));
-		return -1;
-	}
-	
-
-	LOG (g_message ( "post_sync: Memo Conduit v.%s", CONDUIT_VERSION ));
-
-	g_free (ctxt->cfg->last_uri);
-	ctxt->cfg->last_uri = g_strdup (e_cal_get_uri (ctxt->client));
-	memoconduit_save_configuration (ctxt->cfg);
-	
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */
-	change_id = g_strdup_printf ("pilot-sync-evolution-memo-%d", ctxt->cfg->pilot_id);
-	if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
-		e_cal_free_change_list (changed);
-	g_free (change_id);
-	
-	LOG (g_message ( "---------------------------------------------------------\n" ));
-
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EMemoLocalRecord *local,
-	      guint32 ID,
-	      EMemoConduitContext *ctxt)
-{
-	const char *uid;
-
-	LOG (g_message ( "set_pilot_id: setting to %d\n", ID ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, ID, uid, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EMemoLocalRecord *local,
-		    EMemoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ( "set_status_cleared: clearing status\n" ));
-	
-	e_cal_component_get_uid (local->comp, &uid);
-	g_hash_table_remove (ctxt->changed_hash, uid);
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EMemoLocalRecord **local,
-	  EMemoConduitContext *ctxt)
-{
-	static GList *comps, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG (g_message ( "beginning for_each" ));
-
-		comps = ctxt->comps;
-		count = 0;
-		
-		if (comps != NULL) {
-			LOG (g_message ( "for_each: iterating over %d records", g_list_length (comps)));
-
-			*local = g_new0 (EMemoLocalRecord, 1);
-			LOG(fprintf(stderr, "for_each: calling local_record_from_comp\n"));
-			local_record_from_comp (*local, comps->data, ctxt);
-			LOG(fprintf(stderr, "for_each: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
-			LOG(fprintf(stderr, "for_each: setting iterator = comps\n"));
-			iterator = comps;
-		} else {
-			LOG (g_message ( "no events" ));
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		LOG(fprintf(stderr, "for_each: calling g_list_next (else part)\n"));
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-			LOG(fprintf(stderr, "for_each: creating EMemoLocalRecord\n"));
-			*local = g_new0 (EMemoLocalRecord, 1);
-			LOG(fprintf(stderr, "for_each: calling local_record_from_comp\n"));
-			local_record_from_comp (*local, iterator->data, ctxt);
-			LOG(fprintf(stderr, "for_each: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each ending" ));
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EMemoLocalRecord **local,
-		   EMemoConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG (g_message ( "for_each_modified beginning\n" ));
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-	
-		LOG (g_message ( "iterating over %d records", g_hash_table_size (ctxt->changed_hash) ));
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			ECalChange *ccc = iterator->data;
-			LOG(fprintf(stderr, "for_each_modified: creating EMemoLocalRecord\n"));
-			*local = g_new0 (EMemoLocalRecord, 1);
-			LOG(fprintf(stderr, "for_each_modified: calling local_record_from_comp\n"));
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			LOG(fprintf(stderr, "for_each_modified: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "no events" ));
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		LOG(fprintf(stderr, "for_each_modified: calling g_list_next\n"));
-		iterator = g_list_next (iterator);
-		LOG(fprintf(stderr, "for_each_modified: calling next_changed_item\n"));
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			ECalChange *ccc = iterator->data;
-			LOG(fprintf(stderr, "for_each_modified: calling EMemoLocalRecord\n"));
-			*local = g_new0 (EMemoLocalRecord, 1);
-			LOG(fprintf(stderr, "for_each_modified: calling local_record_from_comp\n"));
-			local_record_from_comp (*local, ccc->comp, ctxt);
-			LOG(fprintf(stderr, "for_each_modified: calling g_list_prepend\n"));
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG (g_message ( "for_each_modified ending" ));
-
-			/* Signal the iteration is over */
-			*local = NULL;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EMemoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EMemoConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG (g_message ("compare: local=%s remote=%s...\n",
-			print_local (local), print_remote (remote)));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-
-	if (retval == 0)
-		LOG (g_message ( "    equal" ));
-	else
-		LOG (g_message ( "    not equal" ));
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EMemoConduitContext *ctxt)
-{
-	ECalComponent *comp;
-	char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
-
-	comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone, &(ctxt->ai));
-
-	/* Give it a new UID otherwise it will be the uid of the default comp */
-	uid = e_cal_component_gen_uid ();
-	e_cal_component_set_uid (comp, uid);
-
-	if (!e_cal_create_object (ctxt->client, e_cal_component_get_icalcomponent (comp), NULL, NULL))
-		return -1;
-
-	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
-
-	g_object_unref (comp);
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EMemoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EMemoConduitContext *ctxt)
-{
-	ECalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG (g_message ("replace_record: replace %s with %s\n",
-			print_local (local), print_remote (remote)));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone, &(ctxt->ai));
-	g_object_unref (local->comp);
-	local->comp = new_comp;
-
-	if (!e_cal_modify_object (ctxt->client, e_cal_component_get_icalcomponent (new_comp), 
-				       CALOBJ_MOD_ALL, NULL))
-		return -1;
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EMemoLocalRecord *local,
-	       EMemoConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->comp != NULL, -1);
-
-	e_cal_component_get_uid (local->comp, &uid);
-
-	LOG (g_message ( "delete_record: deleting %s", uid ));
-
-	e_pilot_map_remove_by_uid (ctxt->map, uid);
-	/* FIXME Error handling */
-	e_cal_remove_object (ctxt->client, uid, NULL);
-	
-        return 0;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EMemoLocalRecord *local,
-		gboolean archive,
-		EMemoConduitContext *ctxt)
-{
-	const char *uid;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG (g_message ( "archive_record: %s\n", archive ? "yes" : "no" ));
-
-	e_cal_component_get_uid (local->comp, &uid);
-	e_pilot_map_insert (ctxt->map, local->local.ID, uid, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EMemoLocalRecord **local,
-       EMemoConduitContext *ctxt)
-{
-	const char *uid;
-	
-	LOG (g_message ("match: looking for local copy of %s\n",
-			print_remote (remote)));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG (g_message ( "  matched\n" ));
-	
-	*local = g_new0 (EMemoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EMemoLocalRecord *local,
-	    EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "free_match: freeing\n" ));
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	memoconduit_destroy_record (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EMemoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "prepare: encoding local %s\n", print_local (local) ));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	return 0;
-}
-
-/* Pilot Settings Callbacks */
-static void
-fill_widgets (EMemoConduitContext *ctxt)
-{
-	if (ctxt->cfg->source)
-		e_pilot_settings_set_source (E_PILOT_SETTINGS (ctxt->ps), 
-					     ctxt->cfg->source);
-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt->ps),
-				     ctxt->cfg->secret);
-}
-
-static gint
-create_settings_window (GnomePilotConduit *conduit,
-			GtkWidget *parent,
-			EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "create_settings_window" ));
-	
-	if (!ctxt->cfg->source_list)	
-		return -1;
-
-	ctxt->ps = e_pilot_settings_new (ctxt->cfg->source_list);
-
-	gtk_container_add (GTK_CONTAINER (parent), ctxt->ps);
-	gtk_widget_show (ctxt->ps);
-
-	fill_widgets (ctxt);
-	
-	return 0;
-}
-
-static void
-display_settings (GnomePilotConduit *conduit, EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "display_settings" ));
-	
-	fill_widgets (ctxt);
-}
-
-static void
-save_settings    (GnomePilotConduit *conduit, EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "save_settings" ));
-
-	if (ctxt->new_cfg->source)
-		g_object_unref (ctxt->new_cfg->source);
-	ctxt->new_cfg->source = e_pilot_settings_get_source (E_PILOT_SETTINGS (ctxt->ps));
-	g_object_ref (ctxt->new_cfg->source);
-	ctxt->new_cfg->secret = e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt->ps));
-	
-	memoconduit_save_configuration (ctxt->new_cfg);
-}
-
-static void
-revert_settings  (GnomePilotConduit *conduit, EMemoConduitContext *ctxt)
-{
-	LOG (g_message ( "revert_settings" ));
-
-	memoconduit_save_configuration (ctxt->cfg);
-	memoconduit_destroy_configuration (ctxt->new_cfg);
-	ctxt->new_cfg = memoconduit_dupe_configuration (ctxt->cfg);
-}
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EMemoConduitContext *ctxt;
-
-	LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" ));
-
-	retval = gnome_pilot_conduit_sync_abs_new ("MemoDB", 0x6D656D6F);
-	g_assert (retval != NULL);
-	
-	ctxt = e_memo_context_new (pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "memoconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);
-
-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);
-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);
-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-
-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);
-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);
-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);
-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);
-
-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);
-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-
-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);
-
-	/* Gui Settings */
-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);
-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);
-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);
-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	GtkObject *obj = GTK_OBJECT (conduit);
-	EMemoConduitContext *ctxt;
-	
-	ctxt = gtk_object_get_data (obj, "memoconduit_context");
-	e_memo_context_destroy (ctxt);
-
-	gtk_object_destroy (obj);
-}
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5b01f5563e..b88850c8ce 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -1138,11 +1138,8 @@ setup_create_ecal (CalendarComponent *calendar_component, CalendarComponentView
 							 GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
 							 _("Unable to open the calendar '%s' for creating events and meetings"), 
 							 e_source_peek_name (source));
-
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
-			g_object_unref (priv->create_ecal);
-			priv->create_ecal = NULL;
 
 			return NULL;
 		}
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 818b425a00..56c6f81d4f 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -386,23 +386,20 @@ static BonoboUIVerb verbs [] = {
 };
 
 static EPixmap pixmaps[] = {
-	/* NOTE: If adding removing elements in this array, make sure
-	 * the indexes of the two elements where the pathname to the
+	/* NOTE: If adding or removing elements in this array, make
+	 * sure the index of the element where the pathname to the
 	 * icons is filled in at run-time in event_editor_init() are
 	 * updated, too.
 	 */
 	E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR),
 	E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),	
 	E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),	
-	E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU),
 	E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),		
-	/* These two will have an absolute path to the png file filled
-	 * in at run-time, see event_editor_init().
+	/* This will have an absolute path to the png file filled in
+	 * at run-time, see event_editor_init().
 	 */
 	E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR),
-	E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU),			
 	E_PIXMAP_END
 };
 
@@ -524,13 +521,11 @@ event_editor_init (EventEditor *ee)
 		editor->uic, "ActionFreeBusy", 
 		menu_action_freebusy_cb, editor);
 
-	/* NOTE: Make sure the 7 and 8 below correspond to the correct
-	 * elements in the pixmaps array.
+	/* NOTE: Make sure the 5 below corresponds to the correct
+	 * element in the pixmaps array.
 	 */
-	if (!pixmaps[7].name) {
-		pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
-		pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
-	}
+	if (!pixmaps[5].name)
+		pixmaps[5].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL);
 	e_pixmaps_update (editor->uic, pixmaps);
 
 	bonobo_ui_component_thaw (editor->uic, NULL);	
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 51441d8fab..b98925c0c1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -780,7 +780,6 @@ ecm_duplicate_value (ETableModel *etm, int col, const void *value)
 	switch (col) {
 	case E_CAL_MODEL_FIELD_CATEGORIES :
 	case E_CAL_MODEL_FIELD_CLASSIFICATION :
-	case E_CAL_MODEL_FIELD_DESCRIPTION :
 	case E_CAL_MODEL_FIELD_SUMMARY :
 		return g_strdup (value);
 	case E_CAL_MODEL_FIELD_HAS_ALARMS :
@@ -1833,9 +1832,6 @@ e_cal_model_create_component_with_defaults (ECalModel *model)
 	case ICAL_VTODO_COMPONENT :
 		comp = cal_comp_task_new_with_defaults (client);
 		break;
-	case ICAL_VJOURNAL_COMPONENT :
-	        comp = cal_comp_memo_new_with_defaults (client);
-		break;
 	default:
 		return NULL;
 	}
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index c8408c647c..825335ec04 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -859,60 +859,10 @@ e_calendar_view_paste_clipboard (ECalendarView *cal_view)
 }
 
 static void
-add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModType mod)
-{
-	icalcomponent *icalcomp = NULL;
-	icalproperty *icalprop = NULL;
-
-	icalcomp = e_cal_component_get_icalcomponent (comp);
-	if (retract_comment && *retract_comment)
-		icalprop = icalproperty_new_x (retract_comment);
-	else
-		icalprop = icalproperty_new_x ("0");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RETRACT-COMMENT");
-	icalcomponent_add_property (icalcomp, icalprop);
-
-	if (mod == CALOBJ_MOD_ALL) 
-		icalprop = icalproperty_new_x ("All");
-	else
-		icalprop = icalproperty_new_x ("This");
-	icalproperty_set_x_name (icalprop, "X-EVOLUTION-RECUR-MOD");
-	icalcomponent_add_property (icalcomp, icalprop);
-}
-
-static gboolean 
-check_for_retract (ECalComponent *comp, ECal *client)
-{
-	ECalComponentOrganizer org;
-	char *email = NULL;
-	const char *strip = NULL;
-	gboolean ret_val = FALSE;
-
-	if (!(e_cal_component_has_attendees (comp) && 
-				e_cal_get_save_schedules (client)))
-		return ret_val;
-
-	e_cal_component_get_organizer (comp, &org);
-	strip = itip_strip_mailto (org.value);
-	
-	if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
-		ret_val = TRUE;
-	}
-
-	if (!ret_val)
-		ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
-
-	g_free (email);
-	return ret_val;
-}
-
-static void
 delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 {
 	ECalComponent *comp;
 	ECalComponentVType vtype;
-	gboolean  delete = FALSE;
-	GError *error = NULL;
 
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
@@ -922,39 +872,9 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 	if (!e_cal_get_static_capability (event->comp_data->client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER))
 		e_cal_component_set_recurid (comp, NULL);
 
-	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
-		gboolean retract = FALSE;
-
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
-		if (retract) {
-			GList *users = NULL;
-			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
-
-			add_retract_data (comp, retract_comment, CALOBJ_MOD_ALL);
-			icalcomp = e_cal_component_get_icalcomponent (comp);
-			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-			if (!e_cal_send_objects (event->comp_data->client, icalcomp, &users, 
-						&mod_comp, &error))	{
-				delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-				g_clear_error (&error);
-				error = NULL;
-			} else {
-
-				if (mod_comp)
-					icalcomponent_free (mod_comp);
-
-				if (users) {
-					g_list_foreach (users, (GFunc) g_free, NULL);
-					g_list_free (users);
-				}
-			}
-		}
-	} else 
-		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
-
-	if (delete) {
+	if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) {
 		const char *uid;
+		GError *error = NULL;
 		
 		if (itip_organizer_is_user (comp, event->comp_data->client) 
 		    && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
@@ -968,13 +888,13 @@ delete_event (ECalendarView *cal_view, ECalendarViewEvent *event)
 			g_object_unref (comp);
 			return;
 		}
-		
+
 		if (e_cal_util_component_is_instance (event->comp_data->icalcomp) || e_cal_util_component_has_recurrences (event->comp_data->icalcomp))
 			e_cal_remove_object_with_mod (event->comp_data->client, uid, 
 				e_cal_component_get_recurid_as_string (comp), CALOBJ_MOD_ALL, &error);
 		else
 			e_cal_remove_object (event->comp_data->client, uid, &error);
-
+		
 		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
 		g_clear_error (&error);
 	}
@@ -1024,49 +944,18 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 	GList *selected;
 	ECalComponent *comp;
 	ECalendarViewEvent *event;
-	ECalComponentVType vtype;
-	gboolean  delete = FALSE;
-	GError *error = NULL;
 		
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (!selected)
 		return;
+	
 	event = (ECalendarViewEvent *) selected->data;
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
-	vtype = e_cal_component_get_vtype (comp);
-
-	if (check_for_retract (comp, event->comp_data->client)) {
-		char *retract_comment = NULL;
-		gboolean retract = FALSE;
-
-		retract = prompt_retract_dialog (comp, &retract_comment, GTK_WIDGET (cal_view));
-		if (retract) {
-			GList *users = NULL;
-			icalcomponent *icalcomp = NULL, *mod_comp = NULL;
-
-			add_retract_data (comp, retract_comment, CALOBJ_MOD_THIS);
-			icalcomp = e_cal_component_get_icalcomponent (comp);
-			icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-			if (!e_cal_send_objects (event->comp_data->client, icalcomp, &users, 
-						&mod_comp, &error))	{
-				delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
-				g_clear_error (&error);
-				error = NULL;
-			} else {
-				if (mod_comp)
-					icalcomponent_free (mod_comp);
-				if (users) {
-					g_list_foreach (users, (GFunc) g_free, NULL);
-					g_list_free (users);
-				}
-			}
-		}
-	} else 
-		delete = delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view));
 
-	if (delete) {
+	if (delete_component_dialog (comp, FALSE, 1, e_cal_component_get_vtype (comp), GTK_WIDGET (cal_view))) {
 		const char *uid, *rid = NULL;
+		GError *error = NULL;
 		ECalComponentDateTime dt;
 		icaltimezone *zone = NULL;
 		gboolean is_instance = FALSE;
@@ -1122,7 +1011,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 			e_cal_modify_object (event->comp_data->client, event->comp_data->icalcomp, CALOBJ_MOD_THIS,
 				       	&error);
 		}
-	
+
 		delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
 		g_clear_error (&error);
 	}
@@ -1239,8 +1128,9 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 	GList *selected;
 	char *filename;
 	char *ical_string;
+	FILE *file;
 	ECalendarViewEvent *event;
-	
+
 	selected = e_calendar_view_get_selected_events (cal_view);
 	if (!selected)
 		return;
@@ -1255,9 +1145,16 @@ on_save_as (EPopup *ep, EPopupItem *pitem, void *data)
 		g_warning ("Couldn't convert item to a string");
 		return;
 	}
-
-	e_write_file_uri (filename, ical_string);
+	
+	file = g_fopen (filename, "w");
+	if (file == NULL) {
+		g_warning ("Couldn't save item");
+		return;
+	}
+	
+	fprintf (file, "%s", ical_string);
 	g_free (ical_string);
+	fclose (file);
 
 	g_list_free (selected);
 }
@@ -1835,7 +1732,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 
 	default_client = e_cal_model_get_default_client (priv->model);
 
-	if (!default_client || e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) {
+	if (default_client && e_cal_get_load_state (default_client) != E_CAL_LOAD_LOADED) {
 		g_warning ("Default client not loaded \n");
 		return;
 	}
@@ -1898,7 +1795,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 		flags |= COMP_EDITOR_USER_ORG;
 	}
 	
-	open_event_with_flags (cal_view, default_client,
+	open_event_with_flags (cal_view, e_cal_model_get_default_client (priv->model),
 			icalcomp, flags);
 
 	g_object_unref (comp);
@@ -2060,44 +1957,6 @@ get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
         return g_strdup (buffer);
 }
 
-void 
-e_calendar_view_move_tip (GtkWidget *widget, int x, int y)
-{
-  GtkRequisition requisition;
-  gint w, h;
-  GdkScreen *screen;
-  GdkScreen *pointer_screen;
-  gint monitor_num, px, py;
-  GdkRectangle monitor;	
-
-  screen = gtk_widget_get_screen (widget);
-
-  gtk_widget_size_request (widget, &requisition);
-  w = requisition.width;
-  h = requisition.height;
-
-  gdk_display_get_pointer (gdk_screen_get_display (screen),
-                           &pointer_screen, &px, &py, NULL);
-  if (pointer_screen != screen) 
-    {
-      px = x;
-      py = y;
-    }
-  monitor_num = gdk_screen_get_monitor_at_point (screen, px, py);
-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
-  if ((x + w) > monitor.x + monitor.width)
-    x -= (x + w) - (monitor.x + monitor.width);
-  else if (x < monitor.x)
-    x = monitor.x;
-
-  if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height)
-    y = y - h - 36;
-
-  gtk_window_move (GTK_WINDOW (widget), x, y);
-  gtk_widget_show (widget); 
-}
-
 /* 
  * It is expected to show the tooltips in this below format
  *
@@ -2128,10 +1987,9 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	if (widget)
 		gtk_widget_destroy (widget);
 
-	default_zone = e_calendar_view_get_timezone  (data->cal_view);
 	pevent = data->get_view_event (data->cal_view, data->day, data->event_num);
-
 	client = pevent->comp_data->client;
+	default_zone = e_calendar_view_get_timezone  (data->cal_view);
 
 	clone_comp = icalcomponent_new_clone (pevent->comp_data->icalcomp);
 	if (!e_cal_component_set_icalcomponent (newcomp, clone_comp))
@@ -2243,9 +2101,6 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	gtk_container_add ((GtkContainer *)pevent->tooltip, frame);
 			
 	gtk_widget_show_all (pevent->tooltip);	
-
-	e_calendar_view_move_tip (pevent->tooltip, pevent->x +16, pevent->y+16);
-
 	gdk_keyboard_grab (pevent->tooltip->window, FALSE, GDK_CURRENT_TIME);
 	g_signal_connect (pevent->tooltip, "key-press-event", G_CALLBACK (tooltip_grab), data->cal_view);
 	pevent->timeout = -1;
@@ -2257,54 +2112,4 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
 	return FALSE;
 }
 	
-#ifdef ENABLE_CAIRO
-void
-draw_curved_rectangle (cairo_t *cr, double x0, double y0,
-			double rect_width, double rect_height,
-			double radius)
-{
-	double x1, y1;
-	
-	x1 = x0 + rect_width; 
-	y1 = y0 + rect_height;
-
-	if (!rect_width || !rect_height)
-	    return;
-	if (rect_width / 2 < radius) {
-	    if (rect_height / 2 < radius) {
-	        cairo_move_to  (cr, x0, (y0 + y1)/2);
-        	cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-	        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-	        cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-	    } else {
-        	cairo_move_to  (cr, x0, y0 + radius);
-	        cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
-        	cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-	        cairo_line_to (cr, x1 , y1 - radius);
-	        cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
-        	cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-    		}
-	} else {
-	    if (rect_height / 2 < radius) {
-        	cairo_move_to  (cr, x0, (y0 + y1)/2);
-	        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-	        cairo_line_to (cr, x1 - radius, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
-        	cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-	        cairo_line_to (cr, x0 + radius, y1);
-        	cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
-	    } else {
-        	cairo_move_to  (cr, x0, y0 + radius);
-	        cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
-        	cairo_line_to (cr, x1 - radius, y0);
-	        cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
-        	cairo_line_to (cr, x1 , y1 - radius);
-	        cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
-        	cairo_line_to (cr, x0 + radius, y1);
-	        cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
-    		}
-	}
-	cairo_close_path (cr);
-}
-#endif
+
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index fa80114970..34fa4c2ad3 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
 /*
  * Authors :
  *  Damon Chaplin <damon@ximian.com>
@@ -77,7 +78,6 @@
 #define E_DAY_VIEW_DATE_X_PAD	4
 
 #define E_DAY_VIEW_LARGE_FONT_PTSIZE 18
-#define E_DAY_VIEW_SMALL_FONT_PTSIZE 10
 
 /* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
 #define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
@@ -739,7 +739,6 @@ e_day_view_init (EDayView *day_view)
 	day_view->auto_scroll_timeout_id = 0;
 
 	day_view->large_font_desc = NULL;
-	day_view->small_font_desc = NULL;
 
 	/* String to use in 12-hour time format for times in the morning. */
 	day_view->am_string = _("am");
@@ -894,7 +893,7 @@ e_day_view_init (EDayView *day_view)
 
 	day_view->drag_rect_item =
 		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),				       
+				       gnome_canvas_rect_get_type (),
 				       "width_pixels", 1,
 				       NULL);
 	gnome_canvas_item_hide (day_view->drag_rect_item);
@@ -1034,11 +1033,6 @@ e_day_view_destroy (GtkObject *object)
 		day_view->large_font_desc = NULL;
 	}
 
-	if (day_view->small_font_desc) {
-		pango_font_description_free (day_view->small_font_desc);
-		day_view->small_font_desc = NULL;
-	}
-
 	if (day_view->normal_cursor) {
 		gdk_cursor_unref (day_view->normal_cursor);
 		day_view->normal_cursor = NULL;
@@ -1193,35 +1187,6 @@ e_day_view_unrealize (GtkWidget *widget)
 		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->unrealize)(widget);
 }
 
-static GdkColor
-e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
-{
-	GdkColor color, bg_color;
-	guint16 red, green, blue; 
-	gdouble	cc = 65535.0;
-	
-	red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red;
-       	green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
-       	blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
-
-	if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data),
-       	     &bg_color)) {
-                GdkColormap *colormap;
-       		colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
-	        if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
-       		        red = bg_color.red;
-			green = bg_color.green;
-	                blue = bg_color.blue;
-                }
-       	}
-
-	if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
-		color = widget->style->text[GTK_STATE_NORMAL];
-	else
-		color = widget->style->text[GTK_STATE_ACTIVE];
-
-	return color;
-}
 
 static void
 e_day_view_style_set (GtkWidget *widget,
@@ -1243,7 +1208,6 @@ e_day_view_style_set (GtkWidget *widget,
 	PangoLayout *layout;
 	gint week_day, event_num;
 	EDayViewEvent *event;
-	GdkColor color;
 
 	if (GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)
 		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)(widget, previous_style);
@@ -1254,22 +1218,18 @@ e_day_view_style_set (GtkWidget *widget,
 	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++){
 		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
 			event = &g_array_index (day_view->events[week_day], EDayViewEvent, event_num);
-			if (event->canvas_item) {
-				color = e_day_view_get_text_color (day_view, event, widget);
+			if (event->canvas_item)
 				gnome_canvas_item_set (event->canvas_item,
-						"fill_color_gdk", &color,
+						"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						NULL);
-			}
 		}
 	}
 	for (event_num = 0; event_num < day_view->long_events->len; event_num++) {
 		event = &g_array_index (day_view->long_events, EDayViewEvent, event_num);
-		if (event->canvas_item) {
-			color = e_day_view_get_text_color (day_view, event, widget);
+		if (event->canvas_item)
 			gnome_canvas_item_set (event->canvas_item,
-					"fill_color_gdk", &color,
+					"fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					NULL);
-		}
 	}
 	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
 			"fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
@@ -1294,14 +1254,6 @@ e_day_view_style_set (GtkWidget *widget,
 	day_view->large_font_desc = pango_font_description_copy (font_desc);
 	pango_font_description_set_size (day_view->large_font_desc,
 					 E_DAY_VIEW_LARGE_FONT_PTSIZE * PANGO_SCALE);
-	
-	/* Create the small fonts. */
-	if (day_view->small_font_desc != NULL)
-		pango_font_description_free (day_view->small_font_desc);
-
-	day_view->small_font_desc = pango_font_description_copy (font_desc);
-	pango_font_description_set_size (day_view->small_font_desc,
-					 E_DAY_VIEW_SMALL_FONT_PTSIZE * PANGO_SCALE);
 
 	/* Recalculate the height of each row based on the font size. */
 	day_view->row_height =
@@ -4429,7 +4381,6 @@ e_day_view_reshape_long_event (EDayView *day_view,
 			num_icons++;
 		if (event->different_timezone)
 			num_icons++;
-
 		if (e_cal_component_has_organizer (comp))
 			num_icons++;
 		if (e_cal_component_has_attachments (comp))
@@ -4449,12 +4400,8 @@ e_day_view_reshape_long_event (EDayView *day_view,
 
 	if (!event->canvas_item) {
 		GtkWidget *widget;
-		GdkColor color;
 
 		widget = (GtkWidget *)day_view;
-
-		color = e_day_view_get_text_color (day_view, event, widget);
-
 		event->canvas_item =
 			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
 					       e_text_get_type (),
@@ -4464,7 +4411,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 					       "editable", TRUE,
 					       "use_ellipsis", TRUE,
 					       "draw_background", FALSE,
-					       "fill_color_gdk", &color,
+					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					       "im_context", E_CANVAS (day_view->top_canvas)->im_context,
 					       NULL);
 		g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
@@ -4636,12 +4583,8 @@ e_day_view_reshape_day_event (EDayView *day_view,
 
 		if (!event->canvas_item) {
 			GtkWidget *widget;
-			GdkColor color;
 
 			widget = (GtkWidget *)day_view;
-
-			color = e_day_view_get_text_color (day_view, event, widget);
-
 			event->canvas_item =
 				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
 						       e_text_get_type (),
@@ -4651,7 +4594,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 						       "clip", TRUE,
 						       "use_ellipsis", TRUE,
 						       "draw_background", FALSE,
-						       "fill_color_gdk", &color,
+						       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						       "im_context", E_CANVAS (day_view->main_canvas)->im_context,
 						       NULL);
 			g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
@@ -4728,7 +4671,6 @@ e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
 			       "x2", x + w - 1,
 			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
 			       NULL);
-
 	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
 }
 
@@ -5951,7 +5893,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (day_view), "tooltip-window");
 			
 			if (pevent->tooltip) {
-				e_calendar_view_move_tip (pevent->tooltip, pevent->x+16, pevent->y+16);
+				gtk_window_move ((GtkWindow *)pevent->tooltip, ((int)((GdkEventMotion *)event)->x_root)+16, ((int)((GdkEventMotion *)event)->y_root) +16);
 			}
 
 			return TRUE;
@@ -7846,3 +7788,5 @@ e_day_view_get_num_events_selected (EDayView *day_view)
 
 	return (day_view->editing_event_day != -1) ? 1 : 0;
 }
+
+
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 738447b83b..2003240b6e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -59,7 +59,6 @@ struct _EMeetingStorePrivate {
 	guint refresh_idle_id;
 
 	guint num_threads;
-	guint num_queries;
 };
 
 #define BUF_SIZE 1024
@@ -603,8 +602,6 @@ ems_init (EMeetingStore *store)
 
 	priv->mutex = g_mutex_new ();
 
-	priv->num_queries = 0;
-
 	start_addressbook_server (store);
 }
 
@@ -1139,7 +1136,6 @@ typedef struct {
 	char *email;
 	EMeetingAttendee *attendee;
 	EMeetingStoreQueueData *qdata;
-	EMeetingStore *store;
 } FreeBusyAsyncData;
 
 #define USER_SUB   "%u"
@@ -1152,15 +1148,12 @@ freebusy_async (gpointer data)
 	EMeetingAttendee *attendee = fbd->attendee;
 	gchar *default_fb_uri;
 	static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
-	EMeetingStorePrivate *priv = fbd->store->priv;
 
 	if (fbd->client) {
 		/* FIXME this a work around for getting all th free busy information for the users 
 		 we should be able to get free busy asynchronously */
 		g_static_mutex_lock (&mutex);		
-		priv->num_queries++;
 		e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
-		priv->num_queries--;
 		g_static_mutex_unlock (&mutex);		
 
 		g_list_foreach (fbd->users, (GFunc)g_free, NULL);
@@ -1200,11 +1193,9 @@ freebusy_async (gpointer data)
 		g_free (default_fb_uri);
 		default_fb_uri = replace_string (tmp_fb_uri, DOMAIN_SUB, split_email[1]);
 
-		priv->num_queries++;
 		gnome_vfs_async_open (&handle, default_fb_uri, GNOME_VFS_OPEN_READ, 
 				      GNOME_VFS_PRIORITY_DEFAULT, start_async_read, 
 				      fbd->qdata);
-		priv->num_queries--;
 		
 		g_free (tmp_fb_uri);
 		g_strfreev (split_email);
@@ -1268,7 +1259,6 @@ refresh_busy_periods (gpointer data)
 	fbd->fb_data = NULL;	
 	fbd->qdata = qdata;
 	fbd->fb_uri = priv->fb_uri;
-	fbd->store = store;
 	fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
 
 	/* Check the server for free busy data */	
@@ -1468,11 +1458,3 @@ e_meeting_store_refresh_busy_periods (EMeetingStore *store,
 
 	refresh_queue_add (store, row, start, end, call_back, data);
 }
-
-guint
-e_meeting_store_get_num_queries (EMeetingStore *store)
-{
-	g_return_if_fail (E_IS_MEETING_STORE (store));
-
-	return store->priv->num_queries;
-}
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index fb6d678fd0..791ad0f65e 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -106,7 +106,6 @@ void e_meeting_store_refresh_busy_periods (EMeetingStore *im,
 					   EMeetingStoreRefreshCallback call_back,
 					   gpointer data);
 
-guint e_meeting_store_get_num_queries (EMeetingStore *store);
 
 G_END_DECLS
 
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 0cfadf4b5a..e5c7afad77 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -59,7 +59,6 @@
 
 #include <misc/e-dateedit.h>
 #include <e-util/e-gui-utils.h>
-#include <e-util/e-cursor.h>
 
 #include "calendar-component.h"
 #include "calendar-config.h"
@@ -391,13 +390,13 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_widget_show (mts->vscrollbar);
 
 	/* Create the item in the top canvas. */
-	mts->item_top = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
+	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_top)->root),
 			       e_meeting_time_selector_item_get_type (),
 			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
 			       NULL);
 
 	/* Create the item in the main canvas. */
-	mts->item_main = gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
+	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts->display_main)->root),
 			       e_meeting_time_selector_item_get_type (),
 			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,
 			       NULL);
@@ -1203,13 +1202,6 @@ e_meeting_time_selector_refresh_cb (gpointer data)
 {
 	EMeetingTimeSelector *mts = data;
 
-	if (e_meeting_store_get_num_queries (mts->model) == 0) {
-		e_cursor_set ((GtkWidget *)mts, E_CURSOR_NORMAL);
-		mts->last_cursor_set = GDK_LEFT_PTR;
-		e_meeting_time_selector_item_set_normal_cursor (E_MEETING_TIME_SELECTOR_ITEM (mts->item_top));
-		e_meeting_time_selector_item_set_normal_cursor (E_MEETING_TIME_SELECTOR_ITEM (mts->item_main));
-	}
-			
 	if (mts->display_top != NULL)
 		gtk_widget_queue_draw (mts->display_top);
 	if (mts->display_main != NULL)
@@ -1234,11 +1226,6 @@ e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, g
 	end.hour = 0;
 	end.minute = 0;	
 
-	/*  set the cursor to Busy, We need to reset it to normal once the free busy
-	    queries are complete */
-	e_cursor_set ((GtkWidget *)mts, E_CURSOR_BUSY);
-	mts->last_cursor_set = GDK_WATCH;
-
 	/* Ref ourselves in case we are called back after destruction,
 	 * we can do this because we will get a call back even after
 	 * an error */
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 0f61f28889..7a11a397a8 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -447,7 +447,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem emc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
+	{ E_POPUP_ITEM, "10.new", N_("New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1834559fc4..f1b3e05f9e 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,66 +1,12 @@
-2006-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (drop_action): If 'str' is empty, continue
-	immediately rather than trying to parse it a URL.
-
-2006-05-25  Jeffrey Stedfast  <fejj@novell.com>
-
-	* e-msg-composer.c (drop_action): Instead of g_free()ing 'str' in
-	the if and else blocks, just g_free it after the if-else block.
-
-	* e-msg-composer-select-file.c (select_attach_response): Replace
-	'if (!filename)' with 'if (filename)', fixes a bug in Srini's
-	patch.
-
-	* e-msg-composer-hdrs.c (header_new_recipient): Set the visible
-	field to FALSE.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Added support to attach from remote shares
-
-	* e-msg-composer-select-file.c (get_selector),
-	(select_attach_response):
-
-	* e-msg-composer.c (add_to_bar, drop_action):
-
-2006-03-09  Sam Yang  <sam.yang@sun.com>
-
-	** Fixes #333971
-
-	* e-msg-composer.c (e_msg_composer_insert_paragraph_after): Remove
-	text-default-color command that resets customized text color to
-	default, so stops composer color combo from receiving signal to
-	refresh color preview when inserting a new line.
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Adding support for ENameSelectorList in composer. It is a enhanced
-	version of Name Selector, which provides a list view to the entry
-	data.
-
-	* e-msg-composer-hdrs.c (create_addressbook_entry),
-	(header_new_recipient, attach_couple): Added ENameSelectorList to
-	composer.
-
 2006-04-05  Simon Zheng  <simon.zheng@sun.com>
 
 	** Fixes bug #333213
 
 	* e-msg-composer.c (best_encoding): According to POSIX.1
-	specfication, if iconv() encounts non-identical characters, it'll
-	return the number of non-identical conversation performed. i.e.
+	specfication, if iconv() encounting non-identical characters, it
+	returns the number of non-identical conversation performed. i.e.
 	returning positive value means exception as well as -1.
 
-2006-03-20  Boby Wang <boby.wang@sun.com>
-
-	** Fix for bug #268584
-	
-	* e-msg-composer-attachment.glade:
-	* e-msg-composer-select-file.c (get_selector):
-	set the accelerate key for "Suggest Suggest automatic display of
-	attachment"
-
 2006-02-16  Rohini S  <srohini@novell.com>
 
 	** Fixes bug #324742
@@ -87,29 +33,24 @@
 
 2006-01-24  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* e-msg-composer-hdrs.c (account_removed_cb),
+	* e-msg-composer-hdrs.c: (account_removed_cb),
 	(header_new_recipient): Use guint for 1 bit bitfield, use
 	g_slist_delete_link instead of g_slist_remove_link+g_slist_free1,
 	Remove some unused vars.
-
-	* e-msg-composer.c (build_message, set_editor_text),
+	* e-msg-composer.c: (build_message), (set_editor_text),
 	(autosave_manager_query_load_orphans),
 	(e_msg_composer_new_with_message): Remove unused vars and rename
 	a local variable with a name clash.
-
-	* evolution-composer.c (evolution_composer_init): Remove unused var
-
+	* evolution-composer.c: (evolution_composer_init): Remove unused var
 	* listener.c: Remove stray semi colon.
 
 2006-1-13  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** Fixes bug #323127
-
-	* e-msg-composer.c (create_composer): Add a Expander for
-	attachments bar.
+	* e-msg-composer.c (create_composer) : Add a Expander
+	for attachments bar.
 	(show_attachments): Show/Hide attachment bar.
-	(attachment_expander_activate_cb): Event handler for attachment
-	bar.
+	(attachment_expander_activate_cb) : Event handler for attachment bar.
 
 2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
 
@@ -122,21 +63,21 @@
 
 	** See bug #246237
 
-	* e-msg-composer.c (create_composer):
-	(subject_changed_cb): Modified to change window title to "Compose
-	Message"
+	* e-msg-composer.c 
+	(create_composer):
+	(subject_changed_cb):
+	Modified to change window title to "Compose Message"
 
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
 	* e-msg-composer-hdrs.h: use libedataserver/e-account.h 
 	instead of e-util/e-account.h.
-
 	* evolution-composer.c: use libedataserver/e-account-list.h 
 	instead of e-util/e-account-list.h.
 
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
-	* e-msg-composer.c:
+	* e-msg-composer.c
 	* e-msg-composer-attachment.c: Include <gtk/gtk.h> instead of
 	attempting to hand-pick individual GTK headers. Use gstdio
 	wrappers. Use GDir instead of dirent. Use g_mkstemp() instead of
@@ -149,10 +90,8 @@
 2005-11-23  Johnny Jacob <johnnyjacob@gmail.com>
 	
 	** See Bug # 246245
-
-	* e-msg-composer-select-file.c
-	(e_msg_composer_select_file_attachments): Changed the title
-	caption from "Attach file(s)" to "Insert Attachment".
+	* e-msg-composer-select-file.c (e_msg_composer_select_file_attachments):   
+	Changed the title caption from "Attach file(s)" to "Insert Attachment".
 
 2005-12-07  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
@@ -161,17 +100,17 @@
 	(menu_insert_priority_cb):
 	(setup_ui):
 	(e_msg_composer_get_priority):
-	(e_msg_composer_set_priority): Add support for setting priority of
-	a message.
+	(e_msg_composer_set_priority):
+	Add support for setting priority of a message.
 
 2005-12-05  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	** See bug #322863
-
-	* e-msg-composer.c (e_msg_composer_new_with_message): Check if the
-	account indeed exists before freeing/duping it.  The account would
-	typically not exist, when redirecting mails originated from other
-	accounts which are not configured in ones machine.
+	* e-msg-composer.c: (e_msg_composer_new_with_message):
+	Check if the account indeed exists before freeing/duping it.
+	The account would typically not exist, when redirecting mails
+	originated from other accounts which are not configured in ones 
+	machine.
 
 2005-11-26  Tor Lillqvist  <tml@novell.com>
 
@@ -182,16 +121,16 @@
 	Windows. No effect on functionality on Unix.
 
 2005-10-22  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* e-msg-composer.c (get_file_content): use composer->priv->charset
-	instead of p->charset. This fixes a crash
+	
+	* e-msg-composer.c: (get_file_content):
+	use composer->priv->charset instead of p->charset. This fixes 
+	a crash
 
 2005-10-21 Vivek Jain <jvivek@novell.com>
 	
 	Comitted NotZed's patch given on #314701
 	
 	** See bug #314701.
-
 	* e-msg-composer-hdrs.c (get_account_store_url): don't dereference
 	a null url or create an empty one.
 
@@ -212,8 +151,9 @@
 	
 	** See bug #315987
 
-	* e-msg-composer-hdrs.c (create_from_optionmenu): Load the account
-	info in the From header only if the account is enabled
+	* e-msg-composer-hdrs.c: (create_from_optionmenu):
+	Load the account info in the From header only if the
+	account is enabled
 
 2005-10-04  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -226,9 +166,9 @@
 
 	** See bug 317337
 
-	* e-msg-composer.c (e_msg_composer_new_with_message): Set the
-	proper account name in account_name, so that the from header is
-	set properly.
+	* e-msg-composer.c: (e_msg_composer_new_with_message):
+	Set the proper account name in account_name, so that
+	the from header is set properly.
 	
 2005-08-22  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -269,7 +209,7 @@
 
 2005-07-26  Jody Goldberg <jody@gnome.org>
 
-	* Makefile.am: Fix build breakage due to extra whitespace after a
+	* Makefile.am : Fix build breakage due to extra whitespace after a
 	  backslash.
 
 2005-07-26  Harish Krishnaswamy  <kharish@novell.com>
@@ -277,7 +217,6 @@
 	* Makefile.am: Fix make distcheck issues.
 
 2005-07-21 Devashish Sharma <sdevashish@novell.com>
-
 	* e-message-composer.c: Added Shortcut for Save Draft
 	-(Ctrl+Shift+s) and a toolbar button for the same.
 	Fixes #219242
@@ -302,15 +241,14 @@
 
 	** See bug #309869
 
-	* e-msg-composer-hdrs.c: moves the focus to the corresponding
+        * e-msg-composer-hdrs.c: moves the focus to the corresponding
 	header buttons' entry fields.
 
 2005-07-13  Kjartan Maraas  <kmaraas@gnome.org>
 
-	* e-msg-composer-select-file.c (select_attach_response): Don't
+	* e-msg-composer-select-file.c: (select_attach_response): Don't
 	leak the file name here.
-
-	* e-msg-composer.c (build_message): Don't allocate charset twice.
+	* e-msg-composer.c: (build_message): Don't allocate charset twice.
 
 2005-07-13  Tor Lillqvist  <tml@novell.com>
 
@@ -322,12 +260,11 @@
 	* Makefile.am: Removed em-attachment* from the build.
 	Remains in the CVS, just incase to revert in case of issues.
 	Should go away after 2.3.5.
-
-	* e-msg-composer.c (add_inlined_images, build_message):
-	(menu_file_close_cb, setup_ui, attach_message, drop_action):
-	(e_msg_composer_unrealize, create_composer, handle_mailto):
-	(e_msg_composer_add_header): Changed the code to use
-	e_attachment_* from em_attachment*
+	
+	* e-msg-composer.c: (add_inlined_images) (build_message) (menu_file_close_cb) 
+	(setup_ui) (attach_message) (drop_action) (e_msg_composer_unrealize) 
+	(create_composer) (handle_mailto) (e_msg_composer_add_header)
+	Changed the code to use e_attachment_* from em_attachment*
 
 	* e-msg-composer.h: Added removed old header includes
 
@@ -351,18 +288,15 @@
 
 	* e-msg-composer-select-file.c (select_attach_response): Show
 	attachment bar when attachments are added
-
-	* e-msg-composer.c (attachment_bar_changed_cb, drop_action),
-	(drag_data_received, create_composer): Added support to DnD
-	targets to the composer GtkHTML window. Also show the attachment
-	bar when there are attachments and hide when all attachments are
-	removed.
+	e-msg-composer.c (attachment_bar_changed_cb), (drop_action),
+	(drag_data_received), (create_composer): Added support to
+	DnD targets to the composer GtkHTML window. Also show the 
+	attachment bar when there are attachments and hide when all
+	attachments are removed.
 	 
 2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
-
-	* e-msg-composer-attachment.c
-	(e_msg_composer_attachment_new_from_mime_part); Fixed a bug, which
-	considered forwarded mails as remote files.
+	* e-msg-composer-attachment.c (e_msg_composer_attachment_new_from_mime_part);
+	Fixed a bug, which considered forwarded mails as remote files.
 
 2005-05-24  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -371,18 +305,18 @@
 
 2005-05-23  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-msg-composer-attachment-bar.[c,h]:
-	* e-msg-composer-attachment.[c,h]: 
-	* e-msg-composer.[c,h]:
-	* mail-composer.error.xml: Added attachment of remote URL. The dnd
-	  of url, downloads the files and attaches to the mail.
+	* e-msg-composer-attachment-bar.c, e-msg-composer-attachment-bar.h,
+	  e-msg-composer-attachment.c, e-msg-composer-attachment.h, e-msg-composer.c,
+	  e-msg-composer.h, mail-composer.error.xml : Added attachment of remote URL.
+	  The dnd of url, downloads the files and attaches to the mail.
+
 
 2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-msg-composer.c (set_editor_text, menu_edit_delete_all_cb)
-	(setup_ui, attachment_bar_changed_cb, create_composer)
-	(e_msg_composer_new_from_url): Removed the expander in the
-	composer attachment and made it visible all the times.
+	* e-msg-composer.c (set_editor_text) (menu_edit_delete_all_cb)
+	  (setup_ui) (attachment_bar_changed_cb) (create_composer)
+	  (e_msg_composer_new_from_url): Removed the expander in the 
+	  composer attachment and made it visible all the times.
 	  
 2005-05-16  Not Zed  <NotZed@Ximian.com>
 
@@ -466,8 +400,7 @@
 
 	* e-msg-composer-attachment-bar.c:
 	(e_msg_composer_attachment_bar_new):
-
-	* e-msg-composer.c (create_composer):
+	* e-msg-composer.c: (create_composer):
 
 2005-02-10  Not Zed  <NotZed@Ximian.com>
 
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 512acab0dc..c543244bc0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1782,19 +1782,8 @@ add_to_bar (EMsgComposer *composer, GSList *names, int is_inline)
 	EMsgComposerPrivate *p = composer->priv;
 
 	while (names) {
-		CamelURL *url;
-		
-		if (!(url = camel_url_new (names->data, NULL)))
-			continue;
-		
-		if (!g_ascii_strcasecmp (url->protocol, "file")) {		
-			e_attachment_bar_attach((EAttachmentBar *)p->attachment_bar, url->path, is_inline ? "inline" : "attachment");
-		} else {
-			e_attachment_bar_attach_remote_file ((EAttachmentBar *)p->attachment_bar, names->data, is_inline ? "inline" : "attachment");			
-		}
-		
-		camel_url_free (url);
-		names = names->next;
+		e_attachment_bar_attach((EAttachmentBar *)p->attachment_bar, names->data, is_inline ? "inline" : "attachment");
+		names = g_slist_next(names);
 	}
 }
 	
@@ -2924,9 +2913,8 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 	CamelURL *url;
 	CamelMimeMessage *msg;
 	char *content_type;
-	int i, success = FALSE, delete = FALSE;
+	int i, success=FALSE, delete=FALSE;
 	EMsgComposerPrivate *p = composer->priv;
-	gboolean is_image;
 	
 	switch (info) {
 	case DND_TYPE_MESSAGE_RFC822:
@@ -2955,33 +2943,37 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		
 		for (i = 0; urls[i] != NULL; i++) {
 			str = g_strstrip (urls[i]);
-			if (str[0] == '#' || str[0] == '\0') {
-				g_free (str);
+			if (urls[i][0] == '#') {
+				g_free(str);
 				continue;
 			}
-			
+
 			if (!g_ascii_strncasecmp (str, "mailto:", 7)) {
 				handle_mailto (composer, str);
+				g_free (str);
 			} else {
-				if (!(url = camel_url_new (str, NULL))) {
+				url = camel_url_new (str, NULL);
+
+				if (url == NULL) {
 					g_free (str);
 					continue;
 				}
-				
+
 				if (!g_ascii_strcasecmp (url->protocol, "file")) {
-					type = attachment_guess_mime_type (str);
-					if (strncmp (type, "image", 5) || (!p->send_html && !strncmp (type, "image", 5)))
-						e_attachment_bar_attach (E_ATTACHMENT_BAR (p->attachment_bar),
-									 url->path, "attachment");
+						type=attachment_guess_mime_type (str);
+						if (strncmp (type, "image", 5) || (!p->send_html && !strncmp (type, "image", 5)))
+							e_attachment_bar_attach
+							(E_ATTACHMENT_BAR (p->attachment_bar),
+						 	url->path,
+							"attachment");
 				} else	{
-					e_attachment_bar_attach_remote_file (E_ATTACHMENT_BAR (p->attachment_bar),
-									     str, "attachment");
+					e_attachment_bar_attach_remote_file 
+						(E_ATTACHMENT_BAR (p->attachment_bar),
+						str);
 				}
-				
+				g_free (str);
 				camel_url_free (url);
 			}
-			
-			g_free (str);
 		}
 		
 		g_free (urls);
@@ -2996,11 +2988,13 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		camel_mime_part_set_content (mime_part, selection->data, selection->length, content_type);
 		camel_mime_part_set_disposition (mime_part, "inline");
 		
-		e_attachment_bar_attach_mime_part (E_ATTACHMENT_BAR (p->attachment_bar), mime_part);
+		e_attachment_bar_attach_mime_part
+			(E_ATTACHMENT_BAR (p->attachment_bar),
+			 mime_part);
 		
 		camel_object_unref (mime_part);
 		g_free (content_type);
-		
+
 		success = TRUE;
 		break;
 	case DND_TYPE_X_UID_LIST: {
@@ -3094,9 +3088,10 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
 		break;
 	}
 
-	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar)))
+	if (e_attachment_bar_get_num_attachments(E_ATTACHMENT_BAR(p->attachment_bar))) {
 		show_attachments (composer, TRUE);
-	
+	}
+
 	gtk_drag_finish(context, success, delete, time);
 }
 
@@ -6265,6 +6260,7 @@ e_msg_composer_insert_paragraph_after (EMsgComposer *composer)
 	if (!p->in_signature_insert) {
 	      CORBA_char *orig, *signature;
 	      /* FIXME check for insert-paragraph command */
+	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "text-default-color", &ev);
 	      GNOME_GtkHTML_Editor_Engine_runCommand (p->eeditor_engine, "italic-off", &ev);
 	
 	      orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (p->eeditor_engine, "orig", &ev);
diff --git a/configure.in b/configure.in
index 5621422395..6c678da95b 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.7.2.1, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 2.6.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.8
+BASE_VERSION=2.6
 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
@@ -80,8 +80,9 @@ AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
 AC_SUBST(HAVE_JW)
 
 dnl I18N stuff
-AC_PROG_INTLTOOL([0.35.0])
+AC_PROG_INTLTOOL([0.30])
 
+ALL_LINGUAS="am ar az be bg bn br bs ca cs cy da de dz el en_AU en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka ko ku lt lv mn mk ms nb ne nl nn no pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta te th tr uk vi wa xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE=evolution-$BASE_VERSION
@@ -423,18 +424,8 @@ no)
 		;;
 	esac
 esac
-
-SAVE_CFLAGS="$CFLAGS"
-SAVE_LIBS="$LIBS"
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
-CFLAGS="$CFLAGS $LDAP_CFLAGS"
-LIBS="$LIBS $LDAP_LIBS"
-AC_CHECK_FUNCS(ldap_ntlm_bind)
-CFLAGS="$SAVE_CFLAGS"
-LIBS="$SAVE_LIBS"
-
 else # Win32
-LDAP_CFLAGS="-DLDAP_DEPRECATED"
+LDAP_CFLAGS=""
 LDAP_LIBS="-lwldap32"
 AC_SUBST(LDAP_CFLAGS)
 AC_SUBST(LDAP_LIBS)
@@ -785,7 +776,6 @@ if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 	fi
 	
 	if test "x${check_manually}" = "xyes"; then
-		mozilla_nss=""
 		have_nspr_includes="no"
 		if test "x${with_nspr_includes}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"
diff --git a/data/Makefile.am b/data/Makefile.am
index 934d1c6a4b..7c4dde3d5d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -25,10 +25,10 @@ kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
 	$(INSTALL_DATA) $(kdedesktop_file) \
-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 uninstall-kde-applnk:
-	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
+	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
 
 else
 
@@ -45,16 +45,16 @@ SUBDIRS = cde_app_root
 install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
 	$(INSTALL_DATA) $(desktop_file)									\
-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ;	\
+			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
+	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 uninstall-local: uninstall-kde-applnk
-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
+	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
+	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
+	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
 
 # CDE Stuff
 
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 3f7f44ce75..c4feb62919 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,12 +1,3 @@
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-dialog-utils.c: (save_ok), (e_file_dialog_save),
-	(save_folder_ok), (e_file_dialog_save_folder): Added code
-	to enable file chooser to work with remote shares
-	* e-util.c: (e_write_file), (e_write_file_uri): Added
-	a new api to write to remote shares.
-	* e-util.h:
-
 2006-04-26  Li Yuan <li.yuan@sun.com>
 
 	* e-text-event-processor-emacs-like.c:
diff --git a/e-util/e-util.c b/e-util/e-util.c
index bfafdc8771..73a1842919 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -39,7 +39,6 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomevfs/gnome-vfs.h>
 
 #ifdef G_OS_WIN32
 #include <windows.h>
@@ -240,35 +239,6 @@ e_write_file(const char *filename, const char *data, int flags)
 }
 
 gint
-e_write_file_uri (const char *filename, const char *data)
-{
-	guint64 length = strlen(data);
-	guint64 bytes;
-	GnomeVFSResult result;
-	GnomeVFSHandle *handle = NULL;
-
-	result = gnome_vfs_create (&handle, filename, GNOME_VFS_OPEN_WRITE, TRUE, 0755);
-	if (result != GNOME_VFS_OK) {
-		g_warning ("Couldn't save item");
-		return 1;
-	}
-	
-	while (length > 0) {
-		gnome_vfs_write(handle, data, length, &bytes);
-		if (bytes > 0) {
-			length -= bytes;
-			data += bytes;
-		} else {
-			gnome_vfs_close(handle);
-			return 1;
-		}
-	}
-
-	gnome_vfs_close (handle);
-	return 0;
-}
-
-gint
 e_write_file_mkstemp(char *filename, const char *data)
 {
 	int fd;
diff --git a/evolution-zip.in b/evolution-zip.in
index ff90000c69..59d02a2f46 100755
--- a/evolution-zip.in
+++ b/evolution-zip.in
@@ -44,8 +44,8 @@ lib/evolution/@BASE_VERSION@/components/libevolution-calendar.dll
 lib/evolution/@BASE_VERSION@/components/libevolution-mail.dll
 libexec/evolution/@BASE_VERSION@/evolution-addressbook-export.exe
 libexec/evolution/@BASE_VERSION@/evolution-alarm-notify.exe
-share/mime-info/evolution-@BASE_VERSION@.keys
-share/mime-info/evolution-@BASE_VERSION@.mime
+share/mime-info/evolution.keys
+share/mime-info/evolution.mime
 share/evolution/@BASE_VERSION@/errors
 share/evolution/@BASE_VERSION@/glade
 share/evolution/@BASE_VERSION@/ecps
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 2c918ef139..6f5befb2b3 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -16,7 +16,7 @@
  <bookinfo id="Front">
   <productname>Evolution&trade;</productname>
   <productnumber>2.6</productnumber>
-  <invpartnumber>March 23, 2006</invpartnumber>
+  <invpartnumber>March 22, 2006</invpartnumber>
   <title>User Guide</title>
  </bookinfo>
 
@@ -5261,7 +5261,7 @@ Accepting and Replying to a Meeting Request</title>
     <member>www.novell.com</member>
    </simplelist>
    <para id="Bktitle">Evolution User Guide</para>
-   <para>March 23, 2006</para>
+   <para>March 22, 2006</para>
    <simplelist>
     <member>To access the online documentation for this and other Novell products, and to get updates, see www.novell.com/documentation.</member>
    </simplelist>
diff --git a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
index 63d88f626f..63d88f626f 100755
--- a/help/C/figures/Screenshot-Evolution -mailer-Preferences.png
+++ b/help/C/figures/Screenshot-Evolution-mailer-Preferences.png
diff --git a/help/ChangeLog b/help/ChangeLog
index bdc623e47f..66d8d8655c 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -2,7 +2,7 @@
 
  	* C/evolution.xml: fixing 3 bugs. Fixes bug 339094.
 
-2006-03-23  Andre Klapper  <a9016009@gmx.de>
+2006-03-22  Andre Klapper  <a9016009@gmx.de>
 
  	* C/evolution.xml: Updating the doc for 2.6 and fixing bugs which went
 	in by updating the doc for 2.6.
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 8074c83042..69018ea10b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,63 +1,9 @@
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Added remote shares save/load support across evolution.
-	
-	* em-utils.c: (emu_file_check_local), (emu_get_save_filesel),
-	(emu_save_part_response), (emu_save_parts_response),
-	(emu_save_messages_response): Added code to save messages/attachments
-	to remote shares.
-	* mail-ops.c: (save_messages_save), (save_part_save):
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** fixes bug #342092
-	
-	* em-popup.c: (emp_standard_menu_factory): Read the mime
-	from the right file.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	Added support for collapsible headers for To/Cc/Bcc fields.
-
-	* em-folder-view.c: (emfv_format_link_clicked), (emfv_on_url_cb):
-	* em-format-html-display.c: (efhd_html_button_press_event),
-	(efhd_html_link_clicked), (efhd_html_on_url), (efhd_format_clone):
-	* em-format-html.c: (efh_url_requested), (efh_format_text_header),
-	(efh_format_address), (efh_format_header):
-	* em-format-html.h:
-	* em-mailer-prefs.c: (address_compress_count_changed),
-	(toggle_button_init), (em_mailer_prefs_construct):
-	* em-mailer-prefs.h:
-	* evolution-mail.schemas.in.in:
-	* mail-config.c: (gconf_address_count_changed),
-	(gconf_address_compress_changed), (mail_config_init),
-	(mail_config_get_labels), (mail_config_get_address_count):
-	* mail-config.glade:
-	* mail-config.h:
-
-2006-05-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #342676
-	
-	* message-list.c: (ml_duplicate_value), (ml_free_value),
-	(ml_initialize_value), (ml_value_is_empty), (ml_value_to_string):
-	* message-list.etspec: Fixed the column sorter right.
-
 2006-05-04  Jeffrey Stedfast  <fejj@novell.com>
 
 	* mail-component.c (mail_component_remove_store): Ref the store
 	before removing the store from our hash and cache. Should fix
 	Novell bug #166987.
 
-2006-04-30  Shi Pu <shi.pu@sun.com>
- 
-	** Fixes bug #323853
-
-	* em-composer-prefs.c (sig_edit_cb, sig_add_script_response):
-	* em-mailer-prefs.c (notify_sound_changed, em_mailer_prefs_construct):
-	* em-mailer-prefs.h:
-	* mail-config.glade: Replace GnomeFileEntry by GtkFileChooserButton.
- 
 2006-04-27  Rodney Dawes  <dobey@novell.com>
 
 	* em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty rather
@@ -66,56 +12,6 @@
 	* em-folder-view.c (emfv_popup_items[]): Don't set an icon for Undelete
 	(emfv_message_pixmaps[]): Don't set an icon for Undelete and set the
 	icon for deleting a message to gnome-fs-trash-empty, not stock_delete
-
-	Fixes #339626
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from Victor for adding a Sender header to message list.
-
-	* message-list.c (ml_duplicate_value, ml_free_value),
-	(ml_initialize_value, ml_value_is_empty, ml_value_to_string),
-	(ml_tree_value_at): Handled the new column header.
-
-	* message-list.etspec: Added a new column header to spec.
-
-	* message-list.h: Added a new column
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-view.c (emfv_setup_view_instance): Comparing the
-	FolderInfo flags right, to make Mailbox to show From header in
-	message list for groupwise servers.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #323402
-
-	* em-folder-tree.c (folder_tree_new): Code for Ellipsizing folder
-	tree. (Patch from Vincent Noel)
-
-	* em-migrate.c: Adding side_bar_search to 
-
-	* evolution-mail.schemas.in.in: Adding a schema for enabling/disabling
-	side bar search. (Patch from Rakesh)
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* mail-session.c (get_password): Ask passphrase if the user is
-	supposed to enter the same.
-
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-format-html-display.c (efhd_attachment_button),
-	(efhd_format_attachment): Added code to create image cache of
-	image attachment in the ethread instead of main thread to avoid
-	gui lockup.
-
-2006-04-21  Sankar P  <psankar@novell.com>
-
-	* mail-mt.c (do_op_status): Fix the cryptic
-	hexa-status-bar-message.  The problem still lies somewhere. But
-	dont show something weird to the user.
 	
 2006-04-20  Jeffrey Stedfast  <fejj@novell.com>
 
@@ -142,7 +38,6 @@
 2006-04-10  Jeff Cai <jeff.cai@sun.com>
 
 	** Fixes 333243
-
 	* em-folder-tree-model.c (em_folder_tree_model_remove_folders):
 	For null uri, don't need remove it.
 
@@ -153,43 +48,22 @@
 	* message-list.c (mail_folder_hide_by_flag):
 	If CamelMessageInfo is null, don't free it.
 
-2006-03-29  Parthasarathi Susarla <sparthasarathi@novell.com>
-	
-	* em-folder-view.c (smfv_setup_view_instance): use the flags
-	CAMEL_STORE_FOLDER_INFO_SUBSCRIBED instead of
-	CAMEL_STORE_FOLDER_INFO_FAST when getting folder info
-
-2006-03-25  Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in>
-
-	**Fixes #329585
-
-	* mail-config.glade: Changed Remove button to Delete button
-
-	* mail.error.xml: Changed current Layout DELETE [Do not delete] to
-	[Do not delete] DELETE
-
 2006-03-22  Patrick Ohly  <patrick.ohly@intel.com>
 
-	* em-utils.c (em_utils_selection_set_urilist): Fixed premature
-	memory free. Fixes bug #335203.
+	* em-utils.c (em_utils_selection_set_urilist):
+	Fixed premature memory free. Fixes bug #335203.
 
 2006-03-21  Simon Zheng  <simon.zheng@sun.com>
 
-	Fixed bug #326571
+	Fixes bug #326571
+	* em-utils.c (em_filename_make_safe), (emu_get_save_filesel),
+	(emu_save_parts_response):
+	Add em_filename_make_safe(), and use it to allow filenames
+	contain more valid characters when saving attachment.
 
-	* em-utils.c (em_filename_make_safe, emu_get_save_filesel):
-	(emu_save_parts_response): Add em_filename_make_safe(), and use it
-	to allow filenames contain more valid characters when saving
-	attachments.
+2006-03-12  Takeshi AIHANA <takeshi.aihana@gmail.com>
 
-2006-03-20  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* em-folder-view.c (emfv_setup_view_instance): Added code to set
-	the mail view column for sent folder.
-
-2006-03-12  Frank Arnold  <farnold@cvs.gnome.org>
-
-	* default/de/Inbox: Updated German translation of default inbox.
+	* default/ja/Inbox: Updated Japanese translation.
 
 2006-03-06  Simon Zheng  <simon.zheng@sun.com>
 
@@ -200,7 +74,7 @@
 
 2006-03-03  Andre Klapper  <a9016009@gmx.de>
 
-	* configure.in:
+	* configure.in
 
 	* mail/default/Makefile.am: added support for macedonian (mk)
 	welcome message
@@ -212,12 +86,13 @@
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
 	* default/Makefile.am: Added Lithuanian to SUBDIRS.
+
 	* default/lt/*: Added Lithuanian translation for default mailbox.
 
 2006-03-02  Ilkka Tuohela  <hile@iki.fi>
 
-	* fi.po: Updated Finnish inbox to actually use 2.6 example, not
-	the old one...
+	* fi.po: Updated Finnish inbox to actually use 2.6 example,
+	         not the old one...
 
 2006-03-01  Ilkka Tuohela  <hile@iki.fi>
 
@@ -596,19 +471,19 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 	* mail-tools.c (mail_tool_get_local_movemail_path):
 	Use e_util_mkdir_hier() instead of e_mkdir_hier().
 
-	Use e_util_strstrcase() instead of e_strstrcasea().
+        Use e_util_strstrcase() instead of e_strstrcasea().
     
-	use e_strftime() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
+        use e_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
  
-	use e_filename_make_safe() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
-	
-	use e_utf8_strftime() in evolution-data-server/
-	libedataserver/e-data-server-util.c instead of the copy in 
-	evolution/e-util/e-util.c.
+ 	use e_filename_make_safe() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
+        
+        use e_utf8_strftime() in evolution-data-server/
+        libedataserver/e-data-server-util.c instead of the copy in 
+        evolution/e-util/e-util.c.
 
 2006-01-06  Andre Klapper <a9016009@gmx.de>
 
@@ -706,7 +581,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 2005-12-22  Andre Klapper <a9016009@gmx.de>
 
 	* mail-config.glade: changed one duplicated mnemonic.
-	  Fixes bug 313801.
+          Fixes bug 313801.
 
 2005-12-20  Andre Klapper <a9016009@gmx.de>
 
@@ -716,7 +591,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 2005-12-19  Andre Klapper <a9016009@gmx.de>
 
 	* mail-config.glade: changed 3 HIG-violating mnemonics.
-	  Fixes bug 256913.
+          Fixes bug 256913.
 
 2005-12-23  Srinivasa Ragavan  <sragavan@novell.com>
 
@@ -3651,8 +3526,8 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 
 2004-07-13  Dan Winship  <danw@novell.com>
 
-	* em-utils.c (em_utils_selection_set_urilist):
-	(em_utils_temp_save_part): free return value from e_mkdtemp
+	* em-utils.c (em_utils_selection_set_urilist,
+	em_utils_temp_save_part): free return value from e_mkdtemp
 
 2004-07-09  Not Zed  <NotZed@Ximian.com>
 
@@ -7070,9 +6945,9 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 
 2004-02-01  Bill Zhu <bill.zhu@sun.com>
 
-	Fixes for bug #53530
+        Fixes for bug #53530
 
-	* em-utils.c (em_utils_redirect_message): Removed the duplicate 
+        * em-utils.c (em_utils_redirect_message): Removed the duplicate 
 	adding of attachments
 
 2004-01-30  Jeffrey Stedfast  <fejj@ximian.com>
@@ -7574,7 +7449,7 @@ t2006-02-20  Parthasarathi Susarla <sparthasarathi@novell.com>
 	(config_write_style): use MAIL_CONFIG_RC_DIR
 	(mail_config_init): ditto
 
-	see http://bugzilla.ximian.com/show_bug.cgi?id=52969
+        * see http://bugzilla.ximian.com/show_bug.cgi?id=52969
 
 2004-01-19  Not Zed  <NotZed@Ximian.com>
 
diff --git a/mail/default/ja/Inbox b/mail/default/ja/Inbox
index 1ef951e003..6f26769ad2 100644
--- a/mail/default/ja/Inbox
+++ b/mail/default/ja/Inbox
@@ -1,29 +1,28 @@
-From evolution@ximian.com Tue Sep 25 07:45:12 2001
-Return-Path: <evolution@ximian.com>
-Received: from pop.ximian.com (IDENT:mail@localhost [127.0.0.1]) by
-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20680; Tue, 25 Sep 2001
+From evolution@novell.com Wed Mar 15 12:00:00 2006
+Return-Path: <evolution@novell.com>
+Received: from pop.novell.com (IDENT:mail@localhost [127.0.0.1]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20680; Wed, 15 Mar 2006
 	07:45:12 -0400
-Received: from smtp.ximian.com (smtp.ximian.com [141.154.95.10]) by
-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
-	<evolution@ximian.com>; Tue, 25 Sep 2001 07:45:10 -0400
-Received: (qmail 5610 invoked from network); 25 Sep 2001 11:45:02 -0000
-Received: from smtp.ximian.com (HELO localhost) (141.154.95.10) by
-	pop.ximian.com with SMTP; 25 Sep 2001 11:45:02 -0000
-From: "The Evolution Team" <evolution@ximian.com>
-To: Evolution Users <evolution@ximian.com>
+Received: from smtp.novell.com (smtp.novell.com [141.154.95.10]) by
+	pop.novell.com (8.9.3/8.9.3) with ESMTP id HAA20659 for
+	<evolution@novell.com>; Wed, 15 Mar 2006 07:45:10 -0400
+Received: (qmail 5610 invoked from network); 15 Mar 2006 12:00:00 -0000
+Received: from smtp.novell.com (HELO localhost) (141.154.95.10) by
+	pop.novell.com with SMTP; 15 Mar 2006 12:00:00 -0000
+From: "Evolution =?ISO-2022-JP?B?GyRCMytILyVBITwlYBsoQg==?=" <evolution@novell.com>
+To: Evolution =?ISO-2022-JP?B?GyRCJWYhPCU2TU0bKEI=?= <evolution@novell.com>
 Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"
-X-Mailer: Evolution/1.1.99 (Preview Release)
-Date: 25 June 2002 14:45:00 +0300
+X-Mailer: Evolution 2.6.0
+Date: 15 March 2006 12:00:00 +0000
 Message-Id: <1001418302.27070.20.camel@spectrolite>
 Mime-Version: 1.0
 Content-Type: Text/Plain; charset=iso-2022-jp
-Content-Transfer-Encoding: 7bit
 Subject: Evolution =?ISO-2022-JP?B?GyRCJFgkaCQmJDMkPRsoQiE=?=
-Sender: evolution@ximian.com
-Errors-To: evolution@ximian.com
+Sender: evolution@novell.com
+Errors-To: evolution@novell.com
 X-Mailman-Version: 1.1
 Status:   
-X-Evolution-Source: pop://rupert@pop.ximian.com/inbox
+X-Evolution-Source: pop://rupert@pop.novell.com/inbox
 X-Evolution: 00000ddd-0030
 
 
@@ -36,47 +35,49 @@ Content-Type: text/plain; charset=iso-2022-jp
 Content-Transfer-Encoding: 7bit
 
 
-
-Evolution $B3+H/%A!<%`$O!"$"$J$?$,%a!<%k$d8D?M>pJs$r4IM}$9$k(B
-Evolution $B%7%9%F%`$rF3F~$7$F$/$l$?$3$H$r$H$F$b8w1I$K;W$$$^$9!#(B
+Evolution $B3+H/%A!<%`$O!"$"$J$?$K%a!<%k$d8D?M>pJs$r$^$H$a$F4IM}$G$-$k(B Evolution $B%7%9%F%`$r>R2p$9$k$3$H$,$G$-$F!"$H$F$b8w1I$K;W$$$^$9!#(B
 
 
-$B$O$8$a$K(B
+$B$O$8$a$F$_$h$&(B
 
-        Evolution $B$N%&%#%s%I%&:8B&$K$O!"$"$J$?$N$9$Y$F$N%a!<%k(B
-	$B%U%)%k%@$X$N%7%g!<%H%+%C%H$r4^$`%5%$%I%P!<$,$"$j$^$9!#(B
-	$B$=$N2<$NJ}$K$O%+%l%s%@!<$d%3%s%?%/%H!"%?%9%/!"%a!<%k(B
-	$B%\%?%s$,$"$j$^$9!#(B
+	Evolution $B%&%#%s%I%&$N:8B&$K$O!"A4$F$N%a!<%k!&%U%)%k%@$KAGAa$/%"%/%;%9$G$-$k%5%$%I%P!<$,$"$j$^$9!#$=$N2<$K$O!"%+%l%s%@$dO"Mm@h!"%?%9%/!"%a!<%k!"$=$7$F%a%bD"$rI=<($9$k%\%?%s$,$"$j$^$9!#(B
 
-        $B40A4$J(B Evolution $B%,%$%I$r8f4uK>$J$i!"(B"$B%X%k%W(B"$B%a%K%e!<$+$i(B
-        "$BL\<!(B"$B$rA*Br$9$k$+!"(BF1 $B%-!<$r2!$7$F2<$5$$!#(B
+	"$B%X%k%W(B" $B%a%K%e!<$N(B "$BL\<!(B" $B$r%/%j%C%/$9$k$+!"$^$?$O(B [F1] $B%-!<$r2!$9$H!"(BEvolution $B$N%f!<%6!&%,%$%I$,I=<($5$l$^$9!#(B
 
-$B?75,5!G=(B
+$B?7$7$$5!G=(B
 
-        Evolution 2.0 $B$G$O?7$?$K(B Novell GroupWise $B%5!<%P!<(B (6.5.3
-        $B0J>e(B)$B$H(B Exchange 2000/2003 $B$X$N@\B3%5%]!<%H$,DI2C$5$l$^$7$?!#(B
-        $BB>$K?75,5!G=$H$7$F!"LBOG%a!<%k%U%#%k%?!"(BS/MIME $B%;%-%e%j%F%#!"(B
-	IMAP $B$N%*%U%i%$%s%5%]!<%H$N8~>e!"(BNNTP (news) $B$N%5%]!<%H!"(B
-	$B%&%'%V%+%l%s%@!<I=<(!"J#?t$N%+%l%s%@!<$N=E$M9g$o$;!"$=$7$F(B
-	$B%3%s%?%/%H!"%+%l%s%@!<!"%?%9%/%G!<%?$K%"%/%;%9$9$k$?$a$N(B
-	$B?7$7$$3+H/<T8~$1(B API $B$r4^$s$G$$$^$9!#(B
+	Evolution $B%P!<%8%g%s(B 2.6 $B$K$O<!$N$h$&$J5!G=$,$"$j$^$9(B:
+	
+	# $B%a%b$r5-O?$9$k%3%s%]!<%M%s%H$rDI2C$7$^$7$?(B
+	# $B%$%Y%s%H(B/$B%?%9%/(B/$B2q5D$NJT=8%@%$%"%m%0$NI=<($r:~?7$7$^$7$?(B
+	# $B%+%l%s%@>pJs$r30It$K8x3+$G$-$^$9(B
+	# CalDAV $B$r%5%]!<%H$7$^$7$?(B
+	# Network Manager $B$r%5%]!<%H$7$^$7$?(B
+	# HULA $B$r%5%]!<%H$7$^$7$?(B ($B@\B3$N$_(B)
+	# GroupWise $B$N5!G=$r2~A1$7$^$7$?(B
+	# $B7+$jJV$7H/@8$9$k%$%Y%s%H$N5!G=$r2~A1$7$^$7$?(B
+	# $B%+%l%s%@>e$N%$%Y%s%H$K%D!<%k%A%C%W$rI=<($G$-$k$h$&$K$J$j$^$7$?(B
+    # Mozilla$B!"(BOutlook$B!"$=$7$F(B Evolution $B%U%)!<%^%C%H$KBP1~$7$?(B CSV/tab $B$r<h$j9~$a$^$9(B
+    # $BO"Mm@h0lMw$G$O(B LDAP $B7A<0$N%"%I%l%9D"$r%5%]!<%H$7$^$7$?(B
+   	# $B%"%I%l%9D"$G$O3HD%8!:w$N7k2L$rJ]B8$G$-$k$h$&$K$J$j$^$7$?(B
+	# $B%a!<%k:n@.$G$O!"%a%C%;!<%8$KM%@h=g0L$rIU$1$k$3$H$,$G$-$k$h$&$K$J$j$^$7$?(B
+	# $B%P%0$r$?$/$5$s=$@5$7!"%f!<%6!&%$%s%?%U%'!<%9$r$5$i$K2~A1$7$^$7$?(B
 
-$BIT6q9g$NJs9p(B
+$B%P%0$NJs9p(B
 
-        $BIT6q9g$O(B http://bugzilla.ximian.com $B$^$G8fJs9p2<$5$$!#(B
+	Evolution $B$NIT6q9g$O(B http://bugzilla.gnome.org $B$^$GJs9p2<$5$$!#(B
 
-$B$b$C$H>\$7$/(B
+$B$5$i$K>\:Y$J>pJs(B
 
-	Evolution $B%f!<%6!<8~$1%a!<%j%s%0%j%9%H$K;22C$9$k$3$H$,(B
-	$B$G$-$^$9(B:
-	http://lists.ximian.com/mailman/listinfo/evolution
+    http://mail.gnome.org/mailman/listinfo/evolution-list
+    $B$G(B Evolution $B$N%f!<%68~$1%a!<%j%s%0%j%9%H$r9VFI$G$-$^$9!#(B
 
-	Evolution $B%W%m%8%'%/%H$N>pJs$K$D$$$F$O(B
-        http://www.gnome.org/projects/evolution $B$X!#(B
+    Evolution $B%W%m%8%'%/%H$K$D$$$F$O(B http://www.gnome.org/projects/evolution $B$r$4Mw2<$5$$!#(B
 
 
-$B7I6q!"(B
+$B7I6q(B
 Evolution $B3+H/%A!<%`(B
+evolution@novell.com
 
 
 
@@ -90,7 +91,8 @@ Content-Type: text/html; charset=utf-8
   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
   <META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99">
 </HEAD>
-<BODY BGCOLOR="#f8fcf8"><TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
+<BODY BGCOLOR="#f8fcf8">
+<TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
 <TR>
 <TD ALIGN="left" VALIGN="top">
 <IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0" WIDTH="8" HEIGHT="8"></TD>
@@ -115,11 +117,7 @@ Content-Type: text/html; charset=utf-8
 <TD>
 </TD>
 <TD>
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution 開発チーム</FONT></B></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4">は、あなたがメールや個人情報を管理する</FONT></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution</FONT></B></FONT SIZE="4">
-<FONT COLOR="#f8fcf8"><FONT SIZE="4">システムを導入してくれたことをとても光栄に思います。</FONT></FONT SIZE="4">
-</TD>
+<FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution 開発チーム</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4">は、あなたにメールや個人情報をまとめて管理できる </FONT></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4"><B>Evolution システム</FONT></B></FONT SIZE="4"><FONT COLOR="#f8fcf8"><FONT SIZE="4">を紹介することができて、とても光栄に思います。</FONT></FONT SIZE="4"></TD>
 <TD>
 </TD>
 <TD>
@@ -146,56 +144,66 @@ Content-Type: text/html; charset=utf-8
 </TD>
 </TR>
 </TABLE>
-<h2>はじめに</h2>
+<h2>はじめてみよう</h2>
 
 <blockquote>
-	Evolution のウィンドウ左側には、あなたのすべてのメール
-	フォルダへのショートカットを含むサイドバーがあります。
-	その下の方にはカレンダーやコンタクト、タスク、メール
-	ボタンがあります。
+	Evolution ウィンドウの左側には、全てのメール・フォルダに素早くアクセスできるサイドバーがあります。その下には、カレンダや連絡先、タスク、メール、そしてメモ帳を表示するボタンがあります。
+<br><br>
+    <b>ヘルプ</b>メニューの<b>目次</b>をクリックするか、または <b>[F1]</b> キーを押すと、Evolution のユーザ・ガイドが表示されます。
 <br><br>
-        完全な Evolution ガイドを御希望なら、<b>ヘルプ</b>メニューから
-        <b>目次</b>を選択するか、<b>F1</b> キーを押して下さい。
 </blockquote>
 
-<h2>新規機能</h2>
+<h2>新しい機能</h2>
 <blockquote>
-        Evolution 2.0 では新たに Novell GroupWise サーバー (6.5.3
-        以上)と Exchange 2000/2003 への接続サポートが追加されました。
-        他に新規機能として、迷惑メールフィルタ、S/MIME セキュリティ、
-	IMAP のオフラインサポートの向上、NNTP (news) のサポート、
-	ウェブカレンダー表示、複数のカレンダーの重ね合わせ、そして
-	コンタクト、カレンダー、タスクデータにアクセスするための
-	新しい開発者向け API を含んでいます。
+	Evolution バージョン 2.6 には次のような機能があります: 
+	<ul>
+	<li>メモを記録するコンポーネントを追加しました</li>
+	<li>イベント/タスク/会議の編集ダイアログの表示を刷新しました</li>
+	<li>カレンダ情報を外部に公開できます</li>
+	<li>CalDAV をサポートしました</li>
+	<li>Network Manager をサポートしました</li>
+	<li>HULA をサポートしました (接続のみ)</li>
+	<li>GroupWise の機能を改善しました</li>
+	<li>繰り返し発生するイベントの機能を改善しました</li>
+	<li>カレンダ上のイベントにツールチップを表示できるようになりました</li>
+	<li>Mozilla、Outlook、そして Evolution フォーマットに対応した CSV/tab を取り込めます</li>
+	<li>連絡先一覧では LDAP 形式のアドレス帳をサポートしました</li>
+	<li>アドレス帳では拡張検索の結果を保存できるようになりました</li>
+	<li>メール作成では、メッセージに優先順位を付けることができるようになりました</li>
+	<li>バグをたくさん修正し、ユーザ・インタフェースをさらに改善しました</li>
+	</ul>
+<br>
 </blockquote>
 
-<h2>不具合の報告</h2>
+<h2>バグの報告</h2>
 <blockquote>
-        不具合は <a href="http://bugzilla.ximian.com">http://bugzilla.ximian.com</a> まで御報告下さい。
+	Evolution の不具合は <a href="http://bugzilla.gnome.org">http://bugzilla.gnome.org</a> まで報告して下さい。
+<br><br>
 </blockquote> 
 
-<h2>もっと詳しく</h2>
+<h2>さらに詳細な情報</h2>
 
 <blockquote>
-	Evolution ユーザー向けメーリングリストに参加することが
-	できます:
-	<a href="http://lists.ximian.com/mailman/listinfo/evolution">http://lists.ximian.com/mailman/listinfo/evolution</a>.
-
-	Evolution プロジェクトの情報については
-	<a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a> へ。
- </blockquote>
-
+	<a
+	href="http://lists.gnome.org/mailman/listinfo/evolution">http://lists.gnome.org/mailman/listinfo/evolution</a> で Evolution のユーザ向けメーリングリストを講読できます。
+
+	Evolution プロジェクトについては <a href="http://www.gnome.org/projects/evolution">http://www.gnome.org/projects/evolution</a> をご覧下さい。
+	<!--
+	You can find a list of answers to Frequently Asked Questions (FAQ) at
+	<a href="http://go-evolution.org/FAQ">http://go-evolution.org/FAQ</a>.
+	-->
+<br><br>	
+</blockquote>
 
-敬具、<br>
+敬具<br>
 Evolution 開発チーム<br>
-<a href="mailto:evolution@ximian.com">evolution@ximian.com</a>
+<a href="mailto:evolution@novell.com">evolution@novell.com</a>
 
 </BODY>
 </HTML>
 
 --=-2gZ1roA/HoYrlRDVGyiM--
 
-
 --=-t4dRE6cqcdSBHOrMdTQ1
 Content-Type: image/png
 Content-ID: <1001417929.27019.9.camel@spectrolite>
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 687e4206fc..6114917750 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -475,11 +475,6 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	GtkWidget *tree;
-	gboolean side_bar_search;
-	GConfClient *gconf;
-
-	gconf = mail_config_get_gconf_client ();	
-	side_bar_search = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/side_bar_search", NULL);
 	
 	tree = gtk_tree_view_new_with_model ((GtkTreeModel *) model);
 	GTK_WIDGET_SET_FLAGS(tree, GTK_CAN_FOCUS);
@@ -492,7 +487,6 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_pixbuf, NULL, NULL);
 	
 	renderer = gtk_cell_renderer_text_new ();
-	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_tree_view_column_pack_start (column, renderer, TRUE);
 	gtk_tree_view_column_set_cell_data_func (column, renderer, render_display_name, NULL, NULL);
 	
@@ -502,8 +496,7 @@ folder_tree_new (EMFolderTree *emft, EMFolderTreeModel *model)
 	gtk_tree_view_set_headers_visible ((GtkTreeView *) tree, FALSE);
 
 	gtk_tree_view_set_search_column((GtkTreeView *)tree, COL_STRING_DISPLAY_NAME);
-	gtk_tree_view_set_enable_search((GtkTreeView *)tree, side_bar_search);
-
+	
 	return (GtkTreeView *) tree;
 }
 
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 7add999ec3..863b870e4d 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -500,7 +500,6 @@ emfv_setup_view_instance(EMFolderView *emfv)
 	gboolean outgoing;
 	char *id;
 	static GalViewCollection *collection = NULL;
-	CamelFolderInfo *fi = NULL;
 
 	g_assert(emfv->folder);
 	g_assert(emfv->folder_uri);
@@ -559,12 +558,8 @@ emfv_setup_view_instance(EMFolderView *emfv)
 	id = mail_config_folder_to_safe_url (emfv->folder);
 	p->view_instance = gal_view_instance_new (collection, id);
 	g_free (id);
-
-	fi = camel_store_get_folder_info (emfv->folder->parent_store,
-					  emfv->folder->full_name,
-					  CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
-					  NULL);	
-	if (outgoing || (fi && ((fi->flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_SENT)))
+	
+	if (outgoing)
 		gal_view_instance_set_default_view(p->view_instance, "As_Sent_Folder");
 	
 	gal_view_instance_load(p->view_instance);
@@ -2427,9 +2422,6 @@ emfv_list_selection_change(ETree *tree, EMFolderView *emfv)
 static void
 emfv_format_link_clicked(EMFormatHTMLDisplay *efhd, const char *uri, EMFolderView *emfv)
 {
-	if (!strncmp (uri, "##", 2))
-		return;
-		
 	if (!g_ascii_strncasecmp (uri, "mailto:", 7)) {
 		em_utils_compose_new_message_with_mailto (uri, emfv->folder_uri);
 	} else if (*uri == '#') {
@@ -2826,8 +2818,6 @@ emfv_on_url_cb (GObject *emitter, const char *url, EMFolderView *emfv)
 			g_free(addr);
 			camel_url_free(curl);
 			camel_object_unref(cia);
-		} else if (!strncmp (url, "##", 2)) {
-			nice_url = g_strdup_printf (_("Click to hide/unhide addresses"), url);
 		} else
 			nice_url = g_strdup_printf (_("Click to open %s"), url);
 	}
diff --git a/mail/em-utils.c b/mail/em-utils.c
index d59d99fc00..76c817aa17 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -90,23 +90,6 @@ extern struct _CamelSession *session;
 
 #define d(x)
 
-static gboolean
-emu_file_check_local (const char *name)
-{
-	CamelURL *url;
-	gboolean local = FALSE;
-
-	url = camel_url_new (name, NULL);
-	if (url == NULL)
-		return TRUE;
-
-	if (!g_ascii_strcasecmp (url->protocol, "file")) 
-		local = TRUE;
-		
-	camel_url_free (url);
-
-	return local;
-}
 /**
  * em_utils_prompt_user:
  * @parent: parent window
@@ -391,7 +374,6 @@ emu_get_save_filesel (GtkWidget *parent, const char *title, const char *name, Gt
 					       GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 					       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
-	gtk_file_chooser_set_local_only (filesel, FALSE);
 #else
 	char *filename;
 
@@ -472,22 +454,20 @@ static void
 emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part)
 {
 	const char *path;
-	const char *uri;
 	
 	if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
 		path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 #else
 		path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
-
-		if (emu_file_check_local(uri) && !emu_can_save((GtkWindow *)filesel, path))
+		
+		if (!emu_can_save((GtkWindow *)filesel, path))
 			return;
 
 		emu_update_save_path(path, FALSE);
 		/* FIXME: popup error if it fails? */
-		mail_save_part(part, uri, NULL, NULL, FALSE);
+		mail_save_part(part, path, NULL, NULL, FALSE);
 	}
 
 	gtk_widget_destroy((GtkWidget *)filesel);
@@ -532,7 +512,7 @@ emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
         GSList *selected;
         if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-                path = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (filesel));
+                path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (filesel));
 #else
                 path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
@@ -647,7 +627,7 @@ emu_save_messages_response(GtkWidget *filesel, int response, struct _save_messag
 	
 	if (response == GTK_RESPONSE_OK) {
 #ifdef USE_GTKFILECHOOSER
-		path = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
+		path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
 #else
 		path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
 #endif
diff --git a/mail/message-list.c b/mail/message-list.c
index cef1a77e80..a9796afc45 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -158,8 +158,6 @@ static GtkTargetEntry ml_drop_types[] = {
 #define COL_TO_WIDTH_MIN       (32)
 #define COL_SIZE_EXPANSION     (6.0)
 #define COL_SIZE_WIDTH_MIN     (32)
-#define COL_SENDER_EXPANSION     (24.0)
-#define COL_SENDER_WIDTH_MIN     (32)
 
 enum {
 	NORMALISED_SUBJECT,
@@ -900,10 +898,10 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_FROM:
 	case COL_SUBJECT:
 	case COL_TO:
-	case COL_SENDER:		
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
 		return g_strdup (value);
+		
 	default:
 		g_assert_not_reached ();
 	}
@@ -932,7 +930,6 @@ ml_free_value (ETreeModel *etm, int col, void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:		
 		g_free (value);
 		break;
 	default:
@@ -962,7 +959,6 @@ ml_initialize_value (ETreeModel *etm, int col, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:
 		return g_strdup ("");
 	default:
 		g_assert_not_reached ();
@@ -993,7 +989,6 @@ ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:		
 		return !(value && *(char *)value);
 	default:
 		g_assert_not_reached ();
@@ -1058,7 +1053,6 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
 	case COL_TO:
 	case COL_FOLLOWUP_FLAG:
 	case COL_LOCATION:
-	case COL_SENDER:		
 		return g_strdup (value);
 	default:
 		g_assert_not_reached ();
@@ -1296,19 +1290,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
 		camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0);
 		return name;
 	}
-	case COL_SENDER:{
-		char **sender_name;
-        	str = camel_message_info_from (msg_info);
-	        if(str!=""){
-			sender_name=g_strsplit(str,"<",2);
-			return (void *)(*sender_name);
-		}
-		else
-			return (void *)("");
-		
-                g_strfreev(sender_name); 
-	}
- 	default:
+	default:
 		g_assert_not_reached ();
 		return NULL;
 	}
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 67c016c76c..0cc37aa84d 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,44 +1,37 @@
 2006-05-11  Sankar P  <psankar@novell.com>
 
-	* exchange-account-setup.c: (btn_chpass_clicked):
-	Do not print the password in the terminal.
-	
+	* exchange-account-setup.c: 
+	Do not display password in the terminal
+
 2006-05-10  Sushma Rai  <rsushma@novell.com>
-	
-	* exchange-config-listener.c (account_changed): Using the HIGified
-	notification message. 
 
-	* org-gnome-exchange-operations.error.xml: Similar,
-	Fixes #302825.
+	* exchange-account-setup.c 
+	(org_gnome_exchange_show_folder_size_factory): Not showing the worng 
+	folder size 0 KB in offline mode. See #339266.
 
 2006-05-10  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-account-setup.c (owa_authenticate_user): Display error
+	* exchange-account-setup.c (owa_authenticate_user): Display error 
 	message only in case of authentication failure and not on cancelling
 	authentication operation. Fixes #332131
 
 2006-04-19  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-contacts.c (e_exchange_contacts_commit): Setting the
+	* exchange-contacts.c (e_exchange_contacts_commit): Setting the 
 	e-source properties on both successful creation and rename of a folder.
 	
 	* exchange-calendar.c (e_exchange_calendar_commit): Similar.
 	Fixes #338876 and #328578.
 
-2006-04-19  Sushma Rai  <rsushma@novell.com>
-
-	* exchange-account-setup.c (owa_authenticate_user): Changed the 
-	function signature. Fixes #329371.
-
 2006-04-17  Sushma Rai  <rsushma@novell.com>
 
-	* exchange-contacts.c (e_exchange_contacts_check): Return TRUE in case
+	* exchange-contacts.c (e_exchange_contacts_check): Return TRUE incase
 	of non-exchange accounts.
 
-	* exchange-calendar.c (e_exchange_calendar_check): Similar. 
+	* exchange-calendar.c (e_exchange_calendar_check): Similar.
 	Fixes #338198.
 
-2006-04-10  Sushma Rai  <rsushma@novell.com>
+2006-03-10  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-operations.[ch] (is_exchange_personal_folder): Added new to
 	check if a folder is a personal folder or not.
@@ -53,7 +46,7 @@
 	(e_exchange_calendar_check)(e_exchange_calendar_commit): Similar.
 	Fixes #328813 and #315522.
 
-2006-04-06  Sushma Rai  <rsushma@novell.com>
+2006-03-10  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-operations.c (exchange_operations_update_child_esources):
 	Checking for ruri NULL.
@@ -61,11 +54,11 @@
 	* exchange-folder.c (org_gnome_exchange_check_address_book_subscribed):
 	Freeing uri.
 
-	* exchange-contacts.c (e_exchange_contacts_get_contacts): Defined as 
-	static. 
-	(e_exchange_contacts_pcontacts): Setting contacts_src_exists for GAL 
-	folder. 
-	(e_exchange_contacts_check): Checking for new folder creation and also 
+	* exchange-contacts.c (e_exchange_contacts_get_contacts): Defined as
+	static.
+	(e_exchange_contacts_pcontacts): Setting contacts_src_exists for GAL
+	folder.
+	(e_exchange_contacts_check): Checking for new folder creation and also
 	not allowing rename of GAL and Contacts folders.
 	(e_exchange_contacts_commit): Corrected the way relative URI was being
 	constructed during rename operation. Handling the return value of the
@@ -73,7 +66,7 @@
 
 	* exchange-calendar.c (e_exchange_calendar_get_calendars): Defined as a
 	static function.
-	(e_exchange_calendar_check): Not allowing the rename of standard 
+	(e_exchange_calendar_check): Not allowing the rename of standard
 	calendar and tasks folders.
 	(e_exchange_calendar_commit): Corrected the way relative URI was being
 	formed during rename operation. Also, handling the return value of the
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 80f9ef2dd6..4490dafe77 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -461,7 +461,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 		exchange_params->is_ntlm = TRUE;
 	else
 		exchange_params->is_ntlm = FALSE;
-	valid =  e2k_validate_user (owa_url, &url->user, exchange_params, 
+	valid =  e2k_validate_user (owa_url, url->user, exchange_params, 
 						&remember_password, &result);
 
 	if (!valid && result != E2K_AUTOCONFIG_CANCELLED)
@@ -928,6 +928,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	GtkVBox *vbx;
 	GtkHBox *hbx_size;
 	char *folder_name, *folder_size;
+	int mode;
 
 	service = CAMEL_SERVICE (camel_folder_get_parent_store (cml_folder));
 	if (!service)
@@ -939,11 +940,16 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
+
+	account = exchange_operations_get_exchange_account ();
+	exchange_account_is_offline (account, &mode);
+	if (mode == OFFLINE_MODE)
+		return NULL;
 	
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
-	account = exchange_operations_get_exchange_account ();
+
 	model = exchange_account_folder_size_get_model (account);
 	if (model)
 		folder_size = g_strdup_printf ("%s KB", exchange_folder_size_get_val (model, folder_name));
diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index d4ef1e5e09..695167f58e 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -3,13 +3,6 @@
 	* camel-gw-listener.c: (add_esource):
 	Add default color to the GW source created.
 	Fixes #167102 (bugzilla.novell.com).
- 
-2006-03-11  Sushma Rai  <rsushma@novell.com>
-
-	* camel-gw-listener.c (get_addressbook_names_from_server): If use_ssl
-	parameter is found use https, otherwise use http.
-	Asking for password thrice on failure. Also freeing password key.
-	(account_changed): Checking for NULL old ssl paramter. Fixes a crash.
 
 2006-01-06  Simon Zheng <simon.zheng@sun.com>
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index b21b948648..27f83a8993 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -426,8 +426,8 @@ get_addressbook_names_from_server (char *source_url)
   	char *key;
         EGwConnection *cnc;	
 	char *password;
-	GList *book_list = NULL;
-	int status, count = 0;
+	GList *book_list;
+	int status;
 	const char *soap_port;
 	CamelURL *url;
 	gboolean remember;
@@ -451,18 +451,18 @@ get_addressbook_names_from_server (char *source_url)
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
+	if (!use_ssl)
+		use_ssl = "";
 
 	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
 	
-	if (use_ssl && g_str_equal (use_ssl, "always"))
+	if (!g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
 	else 
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
 	
 	cnc = NULL;
-
 	do {
-		count ++;
 		/*we have to uncache the password before prompting again*/
 		if (failed_auth) {
 			e_passwords_forget_password ("Groupwise", key);
@@ -483,27 +483,27 @@ get_addressbook_names_from_server (char *source_url)
 			if (!password) 
 				break;
 		}
-
 		cnc = e_gw_connection_new (uri, url->user, password);
-		g_free (password);
-		if (!E_IS_GW_CONNECTION(cnc)) {
-			if (count == 3)
-				break;
+		if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
+			char *http_uri = g_strconcat ("http://", uri + 8, NULL);
+			cnc = e_gw_connection_new (http_uri, url->user, password);
+			g_free (http_uri);
 		}
 
+		g_free (password);
+
 		failed_auth = _("Failed to authenticate.\n");
 		flags |= E_PASSWORDS_REPROMPT;
 	} while (cnc == NULL);
-
-	g_free (key);
 	
 	if (E_IS_GW_CONNECTION(cnc))  {
 		book_list = NULL;	
 		status = e_gw_connection_get_address_book_list (cnc, &book_list);
 		if (status == E_GW_CONNECTION_STATUS_OK)
 			return book_list;
+	    
+		       
 	}
-
 	/*FIXME: This error message should be relocated to addressbook and should reflect 
 	 * that it actually failed to get the addressbooks*/
 	e_error_run (NULL, "mail:gw-accountsetup-error", poa_address, NULL);
@@ -674,7 +674,7 @@ add_addressbook_sources (EAccount *account)
 		g_object_unref (source);
 	}
 	e_source_list_add_group (list, group, -1);
-	e_source_list_sync (list, NULL);
+      	e_source_list_sync (list, NULL);	
 	g_object_unref (group);
 	g_object_unref (list);
 	g_object_unref (client);
@@ -939,8 +939,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
 
 		if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
 		   ||  (old_soap_port && strcmp (old_soap_port, new_soap_port)) 
-		   ||  strcmp (old_url->user, new_url->user)
-	           || (!old_use_ssl) 
+		   ||  strcmp (old_url->user, new_url->user) 
 		   || strcmp (old_use_ssl, new_use_ssl)) {
 			
 			account_removed (account_listener, account);
diff --git a/plugins/new-mail-notify/ChangeLog b/plugins/new-mail-notify/ChangeLog
index 385c54446b..738de4a321 100644
--- a/plugins/new-mail-notify/ChangeLog
+++ b/plugins/new-mail-notify/ChangeLog
@@ -15,11 +15,12 @@
 	(send_dbus_message): remove spurious check for bus==NULL.
 
 2005-07-11  Vivek Jain  <jvivek@novell.com>
-
-	* new-mail-notify.c (send_dbus_message): check whether memory
-	could be allocated. Return if the message is NULL so that we don't
-	unref it again, will save crash.  **Fixes #274329 sort of bugs, in
-	case reported even after david's fix.
+	
+	* new-mail-notify.c :(send_dbus_message)
+	check whether memory could be allocated. Return if the 
+	message is NULL so that we don't unref it again, will save crash.
+	**Fixes #274329 sort of bugs, in case reported even after 
+	david's fix.
 
 2005-05-11  Not Zed  <NotZed@Ximian.com>
 
diff --git a/po/ChangeLog b/po/ChangeLog
index e47ba2fb85..0d33a54419 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,38 +1,38 @@
-2006-05-29  Francisco Javier F. Serrador  <serrador@openshine.com>
+2006-05-28  Pema Geyleg  <pema.geyleg@gmail.com>
 
-	* es.po: Updated Spanish translation.
+	* dz.po: Updated Dzongkha translation.
 
-2006-05-28  Vincent van Adrighem  <adrighem@gnome.org>
+2006-05-27  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated.
 
-2006-05-27  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2006-05-27  Pema Geyleg  <pema.geyleg@gmail.com>
+2006-05-26  Francisco Javier F. Serrador  <serrador@openshine.com>
 
-	* dz.po: Updated Dzongkha translation.
+	* es.po: Updated Spanish translation.
 
-2006-05-26  Clytie Siddall <clytie@riverland.net.au>
+2006-05-25  Clytie Siddall <clytie@riverland.net.au>
 
 	* vi.po: Updated Vietnamese translation.
 
-2006-05-26  Ankit Patel  <ankit644@yahoo.com>
+2006-05-25  Gabor Kelemen  <kelemeng@gnome.hu>
 
-        * gu.po: Updated Gujarati Translation.
+	* hu.po: Translation updated.
+	
+2006-05-23  Stanislav Brabec  <sbrabec@suse.cz>
 
-2006-05-25  Clytie Siddall <clytie@riverland.net.au>
+	* cs.po: Typo fixes.
 
-	* vi.po: Updated Vietnamese translation.
+2006-05-23  Ankit Patel  <ankit644@yahoo.com>
 
+        * gu.po: Updated Gujarati Translation.
+        
 2006-05-23  Stanislav Brabec  <sbrabec@suse.cz>
 
 	* cs.po: Typo fixes.
 
-2006-05-23  Ankit Patel  <ankit644@yahoo.com>
+2006-05-22  Ilkka Tuohela  <hile@iki.fi>
 
-        * gu.po: Updated Gujarati Translation.
+	* fi.po: Updated Finnish translation.        
 
 2006-05-21  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -41,6 +41,18 @@
 2006-05-20  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated.
+	
+2006-05-19  Rhys Jones  <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2006-05-19  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.	
+	
+2006-05-19  Daniel Nylander  <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.	
 
 2006-05-19  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -63,6 +75,10 @@
 2006-05-18  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+ 2006-05-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.       
 
 2006-05-15  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -71,10 +87,27 @@
 2006-05-15  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+ 2006-05-14  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po Updated Greek Translation
+
+2006-05-14  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
+
+	* br.po: Updated Breton translation.       
 
 2006-05-11  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+ 2006-05-11  Christophe Fergeau  <teuf@gnome.org>
+
+	* fr.po: Translation updated by R.A Mauchin, Jonathan Ernst and
+	Stéphane Raimbault
+
+2006-05-10  Inaki Larranaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.       
 
 2006-05-08  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
@@ -91,7 +124,15 @@
 
 2006-05-05  Ankit Patel  <ankit644@yahoo.com>
 
-        * gu.po: Updated Gujarati Translation.
+        * gu.po: Updated Gujarati Translation. 
+        
+ 2006-05-03  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-05-03  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.       
 
 2006-05-02  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
@@ -100,10 +141,30 @@
 2006-05-02  Ankit Patel  <ankit644@yahoo.com>
 
         * gu.po: Updated Gujarati Translation.
+        
+ 2006-05-02  Rhys Jones  <rhys@sucs.org>
+
+	* cy.po: Updated Welsh translation.
+
+2006-05-01  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-05-01  Hendrik Richter  <hendrikr@gnome.org>
+
+	* de.po: Updated German translation.       
 
 2006-05-01  Funda Wang  <fundawang@linux.net.cn>
 
 	* zh_CN.po: Updated Simplified Chinese translation.
+	
+2006-05-01  Daniel Nylander  <po@danielnylander.se>
+
+	* sv.po: Updated Swedish translation.
+
+2006-04-30  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
+
+	* gl.po: Updated Galician Translation.	
 
 2006-04-30  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
@@ -112,6 +173,22 @@
 2006-04-30  Kjartan Maraas <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation
+	
+2006-04-29  Priit Laes  <amd@store20.com>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2006-04-29  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
+
+	* ca.po: Updated Catalan translation.
+
+2006-04-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2006-04-27  Jérémy Ar Floc'h  <jeremy.lefloch@gmail.com>
+
+	* br.po: Updated Breton translation.	
 
 2006-04-26  Funda Wang  <fundawang@linux.net.cn>
 
@@ -136,6 +213,14 @@
 2006-04-23  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
+	
+2006-04-23  Daniel Nylander <po@danielnylander.se>
+
+	* sv.po Updated Swedish translation.
+
+2006-04-22  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po Updated Greek Translation	
 
 2006-04-21  David Lodge  <dave@cirt.net>
 
@@ -150,14 +235,54 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Alexander Shopov <ash@contact.bg>
+	
+2006-04-21  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2006-04-21  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-21  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.	
 
 2006-04-20  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician Translation.
+	
+2006-04-20  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2006-04-20  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-20  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.	
 
 2006-04-20  Josep Puigdemont Casamajó  <josep.puigdemont@gmail.com>
 
 	* ca.po: Updated Catalan translation with gnome-2-14 branch updates.
+	
+2006-04-19  Ilkka Tuohela  <hile@iki.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2006-04-19  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated.
+
+2006-04-19  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.
+
+2006-04-19  Ankit Patel  <ankit644@yahoo.com>
+
+	* gu.po: Updated Gujarati Translation.	
 
 2006-04-18  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
@@ -183,6 +308,10 @@
 2006-04-14  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
+	
+2006-04-12  Pema Geyleg  <pema.geyleg@gmail.com>
+
+	* dz.po: Updated Dzongkha translation	
 
 2006-04-10  Ilkka Tuohela  <hile@iki.fi>
 
@@ -196,10 +325,18 @@
 2006-04-09  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
  	* cs.po: Updated Czech translation.
+ 	
+ 2006-04-08  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation by Lukas Novotny.	
 
 2006-04-08  Theppitak Karoonboonyanan  <thep@linux.thai.net>
 
-	* th.po: Updated Thai translation (merged from gnome-2-14 branch).
+	* th.po: Updated Thai translation (merged from gnome-2-14 branch).	
+	
+2006-04-05  Lukas Novotny  <lukasnov@cvs.gnome.org>
+
+	* cs.po: Updated Czech translation.	
 
 2006-04-05  Priit Laes  <amd@store20.com>
 
@@ -245,6 +382,10 @@
 2006-03-21  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	* hu.po: Hungarian translation updated.
+	
+2006-03-19  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation	
 
 2006-03-18  Priit Laes  <amd@store20.com>
 
@@ -265,6 +406,23 @@
 2006-03-13  Jordi Mallach  <jordi@sindominio.net>
 
 	* ca.po: Updated Catalan translation.
+	
+2006-03-13  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2006-03-12  Benoît Dejean  <benoit@placenet.org>
+
+	* fr.po: Updated French translation.
+
+2006-03-12  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation by Petr Tomeš.
+
+2006-03-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po:Updated Catalan translation by
+	Gil Forcada <gilforcada@guifi.net>.	
 
 2006-03-11  Priit Laes  <amd@store20.com>
 
@@ -278,6 +436,11 @@
 
 	* ca.po: Updated Catalan translation by
 	Gil Forcada <gilforcada@guifi.net>.
+	
+2006-03-10  Guilherme de S. Pastore  <gpastore@gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation from Leandro
+	  A. F. Pereira <leandro@linuxmag.com.br>.	
 
 2006-03-10  Duarte Loreto <happyguy_pt@hotmail.com>
 
@@ -287,6 +450,14 @@
 
 	* bg.po: Updated Bulgarian translation by
 	Rostislav Raykov <zbrox@i-space.org>
+	
+2006-03-10  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Updated Italian translation.
+
+2006-03-10  Mugurel Tudor  <mugurelu@gnome.ro>
+
+	* ro.po: Updated Romanian translation	
 
 2006-03-10  Frank Arnold  <farnold@cvs.gnome.org>
 
@@ -301,6 +472,7 @@
 
 	* ro.po: Updated Romanian translation
 
+>>>>>>> 1.2614
 2006-03-09  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
@@ -315,7 +487,7 @@
 
 2006-03-06  Rajesh Ranjan <rranjan@redhat.com>
 
-        * hi.po: Updated Hindi Translation.
+	* hi.po: Updated Hindi Translation.
 
 2006-03-07  Priit Laes  <amd@store20.com>
 
@@ -323,7 +495,7 @@
 
 2006-03-06  Maxim Dziumanenko <mvd@mylinux.ua>
 
-        * uk.po: Updated Ukrainian translation.
+	* uk.po: Updated Ukrainian translation.
 
 2006-03-06  Leonid Kanter <leon@asplinux.ru>
 
@@ -352,7 +524,7 @@
 
 2006-03-03  Lukas Novotny  <lukasnov@cvs.gnome.org>
 
- 	* cs.po: Updated Czech translation.
+	* cs.po: Updated Czech translation.
 
 2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
 
@@ -482,7 +654,6 @@
 	* nb.po: Updated Norwegian bokmål translation.
 	* no.po: Same.
 
->>>>>>> 1.2514
 2006-02-17  Vincent van Adrighem  <adrighem@gnome.org>
 
 	* nl.po: Translation updated by Tino Meinen.
diff --git a/po/bg.po b/po/bg.po
index 2d9fb86d67..4de78946c0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution HEAD\n"
+"Project-Id-Version: evolution gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-18 11:24+0300\n"
-"PO-Revision-Date: 2006-05-18 11:24+0300\n"
+"POT-Creation-Date: 2006-05-18 09:45+0300\n"
+"PO-Revision-Date: 2006-05-18 09:50+0300\n"
 "Last-Translator: Alexander Shopov <ash@contact.bg>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Адресник на Evolution"
 
@@ -36,12 +36,12 @@ msgstr "Нов контакт"
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "текущата папка %s на адресника е с %d визитка"
-msgstr[1] "текущата папка %s на адресника е с %d визитки"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "текущата папка на адресника е с %d визитка"
+msgstr[1] "текущата папка на адресника е с %d визитки"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -60,32 +60,32 @@ msgstr "Контакт: "
 msgid "evolution minicard"
 msgstr "мини-карта на Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Има аларми."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Има повторения."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Това е събрание."
 
-#: ../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 "Събитие в календар: Обобщението е %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 "Събитие в календар: Няма обобщение."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "събитие за преглед на календар"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Вземане на фокус"
 
@@ -156,10 +156,8 @@ msgstr "%a %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -190,10 +188,8 @@ msgstr "%d %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -549,7 +545,7 @@ msgstr "Конфигуриране на авт. довършване"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -612,7 +608,7 @@ msgstr "На този компютър"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Лично"
 
@@ -673,9 +669,9 @@ msgstr ""
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
@@ -716,12 +712,12 @@ msgid "Address Book Properties"
 msgstr "Настройки на адресника"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Мигриране..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Мигриране на „%s“:"
@@ -797,34 +793,34 @@ msgstr "Името на папката не може да съдържа „/“
 msgid "A Folder with this name already exists"
 msgstr "Вече съществува папка с такова име."
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Нов адресник"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../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
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Запазване като VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Настройки..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Избиране на контакти"
 
@@ -833,7 +829,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимен достъп до LDAP сървъра"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Неуспешно удостоверяване.\n"
 
@@ -884,7 +880,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI на папката, последно използвана в диалога за избор на име."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Разположение на вертикалния панел"
 
@@ -1213,6 +1209,7 @@ msgstr "минути"
 #: ../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
@@ -1262,7 +1259,7 @@ msgstr "<b>Служебен</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
@@ -1319,7 +1316,7 @@ msgstr "Телефон"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Служебен"
@@ -1347,8 +1344,10 @@ msgid "_Calendar:"
 msgstr "_Календар:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-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 "_Категории"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1435,8 +1434,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_ZIP/пощенски код:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Адрес"
 
@@ -2430,7 +2429,7 @@ msgstr "Зимбабве"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Име"
@@ -2441,7 +2440,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2451,7 +2450,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2481,17 +2480,17 @@ msgid "Other"
 msgstr "Друга"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2525,15 +2524,15 @@ msgstr "Променени"
 msgid "Contact Editor - %s"
 msgstr "Редактор на контакти - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Изберете изображение за този контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Няма изображение"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2541,23 +2540,23 @@ msgstr ""
 "Информацията на контакта е невалидна:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ е с невалиден формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ е празен"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Невалиден контакт."
 
@@ -2585,7 +2584,7 @@ msgstr "Избор на адрес_ник"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете списъка с контакти (%s)?"
@@ -2602,7 +2601,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Сигурни ли сте, че искате да\n"
 "изтриете контакта (%s)?"
@@ -2713,7 +2712,6 @@ msgid "_IM Service:"
 msgstr "Услуга за бързи съобщения:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2900,8 +2898,8 @@ msgstr "Запазване като VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Отваряне"
@@ -2958,13 +2956,13 @@ msgstr "_Изрязване"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:986 ../mail/em-folder-view.c:1082
-#: ../mail/message-list.c:1742 ../ui/evolution-addressbook.xml.h:46
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Копиране"
@@ -3025,7 +3023,7 @@ msgid "Company Phone"
 msgstr "Служебен телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Електронна поща"
@@ -3075,7 +3073,7 @@ msgid "Manager"
 msgstr "Мениджър"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Мобилен телефон"
 
@@ -3084,7 +3082,7 @@ msgid "Nickname"
 msgstr "Прякор"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Бележка"
 
@@ -3093,7 +3091,7 @@ msgid "Office"
 msgstr "Офис"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Организация"
 
@@ -3271,83 +3269,65 @@ msgstr "Избрани"
 msgid "Has Cursor"
 msgstr "Има показалец"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Отваряне на връзката в _браузър"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2464
-msgid "_Copy Link Location"
-msgstr "Копиране на мес_тоположението на връзката"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Изпращане на ново писмо до..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Копиране на _адреса на е-пощата"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(карта)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "карта"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Изброяване на членове"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-поща"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Позиция"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Видео конференция"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "на работа"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Блог"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "личен"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Длъжност"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Домашна страница"
 
@@ -3734,12 +3714,12 @@ msgstr "Интерфейс за внасяне на VCard"
 msgid "Print envelope"
 msgstr "Печатане на плик"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Печатане на контакти"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Печатане на контакт"
 
@@ -3892,7 +3872,7 @@ msgstr "Сенки"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4132,17 +4112,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Сигурни ли сте, че искате да изтриете тази среща?"
 
 #: ../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:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурни ли сте, че искате да прекъснете и изтриете това събрание?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурни ли сте, че искате да изтриете тази задача?"
 
@@ -4419,8 +4396,8 @@ msgstr "Разделяне на събития, по-дълги от един д
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "evolution-data-server не може да се стартира"
 
@@ -4459,7 +4436,7 @@ msgid "Calendar and Tasks"
 msgstr "Календар и задачи"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Календари"
 
@@ -4510,7 +4487,7 @@ msgstr "Бележки"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4562,8 +4539,8 @@ msgstr "Срещи"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4579,7 +4556,7 @@ msgstr "Време за _отлагане:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4596,31 +4573,32 @@ msgstr "_Отлагане"
 msgid "location of appointment"
 msgstr "място на среща"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Няма обобщение."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Няма описание."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Няма информация за местоположението."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Имате %d аларми."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4632,7 +4610,7 @@ msgstr ""
 "да изпраща поща. Вместо това, Evolution ще покаже стандартен прозорец за "
 "напомняне."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4649,7 +4627,7 @@ msgstr ""
 "\n"
 "Сигурни ли сте, че искате да стартирате тази програма?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Без запитвания за тази програма отново."
 
@@ -4750,104 +4728,92 @@ msgid "Default reminder value"
 msgstr "Единици на стандартното напомняне"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Преливка за събитие"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Скриване на завършените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Скриване на единиците на задачите"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Скриване на стойността на задачата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Позиция на хоризонталния панел"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Час, в който свършва работния ден, в 24 часов формат от 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Час, в който започва работния ден, в 24 часов формат от 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Интервалите, показани в прегледите за деня или за работната седмица, в "
 "минути."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Последно време на алармиране"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Списък с адресите-УРЛ за публикуване свободен/зает."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Крива на Маркус Бейнс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Цвят на кривата на Маркус Бейнс - изглед за деня"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Цвят на кривата на Маркус Бейнс - поле за време"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Минута, в която завършва работния ден, от 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минута, в която започва работния ден, от 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Позиция на хоризонталния панел за месечния изглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Позицията на вертикалния панел в месечния изглед"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Брой единици за определяне на стандартно напомняне."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Брой единици за определяне кога да се скриват задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Цвят на просрочените задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4855,7 +4821,7 @@ msgstr ""
 "Позицията на хоризонталния панел, между навигатора за датите и списъка със "
 "задачи, когато не сте в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4863,7 +4829,7 @@ msgstr ""
 "Позицията на хоризонталния панел, между навигатора за прегледа и датите и "
 "списъка със задачи в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4871,7 +4837,7 @@ msgstr ""
 "Позиция на вертикалния панел, между списъка със задачи и панела за преглед "
 "на задачи, в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4879,7 +4845,7 @@ msgstr ""
 "Позицията на вертикалния панел, между навигатора за прегледа и датата и "
 "списъка със задачи в месечния изглед; в пиксели;"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4887,67 +4853,67 @@ msgstr ""
 "Позицията на вертикалния панел, между навигатора за прегледа и датите и "
 "списъка със задачите, когато не сте в месечния изглед; в пиксели."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Програми, които могат да бъдат стартирани от аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Показване на полето „Моля, отговорете“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Показване на полето „Роля“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Показване на края на срещите в седмичните и месечните календарни изгледи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Показване на полето „Категория“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Показване на алармите в зоната за уведомяване"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Показване на полето „Състояние“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Показване на панела „Предварителен преглед на писмата“"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Показване на панела „Предварителен преглед на писмата“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Показване на полето „Часови пояс“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Показване на полето „Вид“ в редактора на събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Показване номерата на седмиците при прегледа на дати"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Цвят на задачите за днес"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Разположение на вертикалния панел със задачи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4956,7 +4922,7 @@ msgstr ""
 "Шаблонът за адреси-УРЛ за състояние свободен/зает, %u се заменя с "
 "потребителската част от адреса на е-поща, а %d се заменя от домейна."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4964,63 +4930,55 @@ msgstr ""
 "Стандартният часови пояс за дати и време в календара, във вид на непреведена "
 "база от данни на Olsen за местоположения, например „America/New York“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Времеви разделения"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Времето на последната аларма, в time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Часови пояс"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Степен на прозрачност за събитията в календарния изглед (число в интервала "
-"0÷10, по подразбиране събитията са непрозрачни)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24 часов формат на времето"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Мерни единици в подразбиращото се напомняне - „минути“, „часове“ или „дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Единици за определяне кога да се скриват задачи, „минути“, „часове“ или "
 "„дни“."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Начало на седмицата"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ден, в който започва работната седмица, от неделя (0) до събота (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Дали да се използва зоната за уведомяване за изобразяване на аларми."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Дали да пита за потвърждение при изтриване на среща или задача."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Дали да пита за потвърждение при изтриване на срещи или задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5028,80 +4986,80 @@ msgstr ""
 "Дали да се свиват почивните дни в месечния изглед, което ще изобрази "
 "съботите и неделите като един разделителен почивен ден."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 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:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 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:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Дали да се скриват завършените задачи в списъка със задачи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Дали да бъде зададено стандартното напомняне за срещи."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Дали да се показва полето „Моля, отговорете“ редактора за събития/задачи/"
 "срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Дали да се показва полето „Категория“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Дали да се показва полето „Роля“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Дали да се показва полето „Състояние“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Дали времето да се показва в 24-часов формат вместо с am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Дали да се показва полето „Часови пояс“ в редактора за събития/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Дали да се показва полето „Вид“ в редактора за събития/задачи/срещи"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Дали да се показват номерата на седмиците в навигатора за дати."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Работни дни"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Час, в който завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Минута, в която завършва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Час, в който започва работния ден"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Минута, в която започва работния ден"
 
@@ -5134,7 +5092,7 @@ msgstr "Печат"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5203,59 +5161,59 @@ msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Неуспех при отварянето на календара „%s“ за създаване на събития и събрания"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Няма наличен календар за създаване на събития и събрания"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Местонахождение на календара"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Нова среща"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "Срещ_а"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Създаване на нова среща"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Ново събрание"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Събрани_е"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Създаване на ново искане за събрание"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Нова среща за цял ден"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Среща за _цял ден"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Създаване на нова среща за цял ден"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Създаване на нов календар"
 
@@ -5416,18 +5374,19 @@ 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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "Предлагане на _автоматично показване на прикрепен обект"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Предлагане на автоматично показване на прикрепен обект"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Прикрепяне на файл(ове)"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Настройки на прикрепения документ"
@@ -5436,19 +5395,19 @@ msgstr "Настройки на прикрепения документ"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../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:3
+#: ../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:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME тип:"
@@ -5514,7 +5473,7 @@ msgid "Display"
 msgstr "Показване"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Свободен/зает"
@@ -5612,7 +5571,7 @@ msgid "Thursday"
 msgstr "Четвъртък"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Часови _пояс:"
 
@@ -5702,48 +5661,48 @@ msgid "before every appointment"
 msgstr "преди всяка среща"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Копиране на събитията в календара за _локална употреба в режим „Изключен“"
+"Копиране на събитията в календара за локална употреба в режим „Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Копиране на съдържанието на списъка със задачи за _локална употреба в режим "
+"Копиране на съдържанието на списъка със задачи за локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
-"Копиране на съдържанието на списъка с бележки за _локална употреба в режим "
+"Копиране на съдържанието на списъка с бележки за локална употреба в режим "
 "„Изключен“"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Цвят:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Списък с бележки"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Настройки на календара"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Нов календар"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Настройки на списък със задачи"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Нов списък с бележки"
@@ -5869,13 +5828,13 @@ msgstr[0] "Прикрепено писмо"
 msgstr[1] "%d прикрепени писма"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "Пре_местване"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Отказване на _извлачването"
 
@@ -5895,7 +5854,7 @@ msgid "Hide Attachment _Bar"
 msgstr "_Скриване на лентата за прикрепени файлове"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "_Показване на лентата за прикрепени файлове"
 
@@ -5913,7 +5872,7 @@ msgstr "Пре_махване"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Настройки"
@@ -5924,70 +5883,70 @@ msgstr "_Настройки"
 msgid "_Add attachment..."
 msgstr "_Прикрепяне на файл...."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
-#: ../mail/em-format-html-display.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Показване на прикрепени файлове"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr ""
 "Натиснете интервал, за да превключите показването на лентата за прикрепяне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2077
-#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Редактиране на среща"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Събрание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2089
-#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Назначена задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в дневника - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2147
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Няма обобщение"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2655
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
-#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:399
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "прикрепено"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2744
-#: ../calendar/gui/dialogs/comp-editor.c:2798
-#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промените по този запис може да бъдат презаписани, ако пристигне обновяване"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Не може да се използва текущата версия!"
 
@@ -6003,10 +5962,6 @@ 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 "Събитието не може да бъде изтрито, заради грешка в corba"
@@ -6068,11 +6023,11 @@ msgstr "Делегиране на:"
 msgid "Enter Delegate"
 msgstr "Въвеждане на делегат"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Среща"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Повторение"
@@ -6088,7 +6043,7 @@ msgid "Cale_ndar:"
 msgstr "К_алендар:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6239,12 +6194,16 @@ msgstr "Описани_е:"
 msgid "Event Description"
 msgstr "Описание на събитие"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Местоположен_ие:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "О_бобщение:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Аларма"
 
@@ -6320,7 +6279,7 @@ msgstr "Моля, отговорете"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Състояние"
 
@@ -6608,14 +6567,14 @@ msgstr "<span weight=\"bold\">Състояние</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../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:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Високо"
 
@@ -6630,14 +6589,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:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 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:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Нормално"
 
@@ -6833,7 +6792,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:2827
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Натиснете, за да отворите %s"
@@ -6916,7 +6875,7 @@ msgstr "Свободно"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Заето"
 
@@ -6930,17 +6889,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Не"
@@ -6951,21 +6910,21 @@ msgstr "Не"
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Повтарящ се"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Назначен"
 
@@ -6973,7 +6932,7 @@ msgstr "Назначен"
 msgid "Save As..."
 msgstr "Запазване като..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1916
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Изберете папка, където да се запазят избраните прикрепени файлове..."
 
@@ -6982,9 +6941,9 @@ msgstr "Изберете папка, където да се запазят из�
 msgid "untitled_image.%s"
 msgstr "неозаглавено_изображение.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Запазване като..."
 
@@ -7051,25 +7010,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Изтриване на избраните обекти"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Обновяване на обектите"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Запазване като..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Отваряне на страница в _Интернет"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7077,44 +7036,44 @@ msgstr "Отваряне на страница в _Интернет"
 msgid "_Print..."
 msgstr "_Разпечатване..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Задаване на задача"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Препращане като iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Отбелязване като приключено"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Отбелязване на избраните задачи като приключени"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Изтриване на избраните задачи"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Натиснете, за да добавите задача"
@@ -7149,105 +7108,105 @@ msgstr "Начална дата"
 msgid "Task sort"
 msgstr "Подреждане на задачи"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Преместване на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Копиране на обекти"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Нова _среща..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Всички нови _събития за деня"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Ново _събрание"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Нова _задача"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Текущ изглед"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Избиране на _днешна дата"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "Избор на д_ата..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Копиране в _календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Преме_стване в календар..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Делегиране на събрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Насрочване на с_ъбрание..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Препра_ща като iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "Отгово_р"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../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:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Прави това събитие пр_еместваемо"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Изтриване на това с_ъбитие"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Изтриване на всички _събития"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2182
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2186
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2202 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2233
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -7277,7 +7236,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Разделения от по %02i минути"
@@ -7288,21 +7247,19 @@ 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "сутрин"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "следобед"
@@ -7413,7 +7370,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7426,7 +7383,7 @@ msgstr "Неуверено прието"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7759,63 +7716,63 @@ msgid "Resources"
 msgstr "Ресурси"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Индивидуално"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ресурс"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Помещение"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Председател"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Заявен участник"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Възможен участник"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Не е участник"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Необходими действия"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 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/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7826,14 +7783,14 @@ msgstr "Делегиран"
 msgid "Attendee                          "
 msgstr "Присъстващ"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7841,78 +7798,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън офиса"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Няма информация"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Присъстващи..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "Оп_ции"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Показване _само на работните часове"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Показване като _умалено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Обновяване на „свободен/зает“"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Авт. избиране"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Всички хора и ресурси"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Вси_чки хора и един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Ну_жни хора"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Нужни хора и _един ресурс"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Начало:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Край:"
 
@@ -7980,8 +7937,7 @@ 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8549,7 +8505,7 @@ msgstr "Спис_ък със задачи"
 msgid "Create a new task list"
 msgstr "Създаване на нов списък със задачи"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8561,11 +8517,11 @@ msgstr ""
 "\n"
 "Наистина ли искате да изтриете тези задачи?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Да не се задава този въпрос отново."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Задачи за разпечатване"
 
@@ -10160,7 +10116,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Лента за прикрепени файлове"
 
@@ -10181,15 +10137,15 @@ msgstr "Не може да се прикрепи файла %s: %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Не може да се прикрепи файла %s: не е обикновен файл"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Получател на пощата"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Избор на папки, в които да бъде копирано писмото."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Натиснете тук за адресника"
 
@@ -10200,45 +10156,45 @@ msgstr "Натиснете тук за адресника"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "От_говор до:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_От:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-msg-composer-hdrs.c:645
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_До:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател(и) на писмото"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Копие до:"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Въведете адресите на получатели на копие на това писмо"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Скрито копие до:"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10249,15 +10205,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "Копиране в _папка:"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Натиснете тук, за да въведете папки, в които да бъде копирано писмото"
 
-#: ../composer/e-msg-composer-hdrs.c:672
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Копиране в папка:"
 
@@ -10477,7 +10433,7 @@ msgstr "_Запазване на писмото"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10725,23 +10681,23 @@ 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:289
 msgid "Choose a file"
 msgstr "Избор на файл"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
-msgstr "Трябва да се направи"
+msgstr "Да се направи"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "По-късно"
@@ -10962,7 +10918,7 @@ msgstr "Контрол за настройки на редактора за пи
 msgid "Evolution Mail preferences control"
 msgstr "Настройки на пощата на Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11259,7 +11215,7 @@ msgstr "Спам"
 msgid "Junk Test"
 msgstr "Тест за спам"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Етикет"
 
@@ -11335,7 +11291,7 @@ msgstr "Стартиране на програма"
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Подател"
 
@@ -11369,7 +11325,7 @@ msgstr "Спиране на обработването"
 
 #: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11453,48 +11409,48 @@ msgstr "Изпратени"
 msgid "Loading..."
 msgstr "Зареждане..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Дърво на папката с пощата"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Преместване на папка %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Копиране на папка %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Преместване на писма в папка %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на писма в папка %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неуспех при пускането на писмото(та) във висше хранилище"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Копиране в папка"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Преместване в _папка"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в „%s“"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11502,28 +11458,28 @@ msgstr "Сканиране на папки в „%s“"
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Отваряне в _нов прозорец"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Копиране..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "Пре_местване..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Нова папка..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "П_реименуване..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Изчистване на _кошчето"
 
@@ -11532,13 +11488,13 @@ msgstr "Изчистване на _кошчето"
 msgid "Copying `%s' to `%s'"
 msgstr "Копиране на „%s“ в „%s“"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../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:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Копиране"
 
@@ -11560,164 +11516,168 @@ msgstr "Създаване на папка"
 msgid "Specify where to create the folder:"
 msgstr "Указване къде да бъде създадена папката:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Отговор до подателя"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../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:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Р_едактиране като ново писмо..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "В_ъзстановяване на изтрито"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Пре_местване в папка..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Копиране в папка..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "От_белязване като прочетено"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Отбелязване като _непрочетено"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Отбелязване като ва_жно"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Отбелязване като не_важно"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Отбелязване като _спам"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Отбелязване като различ_но от спам"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Отбелязване за просле_дяване..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Етикет"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Без"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Фла_гът е завършен"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Из_чистване на отбелязването"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "С_ъздаване на правило от писмо"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Папка за търсене по _тема"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Папка за търсене по _подател"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Папка за търсене по полу_чатели"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Папка за търсене по по_щенски списък"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Филтър по т_ема"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Филтър по п_одател"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Филтър по получ_атели"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Филтър по поще_нски списък"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Стандартно"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../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:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Писмото не може да се получи"
 
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Копиране на мес_тоположението на връзката"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Създаване на п_апка за търсене"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_От този адрес"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_До този адрес"
 
-#: ../mail/em-folder-view.c:2822
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Натиснете, за да изпратите писмо на %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Съвпадения: %d"
 
-#: ../mail/em-format-html-display.c:759 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Неподписано"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Това писмо не е подписано. Няма гаранции, че това писмо е автентично."
 
-#: ../mail/em-format-html-display.c:760 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Валиден подпис"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11725,11 +11685,11 @@ msgstr ""
 "Това писмо е подписано и е валидно, което означава, че най-вероятно е "
 "автентично."
 
-#: ../mail/em-format-html-display.c:761 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Невалиден подпис"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11737,11 +11697,11 @@ msgstr ""
 "Подписът на това писмо не може да бъде проверен. Възможно е то вече да е "
 "било променено, преди да бъде получено."
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Валиден подпис, не може да се потвърди подателя"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11749,11 +11709,11 @@ msgstr ""
 "Това писмо е подписано с валиден подпис, но подателят не може да бъде "
 "проверен."
 
-#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Некриптирано"
 
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11761,11 +11721,11 @@ msgstr ""
 "Това писмо не е криптирано. Докато пътува през Интернет, трети лица могат да "
 "видят неговото съдържание."
 
-#: ../mail/em-format-html-display.c:769 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Слабо криптиране"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11775,11 +11735,11 @@ msgstr ""
 "трудно, но не невъзможно, да декриптират неговото съдържание за практически "
 "период от време."
 
-#: ../mail/em-format-html-display.c:770 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Криптирано"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11787,11 +11747,11 @@ msgstr ""
 "Това писмо е криптирано. На трети лица ще бъде много трудно да видят "
 "неговото съдържание."
 
-#: ../mail/em-format-html-display.c:771 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Силно криптирано"
 
-#: ../mail/em-format-html-display.c:771
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11800,72 +11760,72 @@ msgstr ""
 "Това писмо е криптирано чрез силен алгоритъм. За трети лица ще бъде много "
 "трудно да го декриптират за практически период от време."
 
-#: ../mail/em-format-html-display.c:872 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Преглед на сертификат"
 
-#: ../mail/em-format-html-display.c:887
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Този сертификат не може да се преглежда"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завършено на %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1185
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Просрочено:"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "с %d %B %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1248
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Вграден преглед"
 
-#: ../mail/em-format-html-display.c:1249
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Скриване"
 
-#: ../mail/em-format-html-display.c:1250
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Съразмерно ширината"
 
-#: ../mail/em-format-html-display.c:1251
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Оригинален раз_мер"
 
-#: ../mail/em-format-html-display.c:1670 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прикрепен файл"
 
-#: ../mail/em-format-html-display.c:1877
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Изберете папка, където да се запазят всички прикрепени файлове"
 
-#: ../mail/em-format-html-display.c:1924
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Запазване на избраното..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1991
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d _прикрепен файл"
 msgstr[1] "%d _прикрепени файла"
 
-#: ../mail/em-format-html-display.c:1998 ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Запазване"
 
-#: ../mail/em-format-html-display.c:2009
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Запазване на всички"
 
-#: ../mail/em-format-html-display.c:2070
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Няма прикрепени файлове"
 
@@ -11929,7 +11889,7 @@ msgstr "Отговор до"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "До"
 
@@ -11945,7 +11905,7 @@ msgstr "Скрито копие до"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:999
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Пощенска програма"
 
@@ -12019,7 +11979,7 @@ msgstr "Един път седмично"
 msgid "Once per month"
 msgstr "Един път месечно"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12031,48 +11991,48 @@ msgstr ""
 "\n"
 "Изчакайте, докато Evolution мигрира вашите папки..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Неуспех при създаването на новата папка „%s“: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Неуспех при копирането на папка „%s“ в „%s“: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Неуспех при сканирането за съществуващи пощенски кутии на „%s“: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Неуспех при отварянето на стари данни, пазени на POP сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Неуспех при създаването на папка за данни, пазени на POP3 сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Неуспех при копирането на данни, пазени на POP3 сървър „%s“: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неуспех при създаването на локалното хранилище за пощата „%s“: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Неуспех при създаване на локални папки към „%s“: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12089,6 +12049,10 @@ msgstr "_Отговор на подателя"
 msgid "Reply to _List"
 msgstr "Отговор до _списъка"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Отваряне на връзката в _браузър"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Изпращане на ново писмо до..."
@@ -12247,34 +12211,18 @@ msgstr ""
 "писмата."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Enable or disable type ahead search feature"
-msgstr "Вклюване/изключване на търсене с автоматично довършване"
-
-#: ../mail/evolution-mail.schemas.in.in.h:25
-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:26
 msgid "Enable/disable caret mode"
 msgstr "Включване/изключване на режим „Каретка“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Височина на панела със списъка на писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Височина на пенела със списъка на писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12282,7 +12230,7 @@ msgstr ""
 "Ако потребител се опита да отвори 10 или повече писма едновременно, да бъде "
 "питан дали наистина иска да направи това."
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12293,23 +12241,23 @@ msgstr ""
 "компонент, съдържащ се в базата от данни за MIME-тип на GNOME, могат да "
 "бъдат използвани за изобразяване на съдържание."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Последният път, когато е изпразвано кошчето"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Списък с етикети и техните асоциирани цветове"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Списък с приетите лицензи"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Списък на абонаментите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12317,11 +12265,11 @@ msgstr ""
 "Списък с пощенските абонаменти в Evolution. Съдържа имена, които се "
 "използват и за под-папките на /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Списък на специфични заглавни части и дали са активирани."
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12329,21 +12277,21 @@ msgstr ""
 "Списък с цветови етикети в Evolution. Съдържа двойки „име:цвят“, където "
 "цветът е в шестнадесетичен HTML формат."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Списък от MIME-типове, за които да се проверява за съществуваща система за "
 "преглед чрез Bonobo компоненти"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Списък с протоколни имена, чиито лицензи са били приети."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Зареждане на изображенията в писмата, форматирани в HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12353,99 +12301,99 @@ msgstr ""
 "0 - никога не се зареждат изображения от мрежата, 1 - изображенията се "
 "зареждат, ако подателят е в адресника и 2 - изображенията се зареждат винаги."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Записване на дейността на филтрите в дневник"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Записване в дневник на дейността на филтрите в определен файл."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Файл за записване дейността на филтрите"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Файл за записване дейността на филтрите."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Отбелязване като видяно след определено време"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Отбелязване като видяно след определено време."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Отбелязване на цитатите в прегледа на писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Отбелязване на цитатите в прегледа на писмата."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Стандартна височина на прозореца за писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Стандартна ширина на прозореца за писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Начин на показване на писмата („обикновен“, „всички заглавни части“, "
 "„изходен код“)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Минимален брой дни между изчистване на кошчето при затваряне на програмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Минимално време между изчистването на кошчето при затваряне на програмата, в "
 "дни."
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Нов звуков файл за информиране за поща"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Нов тип информиране за поща"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Запитване при непопълнено поле „Тема“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Предупреждаване на потребителя, когато иска да изчисти папка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Запитване до потребителя, когато се опита да прати писмо без тема."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Предупреждаване при изчистване"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждаване, когато потребителя попълни само „Скрито копие до“"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Предупреждаване, когато потребител се опита да отвори 10 или повече писма "
 "едновременно"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12453,90 +12401,90 @@ msgstr ""
 "Предупреждаване на потребителя при изпращане на писма в HTML формат до "
 "получатели, които може да не искат да получават такава поща."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Предупреждаване на потребителя при изпращане на писма без адрес в полетата "
 "„До“ или „Копие до“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Предупреждаване на потребителя, когато се опита да изпрати нежелан HTML"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Разпознаване на връзките в текста и заместването им."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Разпознаване на усмивките в текста и замяна с изображения."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Проверяване на входящата поща за спам"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Изпращане на поща в HTML формат по подразбиране (не се препоръчва)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Изпращане на поща в HTML формат по подразбиране (не се препоръчва)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Показване на анимации"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Показване на анимирани изображения като анимации."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Показване на изтритите писма като зачертани в списъка."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Показване на изтритите писма в списъка с писмата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Изпълнение на звуков файл при пристигане на ново писмо."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Задаване вида на уведомяването за нова поща."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Вградена проверка на правопис"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Стандартната височина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Стандартната ширина на прозореца за абониране"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Терминален шрифт"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Последният път, когато е изчиствано кошчето, в дни от „Епохата“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Терминалният шрифт за показване на пощата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Използваният за показване на писмата шрифт с променлива широчина"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12548,99 +12496,99 @@ msgstr ""
 "„&lt;header enabled&gt; - set enabled“ в случай, че заглавната част трябва "
 "да бъде показвана."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Подреждане на списъка с писма в нишки."
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Подреждане на списъка с писма в нишки"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Подреждане на списъка с писма в нишки на основата на „Тема“."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Време за отбелязване на дадено писмо като видяно"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Време за отбелязване на дадено писмо като видяно."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Низ UID на стандартния абонамент."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Използване на демона и клиента на Spamasssassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Използване на демона и клиента на Spamasssassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Използване на лични шрифтове"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Използване на лични шрифтове за показване на пощата"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Използване само на локални спам тестове."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Използване само на локални спам тестове (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Шрифт с променлива ширина"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "„Изглед/Скрито копие до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "„Изглед/Скрито копие до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "„Изглед/Копие до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "„Изглед/Копие до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "„Изглед/От“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "„Изглед/От“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "„Изглед/Копиране в папка“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "„Изглед/Копиране в папка“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "„Изглед/Отговор до“ е активирано"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "„Изглед/Отговор до“ е активирано."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12679,7 +12627,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Внасяне на пощенски папки формат Berkley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Внасяне на „%s“"
@@ -12687,7 +12635,7 @@ msgstr "Внасяне на „%s“"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Изчакайте"
 
@@ -13855,26 +13803,17 @@ msgstr "Изчакване..."
 msgid "Checking for new mail"
 msgstr "Проверка за нови писма"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Въведете парола за %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Въвеждане на парола"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведете парола за %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Въвеждане на парола"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Потребителят отмени операцията."
 
@@ -14518,74 +14457,74 @@ msgstr "_Изчистване"
 msgid "_Open Messages"
 msgstr "Отваряне на _писма"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Прегледано"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Отговорено"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрегледани писма"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Множество писма"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Най-ниска"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Ниска"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Висока"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Най-висока"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Писма"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Генериране на списък на писмата"
 
@@ -14613,7 +14552,7 @@ msgstr "Оригинално местонахождение"
 msgid "Received"
 msgstr "Получено"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Размер"
@@ -14884,6 +14823,10 @@ msgstr ""
 "Пробна приставка, която демонстрира изскачащо меню, което позволява да "
 "копирате неща в буфера за обмен."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Копиране на _адреса на е-пощата"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Инструмент за копиране"
@@ -15361,11 +15304,11 @@ msgstr "Папките не могат да бъдат показани."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Промените в настройките на абонамента към Exchange „{0}“ ще влязат в сила "
-"след като рестартирате Evolution."
+"Промените в настройките на абонаментите към Exchange ще влязат в сила след "
+"като рестартирате Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15525,8 +15468,8 @@ msgid "Password successfully changed."
 msgstr "Паролата е променена успешно."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "За да влязат промените в сила, рестартирайте Evolution"
+msgid "Please restart Evolution"
+msgstr "Рестартирайте Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15907,12 +15850,12 @@ msgid "Select Calendar"
 msgstr "Избор на календар"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Внасяне"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "файлов формат на iCalendar (.ics)"
 
@@ -16491,8 +16434,8 @@ msgstr "Вносители, тип Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr "„{0}“ е делегирал събранието. Искате ли да добавите делегата „{1}“?"
+"&quot;{1}&quot; ?"
+msgstr "„{0}“ е делегирал събранието. Искате ли да добавите делегата „{1}“ ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -17002,12 +16945,12 @@ msgstr "Запазване на всички прикрепени файлове
 msgid "Select save base name"
 msgstr "Избор на основното име за запис"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME тип"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Запазване"
 
@@ -17166,18 +17109,18 @@ msgstr ""
 "Натиснете бутона „Напред“. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Изберете информацията, която искате да внесете:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "От %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Внасяне на данни."
 
@@ -17271,15 +17214,11 @@ msgstr ""
 "Пропускане на диалоговия прозорец с предупреждението за разработващата се "
 "версия"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Стартиране в режим „Изключен“"
 
 #: ../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 "
 "(for example \"2.6.0\")."
@@ -17287,19 +17226,19 @@ msgstr ""
 "Подробна версия на настроките на Evolution - номер на версия/подверсия/"
 "конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Стандартната височина на основния прозорец, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Стандартната ширина на основния прозорец, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Стандартна ширина на страничната лента, в пиксели."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17307,7 +17246,7 @@ msgstr ""
 "Подробна версия на последните настроки на Evolution - номер на версия/"
 "подверсия/конфигурационно ниво (напр. „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17317,47 +17256,43 @@ msgstr ""
 "„toolbar“. Ако зададете „toolbar“, стилът на изобразяване ще зависи от "
 "стандартните настройки на GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Лентата с инструменти е видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Дали Evolution да стартира в режим „Изключен“, вместо в режим „Включен“."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "Дали прозорцът да е максимизиран"
+msgstr "Дали прозорцът да е максимизиран."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Дали лентата с инструменти трябва да е видима."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Дали предупредителното съобщение в нестабилните версии на Evolution, да бъде "
 "показвано."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Дали бутоните на прозорците да са видими."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Стил на бутоните на прозорците"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Бутоните на прозорците са видими"
 
@@ -17379,11 +17314,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Без име)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Изберете типа на вносителя за изпълнение:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17397,11 +17332,11 @@ msgstr ""
 "Ако не знаете, може да изберете „Автоматично“ и Evolution ще се опита да го "
 "определи."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Изберете къде да бъде внесена тази информация"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17413,23 +17348,23 @@ msgstr ""
 "намерено нищо за внасяне. Ако искате да\n"
 "опитате отново, то натиснете бутона „Назад“.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Име на _файл:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Тип на файла:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Внасяне на информация и настройки от по-_стари програми"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Внасяне на _единичен файл"
 
@@ -17602,7 +17537,7 @@ msgstr ""
 "внасяне на външни файлове в Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17636,7 +17571,7 @@ msgstr ""
 "Надяваме се резултатът от усилената ни работа да Ви радва\n"
 "и с нетърпение очакваме да ни помогнете в разработката!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17644,39 +17579,35 @@ msgstr ""
 "Благодарности\n"
 "От екипа на Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Да не се показва отново"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Стартиране на Evolution, активирайки избрания компонент"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Стартиране в режим „Включен“"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Принудително затваряне на всички компоненти на Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Принудително мигриране от Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпращане изхода от дебъга на всички компоненти във файл."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Спиране зареждането на каквито и да е приставки."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr " - организатор и пощенски клиент - Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18445,7 +18376,7 @@ 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-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Избор на _всичко"
@@ -18576,7 +18507,6 @@ msgid "Month"
 msgstr "Месец"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Следващ"
 
@@ -18585,7 +18515,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Преглед на календар за печат"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Предишен"
 
@@ -18673,11 +18603,11 @@ msgstr "Изрязване на избраното в буфера за обме
 msgid "Paste from clipboard"
 msgstr "Поставяне от буфера за обмен"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Поставяне на текст от буфера за обмен"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Избиране на целия текст"
 
@@ -18712,31 +18642,30 @@ msgstr "Натиснете тук, за да прегледате налична
 msgid "Close"
 msgstr "Затваряне"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Вмъква_не"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../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-editor.xml.h:15 ../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-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Файл"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Помощ"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Вмъкване"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Настройки"
@@ -18836,11 +18765,6 @@ msgstr "Превключване между това дали времето д�
 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"
@@ -19592,6 +19516,11 @@ msgstr "Получаване на известие, когато писмото
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Вмъква_не"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Отваряне на файл"
@@ -20233,19 +20162,14 @@ msgstr "Вид изглед"
 msgid "Type of view:"
 msgstr "Вид изглед:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-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:418
+#: ../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:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20313,7 +20237,7 @@ msgid "Minimum Width"
 msgstr "Минимална ширина"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Разстояние"
 
@@ -20455,23 +20379,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Разширен"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Дали разширителя е разширен или не"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Текст на етикета на разширителя"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Използване на подчертаване"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20479,32 +20403,32 @@ msgstr ""
 "Ако е зададено, подчертаването в текста обозначава, че следващия знак трябва "
 "да се използва като клавиш за мнемоничен ускорител"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Разстояние, което да бъде поставено между етикета и детето"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Графичен обект за етикети"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 "Графичен обект за показване на място на обичайния етикет на разширителя"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Размер на разширителя"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Размер на стрелката на разширителя"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Разстояние на индикатора"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Разстояние около стрелката за оразмеряване"
 
@@ -20584,38 +20508,38 @@ msgstr "Ширина на колоната"
 msgid "Search"
 msgstr "Търсене"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Търсене"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Намиране сега"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "Изчиств_ане"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Тип търсене"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Идентификатор на елемента"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "Идентификатор на поделемента"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Текст"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
 msgstr "Търсене _сега"
 
 #: ../widgets/misc/e-selection-model-array.c:547
diff --git a/po/br.po b/po/br.po
new file mode 100644
index 0000000000..d847b7ca89
--- /dev/null
+++ b/po/br.po
@@ -0,0 +1,20471 @@
+# Breton translation of evolution.
+# Copyright (C) 2004-2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution package.
+# Jérémy Ar Floc'h <jeremy.lefloch@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: Evolution 2-14\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-14 02:39-0500\n"
+"PO-Revision-Date: 2006-05-13 14:07+0000\n"
+"Last-Translator: tangi.bzh <tangidan@yahoo.fr>\n"
+"Language-Team: GNOME Breton team <jeremy.lefloch@gmail.com>\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"
+
+#: ../a11y/addressbook/ea-addressbook-view.c:94
+#: ../a11y/addressbook/ea-addressbook-view.c:103
+#: ../a11y/addressbook/ea-minicard-view.c:169
+msgid "evolution addressbook"
+msgstr "karned chomlec'h evolution"
+
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:226
+msgid "New Contact"
+msgstr "Darempred nevez"
+
+#: ../a11y/addressbook/ea-minicard-view.c:35
+#: ../addressbook/gui/component/addressbook-component.c:234
+msgid "New Contact List"
+msgstr "Roll darempred nevez"
+
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "Ar renkell karned chomlec'h en implij en deus %d kartenn"
+msgstr[1] "Ar renkell karned chomlec'h en implij en deus %d kartenn"
+
+#: ../a11y/addressbook/ea-minicard.c:31
+#: ../ui/evolution-message-composer.xml.h:12
+msgid "Open"
+msgstr "Digeriñ"
+
+#: ../a11y/addressbook/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "Roll an darempredoù "
+
+#: ../a11y/addressbook/ea-minicard.c:142
+msgid "Contact: "
+msgstr "Darempred: "
+
+#: ../a11y/addressbook/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "Kartenn vihan Evolution"
+
+#: ../a11y/calendar/ea-cal-view-event.c:266
+msgid "It has alarms."
+msgstr "Alarmoù en deus."
+
+#: ../a11y/calendar/ea-cal-view-event.c:269
+msgid "It has recurrences."
+msgstr "Adwezhioù en deus."
+
+#: ../a11y/calendar/ea-cal-view-event.c:272
+msgid "It is a meeting."
+msgstr "Un emvod eo."
+
+#: ../a11y/calendar/ea-cal-view-event.c:278
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Degouezh deiziadurel: ar berrskrid 'zo %s."
+
+#: ../a11y/calendar/ea-cal-view-event.c:280
+msgid "Calendar Event: It has no summary."
+msgstr "Degouezh deiziadurel: n'eus ket berrskrid."
+
+#: ../a11y/calendar/ea-cal-view-event.c:299
+msgid "calendar view event"
+msgstr "Sell degouezhioù an deiziadur"
+
+#: ../a11y/calendar/ea-cal-view-event.c:528
+msgid "Grab Focus"
+msgstr "Tapout ar Fokus"
+
+#: ../a11y/calendar/ea-cal-view.c:302
+msgid "New Appointment"
+msgstr "Emgav nevez"
+
+#: ../a11y/calendar/ea-cal-view.c:303
+msgid "New All Day Event"
+msgstr "Degouezh nevez un devezh a-bezh"
+
+#: ../a11y/calendar/ea-cal-view.c:304
+msgid "New Meeting"
+msgstr "Emvod nevez"
+
+#: ../a11y/calendar/ea-cal-view.c:305
+msgid "Go to Today"
+msgstr "Mont d'an deiz a hiziv"
+
+#: ../a11y/calendar/ea-cal-view.c:306
+msgid "Go to Date"
+msgstr "Mont d'an deiziad"
+
+#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-week-view-main-item.c:301
+msgid "a table to view and select the current time range"
+msgstr "un daolenn 'benn diskouez pe dibab stumm an eur"
+
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "%d degouezh en deus."
+msgstr[1] "%d degouezh en deus."
+
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+msgid "It has no events."
+msgstr "N'en deus degouezhioù ebet."
+
+#: ../a11y/calendar/ea-day-view.c:155
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Sell labour sizhuniek: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:158
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Sell bemdeziek: %s. %s"
+
+#: ../a11y/calendar/ea-day-view.c:189
+msgid "calendar view for a work week"
+msgstr "Sell an deiziadur evit ur sizhunvezh labour"
+
+#: ../a11y/calendar/ea-day-view.c:191
+msgid "calendar view for one or more days"
+msgstr "Sell an deiziadur evit unan pe meur a zeiz"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:187
+#: ../calendar/gui/calendar-component.c:661
+msgid "%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.
+#. strftime format %a = abbreviated weekday name,
+#. %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:664
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
+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:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
+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:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
+msgid "%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:690
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
+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:772
+msgid "Gnome Calendar"
+msgstr "Deiziadur Gnome"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:290
+msgid "search bar"
+msgstr "Barrenn enklask"
+
+#: ../a11y/calendar/ea-gnome-calendar.c:291
+msgid "evolution calendar search bar"
+msgstr "Barrenn enklask deiziadur Evolution"
+
+#: ../a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr "Nozelenn sailh"
+
+#: ../a11y/calendar/ea-jump-button.c:158
+msgid "Click here, you can find more events."
+msgstr "En ur glikañ amañ, e c'hallez kavout muioc'h a zegouezhioù."
+
+#: ../a11y/calendar/ea-week-view.c:157
+#, c-format
+msgid "Month View: %s. %s"
+msgstr "Sell mizieg: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:161
+#, c-format
+msgid "Week View: %s. %s"
+msgstr "Sell sizhunieg: %s. %s"
+
+#: ../a11y/calendar/ea-week-view.c:192
+msgid "calendar view for a month"
+msgstr "Sell an deiziadur evit ur mizvezh"
+
+#: ../a11y/calendar/ea-week-view.c:194
+msgid "calendar view for one or more weeks"
+msgstr "Sell an deiziadur evit unan pe muioc'h a sizhunioù"
+
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
+msgid "popup"
+msgstr "prenestr-trumm"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+msgid "popup a child"
+msgstr "diskouezh ur mab"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+msgid "edit"
+msgstr "embann"
+
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+msgid "begin editing this cell"
+msgstr "kregiñ gant embann ar gell-mañ"
+
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:151
+msgid "toggle"
+msgstr "kemmañ"
+
+#. action name
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:152
+msgid "toggle the cell"
+msgstr "kemmañ ar gell"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:171
+msgid "expand"
+msgstr "astenn"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+msgid "expands the row in the ETree containing this cell"
+msgstr "astenn al linenn e-barzh an ETree a zalc'h ar gell-mañ"
+
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
+msgid "collapse"
+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
+msgid "Table Cell"
+msgstr "Kell an daolenn"
+
+#: ../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:574
+msgid "click to add"
+msgstr "klikit evit ouzhpennañ"
+
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
+msgid "click"
+msgstr "klikit"
+
+#: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
+msgid "sort"
+msgstr "dibab"
+
+#: ../a11y/widgets/ea-calendar-item.c:296
+#: ../a11y/widgets/ea-calendar-item.c:302
+msgid "%d %B %Y"
+msgstr "%d %B %Y"
+
+#: ../a11y/widgets/ea-calendar-item.c:304
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Deiziadur: eus %s beteg %s"
+
+#: ../a11y/widgets/ea-calendar-item.c:339
+msgid "evolution calendar item"
+msgstr "Elfenn an deiziadur Evolution"
+
+#: ../a11y/widgets/ea-combo-button.c:40
+msgid "Combo Button"
+msgstr ""
+
+#: ../a11y/widgets/ea-combo-button.c:50
+msgid "Activate Default"
+msgstr "Implij an dibab dre-ziouer"
+
+#: ../a11y/widgets/ea-combo-button.c:52
+msgid "Popup Menu"
+msgstr "Meuziad prenistri trumm"
+
+#: ../addressbook/addressbook.error.xml.h:1
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Un darempred a zo anezhañ dija gant ar chomlec'h-mañ. C'hoant az pefe "
+"ouzhpennañ ur gartenn nevez gant ar memes chomlec'h memestra?"
+
+#: ../addressbook/addressbook.error.xml.h:2
+msgid "Address '{0}' already exists."
+msgstr "Ar chomlec'h '{0}' a zo anezhañ dija."
+
+#: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot move contact."
+msgstr "N'eus ket tu da zilec'hiañ an darempred."
+
+#: ../addressbook/addressbook.error.xml.h:4
+msgid "Category editor not available."
+msgstr "An aozer rummadoù n'eo ket hegerz."
+
+#: ../addressbook/addressbook.error.xml.h:5
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Gwiriekait hag eñ eo bet distaget mad ho ker-kuzh hag emaoc'h oc'h implijout "
+"un doare mad d'en em lugañ. Dalc'hit sonj o deus ar gerioù-kuzh doujans deus "
+"stummoù al lizherennoù; marteze emañ ho 'caps lock' lakaet war implij."
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Could not get schema information for LDAP server."
+msgstr "Dic'houest da gaout keloù war stumm an tres evit ar sevijer LDAP."
+
+#: ../addressbook/addressbook.error.xml.h:7
+msgid "Could not remove addressbook."
+msgstr "N'eus ket tu dilemel ar c'harned chomlec'h."
+
+#: ../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
+msgid "Delete address book '{0}'?"
+msgstr "Dilemel ar c'harned chomlec'h '{0}'?"
+
+#: ../addressbook/addressbook.error.xml.h:10
+msgid "Error loading addressbook."
+msgstr "Fazi o kargañ ar c'harned chomlec'h."
+
+#: ../addressbook/addressbook.error.xml.h:11
+msgid "Error saving {0} to {1}: {2}"
+msgstr "Fazi o wareziñ {0} war-du {1}: {2}"
+
+#: ../addressbook/addressbook.error.xml.h:12
+msgid "Failed to authenticate with LDAP server."
+msgstr "Fazi oc'h en em kinnig da servijer LDAP."
+
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:14
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Ne respont ket LDAP gant keloù ur stumm-tres mad."
+
+#: ../addressbook/addressbook.error.xml.h:15
+msgid "Server Version"
+msgstr "Aozerezh ar servijer"
+
+#: ../addressbook/addressbook.error.xml.h:16
+msgid "Some features may not work properly with your current server"
+msgstr "Marteze ne 'z' a ket traoù 'zo en dro gant stad a vremañ ho servijer"
+
+#: ../addressbook/addressbook.error.xml.h:17
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Kuitaet en deus karned chomlec'h Evolution hep abeg."
+
+#: ../addressbook/addressbook.error.xml.h:18
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Bras a walc'h eo ar skeudenn ho peus dibabet. Daoust ha c'hoant 'pefe "
+"adventañ ha gwareziñ anezhi?"
+
+#: ../addressbook/addressbook.error.xml.h:19
+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 ""
+"Sur walc'h e implij ar servijer LDAP se un aozerezh LDAP kozhoc'h n'eo ket "
+"evit gouzañv seurt urzhioù pe n'eo ket bet stummet mad. Goulennit digant ho "
+"aozer-sistem 'benn kaout an urzhioù diazez asantet."
+
+#: ../addressbook/addressbook.error.xml.h:20
+msgid "This address book will be removed permanently."
+msgstr "Skarzhet 'vo ar c'harned-chomlec'h se da viken."
+
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "This addressbook could not be opened."
+msgstr "Ne c'hell ket ar c'harned-chomlec'h se bezañ digoret."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:23
+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:24
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+"N'eo ket ar c'harned-chomlec'h se 'vit gouzañv keloù stumm-tres LDAPv3."
+
+#: ../addressbook/addressbook.error.xml.h:25
+msgid "Unable to open addressbook"
+msgstr "Dic'houest da zigeriñ ar c'harned-chomlec'h"
+
+#: ../addressbook/addressbook.error.xml.h:26
+msgid "Unable to perform search."
+msgstr "Dic'houest da gas an enklask da benn."
+
+#: ../addressbook/addressbook.error.xml.h:27
+msgid "Unable to save {0}."
+msgstr "Dic'houest da wareziñ {0}."
+
+#: ../addressbook/addressbook.error.xml.h:28
+msgid "Would you like to save your changes?"
+msgstr "C'hoant 'pefe gwareziñ ar cheñchamantoù?"
+
+#: ../addressbook/addressbook.error.xml.h:29
+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 ""
+"Klask a reoc'h dilec'hiañ un darempred deus ur c'harned-chomlec'h beteg un "
+"all met ne c'hell ket bezañ skarzhet deus ar c'harned a orin. C'hoant 'pefe "
+"gwareziñ un eilskouer dioutañ?"
+
+#: ../addressbook/addressbook.error.xml.h:30
+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:31
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+"Kemmet eo bet an darempred se. C'hoant 'pefe gwareziñ ar cheñchamantoù?"
+
+#: ../addressbook/addressbook.error.xml.h:32
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Ne vo ket tu deoc'h kaout darempredoù {0} araog bezañ digoret Evolution en "
+"dro."
+
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
+#: ../plugins/groupwise-features/junk-settings.glade.h:4
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:15
+msgid "_Add"
+msgstr "_Ouzhpennañ"
+
+#: ../addressbook/addressbook.error.xml.h:34
+msgid "_Discard"
+msgstr "_Nullañ"
+
+#: ../addressbook/addressbook.error.xml.h:35
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+msgid "{0}"
+msgstr "{0}"
+
+#: ../addressbook/addressbook.error.xml.h:36
+msgid "{1}"
+msgstr "{1}"
+
+#: ../addressbook/conduit/address-conduit.c:300
+msgid "Default Sync Address:"
+msgstr "Chomlec'h kenlusk a ziouer:"
+
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
+msgid "Could not load addressbook"
+msgstr "Dic'houest da gargañ ar c'harned-chomlec'h"
+
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
+msgid "Could not read pilot's Address application block"
+msgstr "Dic'houest da lenn blok blenier poellad ar chomlec'hioù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "D_arempredoù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "Testennioù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/addressbook-view.c:1335
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:586
+msgid "Contacts"
+msgstr "Darempredoù"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Address Book"
+msgstr "Karned-chomlec'h Evolution"
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Address Book address pop-up"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Address Book address viewer"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Address Book card viewer"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Address Book component"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+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-migrate.c:483
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../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:299
+#: ../mail/mail-vfolder.c:223
+msgid "On This Computer"
+msgstr ""
+
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. Create the default Person addressbook
+#. orange
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:491
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../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:1054 ../mail/mail-config.glade.h:105
+msgid "Personal"
+msgstr "Personelaet"
+
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:501
+msgid "On LDAP Servers"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-component.c:227
+msgid "_Contact"
+msgstr "Darempred"
+
+#: ../addressbook/gui/component/addressbook-component.c:228
+msgid "Create a new contact"
+msgstr "Krouiñ un darempred nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:235
+msgid "Contact _List"
+msgstr "Roll an darempredoù"
+
+#: ../addressbook/gui/component/addressbook-component.c:236
+msgid "Create a new contact list"
+msgstr "Krouiñ roll an darempredoù nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1202
+msgid "New Address Book"
+msgstr "Karned chomlec'h nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:243
+msgid "Address _Book"
+msgstr "Karned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-component.c:244
+msgid "Create a new address book"
+msgstr "Krouiñ ur c'harned chomlec'h nevez"
+
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:329
+msgid "Base"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:192
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "Seurt :"
+
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy book content locally for offline operation"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
+#: ../smime/gui/smime-ui.glade.h:28
+msgid "General"
+msgstr "Hollek"
+
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
+msgstr "Karned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-config.c:986
+msgid "Server Information"
+msgstr "Titour ar servijer"
+
+#: ../addressbook/gui/component/addressbook-config.c:988
+msgid "Authentication"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
+msgid "Details"
+msgstr "Munud"
+
+#: ../addressbook/gui/component/addressbook-config.c:992
+msgid "Searching"
+msgstr "O klask"
+
+#: ../addressbook/gui/component/addressbook-config.c:994
+msgid "Downloading"
+msgstr "O pellgargañ"
+
+#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/ldap-config.glade.h:13
+msgid "Address Book Properties"
+msgstr "Perzhioù ar c'harned chomlec'h"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
+msgid "Migrating..."
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
+#, c-format
+msgid "Migrating `%s':"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:629
+msgid "LDAP Servers"
+msgstr "Servijeroù LDAP"
+
+#: ../addressbook/gui/component/addressbook-migrate.c:744
+msgid "Autocompletion Settings"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../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: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: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:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "Adenvel ar renkell"
+
+#: ../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:953
+msgid "_New Address Book"
+msgstr "Karned chomlec'h nevez"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../calendar/gui/calendar-component.c:538
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../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 "Dilemel"
+
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As Vcard..."
+msgstr "Gwarediñ evel Vcard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
+msgid "_Properties..."
+msgstr "Perzhioù..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1346
+msgid "Contact Source Selector"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:99
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
+msgid "Failed to authenticate.\n"
+msgstr ""
+
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "Roit ar ger-kuzh evit %s (implijer %s)"
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "Autocomplete length"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "EFolderList XML for the list of completion URIs"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid "EFolderList XML for the list of completion URIs."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+msgid "Show preview pane"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+msgid "URI for the folder last used in the select names dialog"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+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:63
+msgid "Vertical pane position"
+msgstr ""
+
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+msgid "Whether to show the preview pane."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:1
+msgid "1"
+msgstr "1"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:3
+msgid "389"
+msgstr "389"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:4
+msgid "5"
+msgstr "5"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:5
+msgid "636"
+msgstr "636"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
+msgid "<b>Authentication</b>"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:7
+msgid "<b>Display</b>"
+msgstr "<b>Diskouez</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:8
+msgid "<b>Downloading</b>"
+msgstr "<b>O pellgargañ</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Searching</b>"
+msgstr "<b>O klask</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:10
+msgid "<b>Server Information</b>"
+msgstr "<b>Titour ar servijer</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:11
+msgid "<b>Type:</b>"
+msgstr "<b>Seurt :</b>"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:12
+msgid "Add Address Book"
+msgstr "Ouzhpennañ ur c'harned chomlec'h"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:777
+msgid "Always"
+msgstr "Atav"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:15
+msgid "Anonymously"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:16
+msgid "Basic"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:18
+msgid "Distinguished name"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:19
+msgid "Email address"
+msgstr "Chomlec'h postel"
+
+#: ../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:21
+msgid "Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:23
+msgid "Lo_gin:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:776
+msgid "Never"
+msgstr "Morse"
+
+#. 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
+msgid "No encryption"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "One"
+msgstr "Unan"
+
+#. 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 ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search Filter"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search _base:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid "Search _filter:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:31
+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."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:34
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:35
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+msgid "Sub"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:37
+msgid "Supported Search Bases"
+msgstr ""
+
+#. 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 ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"The search base is the distinguished name (DN) of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:40
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+
+#: ../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: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: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: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: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:46
+msgid "Using distinguished name (DN)"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:47
+msgid "Using email address"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:48
+msgid "Whenever Possible"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Add Address Book"
+msgstr "Ouzhpennañ ur c'harned chomlec'h"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Download limit:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Login method:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
+#: ../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
+msgid "_Name:"
+msgstr "Anv :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
+msgstr "Porzh :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:55
+msgid "_Search scope:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+msgid "_Server:"
+msgstr "Servijer :"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:58
+msgid "_Use secure connection:"
+msgstr ""
+
+#: ../addressbook/gui/component/ldap-config.glade.h:59
+msgid "cards"
+msgstr "kartennoù"
+
+#: ../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
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
+#: ../plugins/calendar-http/calendar-http.c:286
+#: ../plugins/calendar-weather/calendar-weather.c:563
+msgid "minutes"
+msgstr "munutoù"
+
+#: ../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/calendar-setup.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/contact-editor/contact-editor.glade.h:2
+msgid "<b>Email</b>"
+msgstr "<b>Postel</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
+msgid "<b>Home</b>"
+msgstr "<b>Chomlec'h</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
+msgid "<b>Instant Messaging</b>"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Job</b>"
+msgstr "<b>Micher</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>A bep seurt</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+msgid "<b>Other</b>"
+msgstr "<b>All</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+msgid "<b>Telephone</b>"
+msgstr "<b>Pellgomz</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+msgid "<b>Web Addresses</b>"
+msgstr "<b>Gwiadva</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
+msgid "<b>Work</b>"
+msgstr "<b>Labour</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../addressbook/gui/widgets/e-minicard.c:182
+msgid "Contact"
+msgstr "Darempred"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
+msgid "Contact Editor"
+msgstr "Aozer darempredoù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+msgid "Full _Name..."
+msgstr "Anv leun..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+msgid "Image"
+msgstr "Skeudenn"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
+msgid "MSN Messenger"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+msgid "Mailing Address"
+msgstr "Chomlec'h postel"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Ni_ckname:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
+msgid "Novell Groupwise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+msgid "Personal Information"
+msgstr "Titouroù personelaet"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+msgid "Telephone"
+msgstr "Pellgomz"
+
+#. red
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
+msgid "Work"
+msgstr "Labour"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "Chomlec'hioù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+msgid "_Anniversary:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "_Assistant:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+msgid "_Birthday:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../plugins/itip-formatter/itip-view.c:1652
+msgid "_Calendar:"
+msgstr "Deiziadur :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "Rummadoù"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+msgid "_City:"
+msgstr "Kêr :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+msgid "_Company:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "_Country:"
+msgstr "Bro :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+msgid "_Department:"
+msgstr "Departament :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+msgid "_File under:"
+msgstr "Restr dindan :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+msgid "_Free/Busy:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "_Home Page:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "_Manager:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+msgid "_Notes:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "_Office:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+msgid "_PO Box:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "_Profession:"
+msgstr "Micher :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "_Spouse:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
+msgid "_State/Province:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
+msgid "_Title:"
+msgstr "Titl :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+msgid "_Video Chat:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+msgid "_Wants to receive HTML mail"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+msgid "_Web Log:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+msgid "_Where:"
+msgstr "Pelec'h :"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+msgid "_Zip/Postal Code:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
+msgid "Address"
+msgstr "Chomlec'h"
+
+#: ../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:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
+#: ../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
+#: ../widgets/menus/gal-define-views-model.c:181
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
+msgid "Editable"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+msgid "United States"
+msgstr "Stadoù Unanet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+msgid "Albania"
+msgstr "Albani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+msgid "Algeria"
+msgstr "Aljeri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+msgid "American Samoa"
+msgstr "Samoa (SU)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+msgid "Andorra"
+msgstr "Andorre"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+msgid "Angola"
+msgstr "Angola"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+msgid "Antarctica"
+msgstr "Antartik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+msgid "Antigua And Barbuda"
+msgstr "Antigua ha Barbuda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+msgid "Argentina"
+msgstr "Arc'hantin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+msgid "Armenia"
+msgstr "Armeni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+msgid "Aruba"
+msgstr "Aruba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+msgid "Australia"
+msgstr "Aostralia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+msgid "Austria"
+msgstr "Aotrich"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+msgid "Azerbaijan"
+msgstr "Azerbaijan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+msgid "Bahamas"
+msgstr "Bahamas"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+msgid "Bahrain"
+msgstr "Bahrain"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+msgid "Barbados"
+msgstr "Barbados"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+msgid "Belarus"
+msgstr "Belarus"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+msgid "Belgium"
+msgstr "Beljik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+msgid "Belize"
+msgstr "Belize"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+msgid "Benin"
+msgstr "Benin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+msgid "Bolivia"
+msgstr "Bolivi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+msgid "Bosnia And Herzegowina"
+msgstr "Bosnie Herzegovine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+msgid "Botswana"
+msgstr "Botswana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+msgid "Bouvet Island"
+msgstr "Enez Bouvet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+msgid "Brazil"
+msgstr "Brezil"
+
+#: ../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:169
+msgid "Brunei Darussalam"
+msgstr "runei Darussalam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+msgid "Bulgaria"
+msgstr "Bulgari"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+msgid "Burundi"
+msgstr "Burundi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+msgid "Cambodia"
+msgstr "Kambodj"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+msgid "Cameroon"
+msgstr "Kameroun"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+msgid "Cape Verde"
+msgstr "Kap Gwer"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+msgid "Cayman Islands"
+msgstr "Inizi Cayman"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+msgid "Central African Republic"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+msgid "Chad"
+msgstr "Tchad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+msgid "Chile"
+msgstr "Chili"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+msgid "China"
+msgstr "Sina"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+msgid "Christmas Island"
+msgstr "Enez Nedeleg"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+msgid "Colombia"
+msgstr "Kolombi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+msgid "Comoros"
+msgstr "Comoros"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Congo"
+msgstr "Kongo"
+
+#: ../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:188
+msgid "Cook Islands"
+msgstr "Inizi Cook"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+msgid "Croatia"
+msgstr "Croitia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+msgid "Cuba"
+msgstr "Cuba"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+msgid "Cyprus"
+msgstr "Cyprus"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+msgid "Czech Republic"
+msgstr "Republik tchek"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+msgid "Denmark"
+msgstr "Danmark"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+msgid "Dominica"
+msgstr "Dominik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+msgid "Dominican Republic"
+msgstr "Republik dominikan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+msgid "Ecuador"
+msgstr "Kehider"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+msgid "Egypt"
+msgstr "Ejipt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+msgid "El Salvador"
+msgstr "Salvador"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+msgid "Estonia"
+msgstr "Estoni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+msgid "Ethiopia"
+msgstr "Ethiopi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+msgid "Falkland Islands"
+msgstr "Inizi Falklands"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+msgid "Faroe Islands"
+msgstr "Inizi Faroe"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+msgid "Fiji"
+msgstr "Fiji"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+msgid "Finland"
+msgstr "Finlan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+msgid "France"
+msgstr "Bro-C'hall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+msgid "French Guiana"
+msgstr "Guine Gallaoued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+msgid "French Polynesia"
+msgstr "Polinesi Gallaoued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+msgid "French Southern Territories"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+msgid "Gabon"
+msgstr "Gabon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+msgid "Gambia"
+msgstr "Gambi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+msgid "Georgia"
+msgstr "Jeorji"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+msgid "Germany"
+msgstr "Alamagn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+msgid "Ghana"
+msgstr "Ghana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+msgid "Gibraltar"
+msgstr "Gibraltar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+msgid "Greece"
+msgstr "Gres"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+msgid "Greenland"
+msgstr "Greenland"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+msgid "Grenada"
+msgstr "Grenad"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+msgid "Guadeloupe"
+msgstr "Gwadeloup"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+msgid "Guam"
+msgstr "Guam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guatemala"
+msgstr "Guatemala"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+msgid "Guernsey"
+msgstr "Guernsey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+msgid "Guinea"
+msgstr "Guine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+msgid "Guinea-bissau"
+msgstr "Guine-bissau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+msgid "Guyana"
+msgstr "Gwiana"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+msgid "Haiti"
+msgstr "Haiti"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+msgid "Heard And McDonald Islands"
+msgstr "Inizi Head ha McDonald"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+msgid "Holy See"
+msgstr "Vatikan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+msgid "Honduras"
+msgstr "Honduras"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+msgid "Hong Kong"
+msgstr "Hong Kong"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+msgid "Hungary"
+msgstr "Hongri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+msgid "Iceland"
+msgstr "Island"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+msgid "India"
+msgstr "Indez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+msgid "Indonesia"
+msgstr "Indonezi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+msgid "Iran"
+msgstr "Iran"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+msgid "Iraq"
+msgstr "Irak"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Ireland"
+msgstr "Iwerzhon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+msgid "Isle of Man"
+msgstr "Enez Man"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+msgid "Israel"
+msgstr "Israel"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+msgid "Italy"
+msgstr "Itali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+msgid "Jamaica"
+msgstr "Jamaik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Japan"
+msgstr "Japon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+msgid "Jersey"
+msgstr "Jersey"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+msgid "Jordan"
+msgstr "Jordan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+msgid "Kazakhstan"
+msgstr "Kazakhstan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+msgid "Kenya"
+msgstr "Kenya"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+msgid "Kiribati"
+msgstr "Kiribati"
+
+#: ../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:253
+msgid "Korea, Republic Of"
+msgstr "Kore, Republik Ar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+msgid "Kuwait"
+msgstr "Kowait"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+msgid "Kyrgyzstan"
+msgstr "Kyrgyzstan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+msgid "Laos"
+msgstr "Laos"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+msgid "Latvia"
+msgstr "Letoni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+msgid "Lebanon"
+msgstr "Liban"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Liberia"
+msgstr "Liberia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+msgid "Libya"
+msgstr "Libi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+msgid "Lithuania"
+msgstr "Lithuani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+msgid "Luxembourg"
+msgstr "Luksembourg"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+msgid "Macao"
+msgstr "Macao"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+msgid "Macedonia"
+msgstr "Makedonia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+msgid "Madagascar"
+msgstr "Madagascar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+msgid "Malawi"
+msgstr "Malawi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+msgid "Malaysia"
+msgstr "Malezia"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+msgid "Maldives"
+msgstr "Maldives"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+msgid "Mali"
+msgstr "Mali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+msgid "Malta"
+msgstr "Malt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+msgid "Marshall Islands"
+msgstr "Inizi Marshall"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+msgid "Martinique"
+msgstr "Martinik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+msgid "Mauritania"
+msgstr "MAOURITANI"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+msgid "Mauritius"
+msgstr "Maoris"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+msgid "Mexico"
+msgstr "Meksik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+msgid "Micronesia"
+msgstr "Mikronesi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+msgid "Moldova, Republic Of"
+msgstr "Moldavi, Republik Ar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+msgid "Monaco"
+msgstr "Monaco"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+msgid "Mongolia"
+msgstr "Mongoli"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+msgid "Montserrat"
+msgstr "Montserrat"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+msgid "Morocco"
+msgstr "Marok"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+msgid "Mozambique"
+msgstr "Mozambik"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+msgid "Myanmar"
+msgstr "Myanmar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+msgid "Namibia"
+msgstr "Namibi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+msgid "Nauru"
+msgstr "Nauru"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+msgid "Nepal"
+msgstr "Nepal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+msgid "Netherlands"
+msgstr "Izelvroioù"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+msgid "Netherlands Antilles"
+msgstr "Antilh Izelvroioù"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+msgid "New Caledonia"
+msgstr "Kaledoni nevez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+msgid "New Zealand"
+msgstr "Zeland nevez"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+msgid "Nicaragua"
+msgstr "Nicaragua"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+msgid "Niger"
+msgstr "Niger"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+msgid "Nigeria"
+msgstr "Nigeria"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+msgid "Niue"
+msgstr "Niue"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+msgid "Norfolk Island"
+msgstr "Enez Norfolk"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+msgid "Norway"
+msgstr "Norway"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+msgid "Oman"
+msgstr "Oman"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+msgid "Pakistan"
+msgstr "Pakistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+msgid "Palau"
+msgstr "Palau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+msgid "Palestinian Territory"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+msgid "Panama"
+msgstr "Panama"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+msgid "Papua New Guinea"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+msgid "Peru"
+msgstr "Perou"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+msgid "Philippines"
+msgstr "Filipin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+msgid "Poland"
+msgstr "Pologn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+msgid "Qatar"
+msgstr "Qatar"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+msgid "Reunion"
+msgstr "Reunion"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+msgid "Romania"
+msgstr "Romani"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+msgid "Russian Federation"
+msgstr "Rusi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: ../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:320
+msgid "Saint Lucia"
+msgstr ""
+
+#: ../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:322
+msgid "Samoa"
+msgstr "Samoa"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+msgid "San Marino"
+msgstr "San Marino"
+
+#: ../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:325
+msgid "Saudi Arabia"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Senegal"
+msgstr "Senegal"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+msgid "Seychelles"
+msgstr "Seychelles"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+msgid "Singapore"
+msgstr "Singapour"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+msgid "Slovakia"
+msgstr "Slovaki"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+msgid "Slovenia"
+msgstr "Sloveni"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+msgid "Solomon Islands"
+msgstr "Inizi Solomon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+msgid "Somalia"
+msgstr "Somali"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+msgid "South Africa"
+msgstr ""
+
+#: ../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:337
+msgid "Spain"
+msgstr "Spagn"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+msgid "St. Helena"
+msgstr "St. Elen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+msgid "St. Pierre And Miquelon"
+msgstr "St. Pierre ha Miquelon"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+msgid "Sudan"
+msgstr "Soudan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+msgid "Suriname"
+msgstr "Surinam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+msgid "Svalbard And Jan Mayen Islands"
+msgstr "Inizi Svalbard ha Jan Mayen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+msgid "Swaziland"
+msgstr "Swaziland"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+msgid "Sweden"
+msgstr "Sued"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+msgid "Switzerland"
+msgstr "Suis"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+msgid "Syria"
+msgstr "Siri"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+msgid "Tajikistan"
+msgstr "Tajikistan"
+
+#: ../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:351
+msgid "Thailand"
+msgstr "Thailand"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+msgid "Timor-Leste"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+msgid "Togo"
+msgstr "Togo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+msgid "Trinidad And Tobago"
+msgstr "Trinidad ha Tobago"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+msgid "Tunisia"
+msgstr "Tunizi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+msgid "Turkey"
+msgstr "Turki"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+msgid "Turkmenistan"
+msgstr "Turkmenistan"
+
+#: ../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:361
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+msgid "Uganda"
+msgstr "Uganda"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+msgid "United Arab Emirates"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+msgid "United Kingdom"
+msgstr ""
+
+#: ../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:367
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+msgid "Uzbekistan"
+msgstr "Uzbekistan"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+msgid "Viet Nam"
+msgstr "Vietnam"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+msgid "Virgin Islands, British"
+msgstr "Inizi Virgin, Saoz"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+msgid "Virgin Islands, U.S."
+msgstr "Inizi Virgin, S.U"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+msgid "Wallis And Futuna Islands"
+msgstr "Inizi Wallis ha Futuna"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+msgid "Western Sahara"
+msgstr "Sahara kornog"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+msgid "Yemen"
+msgstr "Yemen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+msgid "Zambia"
+msgstr "Zambi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
+
+#: ../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:369
+#: ../widgets/menus/gal-view-new-dialog.c:73
+msgid "Name"
+msgstr "Anv"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "AOL Instant Messenger"
+msgstr ""
+
+#: ../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:351
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
+msgid "Service"
+msgstr "Servij"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/save-calendar/csv-format.c:400
+msgid "Location"
+msgstr "Lec'hiadur"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
+msgid "Username"
+msgstr "Anv implijer"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+msgid "Home"
+msgstr "Kêr"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+msgid "Other"
+msgstr "All"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
+msgid "GroupWise"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+msgid "Source Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+msgid "Target Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+msgid "Is New Contact"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+msgid "Writable Fields"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+msgid "Required Fields"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+msgid "Changed"
+msgstr "Kemmet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
+#, c-format
+msgid "Contact Editor - %s"
+msgstr "Aozer darempredoù - %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+msgid "Please select an image for this contact"
+msgstr "Diuzit ur skeudenn evit an darempred-mañ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
+msgid "No image"
+msgstr "Skeudenn ebet"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
+msgid "Invalid contact."
+msgstr "Darempred siek."
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
+msgid "_Edit Full"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "Anv leun"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "Postel"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "Diuzit ur c'harned chomlec'h"
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact list (%s) ?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
+msgid ""
+"Are you sure you want\n"
+"to delete these contact lists?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
+#, c-format
+msgid ""
+"Are you sure you want\n"
+"to delete contact (%s) ?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
+msgid "Address _2:"
+msgstr "Chomlec'h 2 :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
+msgid "Ci_ty:"
+msgstr "Kêr :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+msgid "Countr_y:"
+msgstr "Bro :"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "Full Address"
+msgstr "Chomlec'h leun"
+
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+msgid "_ZIP Code:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Full Name"
+msgstr "Anv leun"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+msgid "I"
+msgstr "I"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+msgid "II"
+msgstr "II"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid "III"
+msgstr "III"
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+msgid "Jr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+msgid "Miss"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+msgid "Mr."
+msgstr "Ao."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+msgid "Mrs."
+msgstr "It."
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+msgid "Ms."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+msgid "Sr."
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+msgid "_First:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+msgid "_Last:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+msgid "_Middle:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+msgid "_Suffix:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:2
+msgid "Add IM Account"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:3
+msgid "_Account name:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:4
+msgid "_IM Service:"
+msgstr ""
+
+#: ../addressbook/gui/contact-editor/im.glade.h:5
+#: ../plugins/calendar-weather/calendar-weather.c:409
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
+msgid "_Location:"
+msgstr "Lec'hiadur :"
+
+#: ../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
+msgid "Add an email to the List"
+msgstr "Ouzhpennañ ur bostel d'ar roll"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
+msgid "Contact List Editor"
+msgstr "Aozer ar roll darempredoù"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+msgid "Insert email addresses from Address Book"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Members"
+msgstr "Implijerion"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Remove an email address from the List"
+msgstr "Dilemel ur chomlec'h postel eus ar roll"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+msgid "_List name:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Select"
+msgstr "Diuz"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: ../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-minicard-view-widget.c:107
+#: ../addressbook/gui/widgets/e-minicard-view.c:506
+msgid "Book"
+msgstr "Levr"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
+msgid "Is New List"
+msgstr "Roll nevez eo"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
+msgid "_Members"
+msgstr "Implijerion"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
+msgid "Contact List Members"
+msgstr "Implijerion eus ar roll darempredoù"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Darempred kemmet :"
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+msgid "Duplicate Contact Detected"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+msgid "New Contact:"
+msgstr "Darempred nevez :"
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+msgid "Original Contact:"
+msgstr ""
+
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
+
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../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:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Rummad eo"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr ""
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Darempred ebet"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d darempred"
+msgstr[1] "%d darempred"
+
+#: ../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-minicard-view-widget.c:114
+#: ../addressbook/gui/widgets/e-minicard-view.c:513
+msgid "Query"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+msgid "Error getting book view"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../widgets/table/e-table-click-to-add.c:502
+#: ../widgets/table/e-table-selection-model.c:311
+#: ../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:3471 ../widgets/text/e-text.c:3472
+msgid "Model"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Fazi o kemmañ ar gartenn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
+msgid "Source"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
+msgid "Type"
+msgstr "Seurt"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "Gwarediñ evel VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
+#: ../ui/evolution-addressbook.xml.h:56
+msgid "_Open"
+msgstr "Digeriñ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "_New Contact..."
+msgstr "Darempred nevez..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+msgid "New Contact _List..."
+msgstr "Roll darempredoù nevez"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+msgid "_Save as VCard..."
+msgstr "Gwarediñ evel VCard..."
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+msgid "_Forward Contact"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "_Forward Contacts"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "Send _Message to Contact"
+msgstr "Kas ur gemennadenn d'an darempred"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "Send _Message to List"
+msgstr "Kas ur gemennadenn d'ar roll"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+msgid "Send _Message to Contacts"
+msgstr "Kas ur gemennadenn d'an darempredoù"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+msgid "_Print"
+msgstr "Moulañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Cop_y to Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Mo_ve to Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "Troc'hañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "Kopiañ"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+msgid "P_aste"
+msgstr "Pegañ"
+
+#. All, unmatched, separator
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
+msgid "Any Category"
+msgstr "An holl rummadoù"
+
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+msgid "Print cards"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+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/event-page.glade.h:8
+#: ../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 "Rummadoù"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "Postel"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Postel 2"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Postel 3"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Anv-familh"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Kazetenn"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
+msgid "Mobile Phone"
+msgstr "Pellgomzer hezoug"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Lesanv"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
+msgid "Note"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Organization"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Pellgomzer all"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Skingomz"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
+#: ../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"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr ""
+
+#. Translators: This is a vcard standard and stands for the type of
+#. phone used by the hearing impaired. TTY stands for "teletype"
+#. (familiar from Unix device names), and TDD is "Telecommunications
+#. Device for Deaf". However, you probably want to leave this
+#. abbreviation unchanged unless you know that there is actually a
+#. different and established translation for this in your language.
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
+msgid "Telex"
+msgstr "Telex"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+msgid "Title"
+msgstr "Titl"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Unit"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Web Site"
+msgstr "Gwiadva"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:138
+#: ../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
+#: ../widgets/table/e-table-col.c:98
+#: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
+msgid "Width"
+msgstr "Led"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:145
+#: ../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
+#: ../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:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
+msgid "Height"
+msgstr "Uhelder"
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:153
+msgid "Has Focus"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
+msgid "Column Width"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:172
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:175
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:499
+msgid "Adapter"
+msgstr ""
+
+#: ../addressbook/gui/widgets/e-minicard.c:161
+msgid "Selected"
+msgstr "Diuzet"
+
+#: ../addressbook/gui/widgets/e-minicard.c:168
+msgid "Has Cursor"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
+msgid "(map)"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
+msgid "map"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
+msgid "List Members"
+msgstr "Roll an implijerion"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
+msgid "E-mail"
+msgstr "Postel"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Position"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+msgid "Phone"
+msgstr "Pellgomz"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
+msgid "Fax"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+msgid "work"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
+msgid "personal"
+msgstr "personelaet"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+msgid "Job Title"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: ../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:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: ../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:54
+msgid "Address Book does not exist"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: ../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:58
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "N'eo ket kavet an darempred"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: ../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:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
+msgid "Canceled"
+msgstr "Nullet"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: ../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:64
+#: ../calendar/gui/comp-editor-factory.c:433
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: ../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:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: ../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:69
+msgid "Not available in offline mode"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
+msgid "Other error"
+msgstr "Fazi all"
+
+#. E_BOOK_ERROR_INVALID_SERVER_VERSION
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
+msgid "Invalid server version"
+msgstr ""
+
+#: ../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: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: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: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: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:147
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: ../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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: ../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:162
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+msgid "Error adding list"
+msgstr "Fazi oc'h ouzhpennañ ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
+msgid "Error adding contact"
+msgstr "Fazi oc'h ouzhpennañ an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
+msgid "Error modifying list"
+msgstr "Fazi o kemmañ ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
+msgid "Error modifying contact"
+msgstr "Fazi o kemmañ an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+msgid "Error removing list"
+msgstr "Fazi o tilemel ar roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
+msgid "Error removing contact"
+msgstr "Fazi o tilemel an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#, c-format
+msgid ""
+"Opening %d contact will open %d new window as well.\n"
+"Do you really want to display this contact?"
+msgid_plural ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
+msgid "Overwrite"
+msgstr "Skrivañ war"
+
+#. 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:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
+msgid "contact"
+msgid_plural "contacts"
+msgstr[0] "Darempred"
+msgstr[1] "Darempredoù"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
+msgid "card.vcf"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "Diuzit ur c'harned chomlec'h"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
+msgid "list"
+msgstr "roll"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
+msgid "Move contact to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
+msgid "Copy contact to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
+msgid "Move contacts to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
+msgid "Copy contacts to"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
+msgid "Multiple VCards"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard evit %s"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+msgid "Contact information"
+msgstr "Titouroù an darempred"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
+#, c-format
+msgid "Contact information for %s"
+msgstr "Titouroù an darempred %s"
+
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
+msgid "Querying Address Book..."
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "There is one other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Un darempred all ez eus."
+msgstr[1] "%d darempred all ez eus."
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:223
+#: ../addressbook/gui/widgets/eab-vcard-control.c:272
+msgid "Show Full VCard"
+msgstr "Diskouez ar VCard leun"
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+msgid "Save in addressbook"
+msgstr "Gwarediñ e-barzh ar c'harned chomlec'h"
+
+#: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
+msgid "Card View"
+msgstr "Sell kartenn"
+
+#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
+msgid "GTK Tree View"
+msgstr ""
+
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "Oc'h enporzhiañ..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "Enporzhier Outlook CSV ha Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Enporzhier Mozilla CSV ha Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV pe Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "Enporzhier Evolution CSV ha 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 "Oc'h enporzhiañ..."
+
+#: ../addressbook/importers/evolution-ldif-importer.c:754
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr "LDAP Data Interchange Furmad (.ldif)"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:755
+msgid "Evolution LDIF importer"
+msgstr "Enporzhier Evolution LDIF"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:547
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard (.vcf, .gcrd)"
+
+#: ../addressbook/importers/evolution-vcard-importer.c:548
+msgid "Evolution VCard Importer"
+msgstr "Enporzhier Evolution VCard"
+
+#: ../addressbook/printing/e-contact-print-envelope.c:213
+#: ../addressbook/printing/e-contact-print-envelope.c:234
+msgid "Print envelope"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.c:923
+msgid "Print contacts"
+msgstr "Moulañ an darempredoù"
+
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
+msgid "Print contact"
+msgstr "Moulañ an darempred"
+
+#: ../addressbook/printing/e-contact-print.glade.h:1
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
+
+#: ../addressbook/printing/e-contact-print.glade.h:2
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
+
+#: ../addressbook/printing/e-contact-print.glade.h:3
+msgid "Blank forms at end:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:4
+msgid "Body"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:5
+msgid "Bottom:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:6
+msgid "Dimensions:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:7
+msgid "F_ont..."
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:8
+msgid "Fonts"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:9
+msgid "Footer:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:10
+msgid "Format"
+msgstr "Furmad"
+
+#: ../addressbook/printing/e-contact-print.glade.h:11
+#: ../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:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1826
+#: ../widgets/table/e-table-selection-model.c:318
+msgid "Header"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:12
+msgid "Header/Footer"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:13
+msgid "Headings"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:14
+msgid "Headings for each letter"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:15
+msgid "Height:"
+msgstr "Uhelder :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:16
+msgid "Immediately follow each other"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:17
+msgid "Include:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:18
+msgid "Landscape"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:19
+msgid "Left:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:20
+msgid "Letter tabs on side"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:21
+msgid "Margins"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:22
+msgid "Number of columns:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:23
+msgid "Options"
+msgstr "Neuziadoù"
+
+#: ../addressbook/printing/e-contact-print.glade.h:24
+#: ../e-util/eggtrayicon.c:120
+msgid "Orientation"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:25
+msgid "Page"
+msgstr "Pajenn"
+
+#: ../addressbook/printing/e-contact-print.glade.h:26
+msgid "Page Setup:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:27
+msgid "Paper"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:28
+msgid "Paper source:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:29
+msgid "Portrait"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:30
+msgid "Preview:"
+msgstr "Rakwelet :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:31
+msgid "Print using gray shading"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:32
+msgid "Reverse on even pages"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:33
+msgid "Right:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:34
+msgid "Sections:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:35
+msgid "Shading"
+msgstr ""
+
+#. FIXME: Take care of i18n
+#: ../addressbook/printing/e-contact-print.glade.h:36
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
+msgid "Size:"
+msgstr "Ment :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:37
+msgid "Start on a new page"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:38
+msgid "Style name:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:39
+msgid "Top:"
+msgstr ""
+
+#: ../addressbook/printing/e-contact-print.glade.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:176
+msgid "Type:"
+msgstr "Seurt :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:41
+msgid "Width:"
+msgstr "Led :"
+
+#: ../addressbook/printing/e-contact-print.glade.h:42
+msgid "_Font..."
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:53
+msgid "Contact Print Style Editor Test"
+msgstr ""
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:54
+#: ../addressbook/printing/test-print.c:53
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright (C) 2000, Ximian, Inc."
+
+#: ../addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:52
+msgid "Contact Print Test"
+msgstr ""
+
+#: ../addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+msgid "Can not open file"
+msgstr "N'eus ket tu da zigeriñ ar restr"
+
+#: ../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:72
+msgid "failed to open book"
+msgstr "C'hwitet digeriñ al levr"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:58
+msgid "List local addressbook folders"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr "Diskouez kartennoù evel vcard pe restr csv"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:60
+msgid "[vcard|csv]"
+msgstr "[vcard|csv]"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr "NIVER"
+
+#: ../addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there is no need for the size option."
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-export.c:153
+msgid "Unhandled error"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-import.c:46
+#, fuzzy
+msgid "Error loading default addressbook."
+msgstr "Fazi o kargañ ar c'harned chomlec'h."
+
+#: ../addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr ""
+
+#: ../addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:1
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:2
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:3
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../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:5
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#: ../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:7
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#: ../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:9
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#: ../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:11
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:12
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:13
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:14
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:15
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:16
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:17
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:18
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:19
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:20
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to send the appointment without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:22
+msgid "Are you sure you want to send the task without a summary?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:24
+msgid "Delete calendar '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete memo list '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:26
+msgid "Delete task list '{0}'?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:27
+msgid "Do _not Send"
+msgstr "Chom hep kas"
+
+#: ../calendar/calendar.error.xml.h:28
+msgid "Download in progress. Do you want to save the appointment?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:29
+msgid "Download in progress. Do you want to save the task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:30
+msgid "Editor could not be loaded."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:31
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:32
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:33
+msgid "Error loading calendar"
+msgstr "Fazi o kargañ an deiziadur"
+
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading memo list"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading task list"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:36
+msgid ""
+"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 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 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 ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:40
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:41
+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 ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:43
+msgid "Some features may not work properly with your current server."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:44
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:45
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:46
+msgid "The calendar is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:47
+msgid "The calendar you have selected is read-only"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:48
+msgid "The memo list is not marked for offline usage"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:49
+msgid "The task list is not marked for offline usage."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "This calendar will be removed permanently."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:51
+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:54
+msgid "Would you like to save your changes to this memo?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:55
+msgid "Would you like to save your changes to this task?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to send a cancelation notice for this journal entry?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send all the participants a cancelation notice?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:60
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:61
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#: ../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 changed this appointment, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:64
+msgid "You have changed this task, but not yet saved it."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:66
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:67
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:68
+#: ../composer/mail-composer.error.xml.h:27
+msgid "_Discard Changes"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
+msgid "_Save"
+msgstr "Gwarediñ"
+
+#: ../calendar/calendar.error.xml.h:70
+msgid "_Save Changes"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:71
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+msgid "_Send"
+msgstr "Kas"
+
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr ""
+
+#: ../calendar/calendar.error.xml.h:73
+msgid "{0}."
+msgstr "{0}."
+
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "Roit ar ger-kuzh"
+
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
+msgid "Split Multi-Day Events:"
+msgstr ""
+
+#: ../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:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
+msgid "Could not start evolution-data-server"
+msgstr "Ne oa ket tu da lañsiñ evolution-data-server"
+
+#: ../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/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: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:1969
+msgid "Calendar and Tasks"
+msgstr "Deiziadur ha traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: ../calendar/gui/calendar-component.c:1291
+msgid "Calendars"
+msgstr "Deiziadurioù"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Deizhiadur ha traoù d'ober Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Aozer Evolution evit an deiziadur/traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+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:11
+msgid "Memo_s"
+msgstr ""
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../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:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
+msgid "Tasks"
+msgstr "Traoù d'ober"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+msgid "_Calendars"
+msgstr "Deiziadurioù"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
+#: ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "Traoù d'ober"
+
+#: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "munut"
+msgstr[1] "munutoù"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../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] "eur"
+msgstr[1] "eurioù"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
+msgid "Start time"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+msgid "Appointments"
+msgstr "Emgavioù"
+
+#. Location
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
+msgid "Location:"
+msgstr "Lec'hiadur :"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze _time:"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../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:17
+#: ../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:40
+msgid "_Edit"
+msgstr "Aozañ"
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
+msgid "_Snooze"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+msgid "location of appointment"
+msgstr "lec'hiadur hag emgav"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
+msgid "No summary available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+msgid "No description available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
+msgid "No location information available."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
+#, c-format
+msgid "You have %d alarms"
+msgstr "%d alarm hoc'h eus"
+
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
+msgid "Warning"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
+msgid "Do not ask me about this program again."
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/notify-main.c:140
+msgid "Could not initialize Bonobo"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/notify-main.c:153
+msgid "Could not create the alarm notify service factory"
+msgstr ""
+
+#: ../calendar/gui/alarm-notify/util.c:41
+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] "%d eur"
+msgstr[1] "%d eur"
+
+#. 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] "%d munut"
+msgstr[1] "%d munut"
+
+#. 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 eilenn"
+msgstr[1] "%d eilenn"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Alarm programs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+msgid "Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Calendars to run alarms for"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Color to draw the Marcus Bains line in the Day View."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Confirm expunge"
+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."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Default appointment reminder"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Default reminder units"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Default reminder value"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Free/busy server URLs"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Free/busy template URL"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Hide completed tasks"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Hide task units"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Hide task value"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+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
+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
+msgid "Intervals shown in Day and Work Week views, in minutes."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Last alarm time"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+msgid "List of server URLs for free/busy publishing."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Marcus Bains Line"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Marcus Bains Line Color - Day View"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Marcus Bains Line Color - Time bar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Minute the workday ends on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Minute the workday starts on, 0 to 59."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Month view horizontal pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Month view vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Number of units for determining a default reminder."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+msgid "Number of units for determining when to hide tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+msgid "Overdue tasks color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+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
+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
+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
+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
+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
+msgid "Programs that are allowed to be run by alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+msgid "Show Role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+msgid "Show appointment end times in week and month views"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Show categories field in the event/meeting/task editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Show display alarms in notification tray"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+msgid "Show week numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+msgid "Tasks due today color"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+msgid "Tasks vertical pane position"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+msgid "Time divisions"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+msgid "Time the last alarm ran, in time_t."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+msgid "Timezone"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+msgid "Twenty four hour time format"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+msgid "Week start"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+msgid "Whether or not to use the notification tray for display alarms."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+msgid "Whether to ask for confirmation when deleting an appointment or task."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+msgid "Whether to ask for confirmation when expunging appointments and tasks."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+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:70
+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:71
+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:72
+msgid "Whether to hide completed tasks in the tasks view."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+msgid "Whether to set a default reminder for appointments."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+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:79
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+msgid "Whether to show week numbers in the date navigator."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+msgid "Work days"
+msgstr "Deizioù labour"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+msgid "Workday end hour"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+msgid "Workday end minute"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+msgid "Workday start hour"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+msgid "Workday start minute"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:48
+msgid "Summary contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:49
+msgid "Description contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr ""
+
+#: ../calendar/gui/cal-search-bar.c:347
+msgid "Unmatched"
+msgstr ""
+
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../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 "Moulañ"
+
+#: ../calendar/gui/calendar-commands.c:119
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../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 "Deiziadur"
+
+#: ../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:354
+msgid "Purge events older than"
+msgstr ""
+
+#: ../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:288
+#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../widgets/misc/e-send-options.glade.h:36
+msgid "days"
+msgstr "deizioù"
+
+#. 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:235
+#: ../calendar/gui/memos-component.c:221 ../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 "War ar gwiad"
+
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the weather group
+#: ../calendar/gui/calendar-component.c:259
+#: ../plugins/calendar-weather/calendar-weather.c:100
+msgid "Weather"
+msgstr "Amzer"
+
+#: ../calendar/gui/calendar-component.c:536
+msgid "_New Calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/calendar-component.c:840
+msgid "Failed upgrading calendars."
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1139
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1152
+msgid "There is no calendar available for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1266
+msgid "Calendar Source Selector"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1457
+msgid "New appointment"
+msgstr "Emgav nevez"
+
+#: ../calendar/gui/calendar-component.c:1458
+msgid "_Appointment"
+msgstr "Emgav"
+
+#: ../calendar/gui/calendar-component.c:1459
+msgid "Create a new appointment"
+msgstr "Krouiñ un emgav nevez"
+
+#: ../calendar/gui/calendar-component.c:1465
+msgid "New meeting"
+msgstr "Emvod nevez"
+
+#: ../calendar/gui/calendar-component.c:1466
+msgid "M_eeting"
+msgstr "Emvod"
+
+#: ../calendar/gui/calendar-component.c:1467
+msgid "Create a new meeting request"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1473
+msgid "New all day appointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1474
+msgid "All Day A_ppointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1475
+msgid "Create a new all-day appointment"
+msgstr ""
+
+#: ../calendar/gui/calendar-component.c:1481
+msgid "New calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/calendar-component.c:1482
+msgid "Cale_ndar"
+msgstr "Deiziadur"
+
+#: ../calendar/gui/calendar-component.c:1483
+msgid "Create a new calendar"
+msgstr "Krouiñ un deiziadur nevez"
+
+#: ../calendar/gui/calendar-view-factory.c:109
+msgid "Day View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:112
+msgid "Work Week View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:115
+msgid "Week View"
+msgstr ""
+
+#: ../calendar/gui/calendar-view-factory.c:118
+msgid "Month View"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:415
+msgid "Error while opening the calendar"
+msgstr "Fazi o tigeriñ an deiziadur"
+
+#: ../calendar/gui/comp-editor-factory.c:421
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:427
+msgid "Permission denied to open the calendar"
+msgstr ""
+
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+msgid "Unknown error"
+msgstr "Fazi dianav"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Kemmañ an alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
+msgid "<b>Alarm</b>"
+msgstr "<b>Alarm</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Options</b>"
+msgstr "<b>Neuziadoù</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+msgid "<b>Repeat</b>"
+msgstr "<b>Adober</b>"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "Add Alarm"
+msgstr "Ouzhpennañ un alarm"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+msgid "Custom _message"
+msgstr "Kemennadenn personelaet"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom alarm sound"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Mes_sage:"
+msgstr "Kemennadenn :"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
+#: ../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:450
+msgid "Pop up an alert"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: ../calendar/gui/e-alarm-list.c:458
+msgid "Run a program"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Send To:"
+msgstr "Kas da :"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/e-alarm-list.c:454
+msgid "Send an email"
+msgstr "Kas ur bostel"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+msgid "_Arguments:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Program:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Repeat the alarm"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Sound:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "after"
+msgstr "goude"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "before"
+msgstr "araok"
+
+#. 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:13
+msgid "day(s)"
+msgstr "deiz(ioù)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+msgid "end of appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+msgid "extra times every"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "hour(s)"
+msgstr "eur(ioù)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+msgid "minute(s)"
+msgstr "munut(où)"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+msgid "start of appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+msgid "Action/Trigger"
+msgstr ""
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Ouzhpennañ"
+
+#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alarms"
+msgstr "Alarmoù"
+
+#: ../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"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+msgid "Attach file(s)"
+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:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../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 "Anv ar restr :"
+
+#: ../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 ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+msgid "Selected Calendars for Alarms"
+msgstr ""
+
+#: ../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 munut\n"
+"30 munut\n"
+"15 munut\n"
+"10 munut\n"
+"05 munut"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, 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:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Hollek</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Roll an traoù d'ober</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+msgid "<span weight=\"bold\">Time</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+msgid "Day _ends:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr "Diskouez"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../ui/evolution-event-editor.xml.h:8
+msgid "Free/Busy"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
+msgid "Friday"
+msgstr "Gwener"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Munutoù\n"
+"Eurioù\n"
+"Deizioù"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
+msgid "Monday"
+msgstr "Lun"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Lun\n"
+"Meurzh\n"
+"Merc'her\n"
+"Yaou\n"
+"Gwener\n"
+"Sadorn\n"
+"Sul"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
+msgid "Pick a color"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+msgid "S_un"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
+msgid "Saturday"
+msgstr "Sadorn"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+msgid "Sh_ow a reminder"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+msgid "Show week _numbers in date navigator"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
+msgid "Sunday"
+msgstr "Sul"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+msgid "T_asks due today:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+msgid "T_hu"
+msgstr "Yao"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Template:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
+msgid "Thursday"
+msgstr "Yaou"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
+msgid "Time _zone:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+msgid "Time format:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
+msgid "Tuesday"
+msgstr "Meurzh"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
+msgid "Wednesday"
+msgstr "Merc'her"
+
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+msgid "Work days:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "_12 hour (AM/PM)"
+msgstr "12 eur (AM/PM)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "_24 hour"
+msgstr "24 eur"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+msgid "_Compress weekends in month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_Day begins:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+msgid "_Fri"
+msgstr "Gwe"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+msgid "_Hide completed tasks after"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+msgid "_Mon"
+msgstr "Lun"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+msgid "_Overdue tasks:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "_Sat"
+msgstr "Sad"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Show appointment end times in week and month view"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+msgid "_Time divisions:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+msgid "_Tue"
+msgstr "Meu"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+msgid "_Wed"
+msgstr "Mer"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+msgid "before every appointment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:288
+msgid "Copy calendar contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:381
+msgid "Tasks List"
+msgstr "Roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:392
+msgid "Memos List"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.c:461
+msgid "Calendar Properties"
+msgstr "Perzhioù an deiziadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:463
+msgid "New Calendar"
+msgstr "Deiziadur nevez"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:529
+msgid "Task List Properties"
+msgstr "Perzhioù ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
+msgid "New Memo List"
+msgstr ""
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Ouzhpennañ un deizhiadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "Ouzhpennañ un deizhiadur"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-weather/calendar-weather.c:548
+msgid "_Refresh:"
+msgstr "Adkargañ :"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
+msgid "_URL:"
+msgstr "URL :"
+
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:566
+msgid "weeks"
+msgstr "sizhunioù"
+
+#: ../calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr "An dra d'ober-mañ he deus bet kemmet."
+
+#: ../calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: ../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:2267
+msgid " to "
+msgstr " da "
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
+msgid " (Completed "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
+msgid "Completed "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
+msgid " (Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
+msgid "Due "
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
+#, c-format
+msgid "Attached message - %s"
+msgstr ""
+
+#. 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:2855
+#: ../composer/e-msg-composer.c:3056
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
+msgid "_Move"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
+msgid "Cancel _Drag"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:802
+msgid "Could not update object"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
+#, c-format
+msgid "<b>%d</b> Attachment"
+msgid_plural "<b>%d</b> Attachments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:977
+msgid "Hide Attachment _Bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
+msgid "Show Attachment _Bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3619
+#: ../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 "Dilemel"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "Perzhioù"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3622
+msgid "_Add attachment..."
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
+msgid "Show Attachments"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+msgid "Press space key to toggle attachment bar"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
+msgid "Edit Appointment"
+msgstr "Kemmañ an emgav"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
+#, c-format
+msgid "Meeting - %s"
+msgstr "Emvod - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
+#, c-format
+msgid "Appointment - %s"
+msgstr "Emgav - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
+#, c-format
+msgid "Assigned Task - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
+#, c-format
+msgid "Task - %s"
+msgstr "Tra d'ober - %s"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+msgid "No summary"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
+msgid "attachment"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr ""
+
+#: ../calendar/gui/dialogs/comp-editor.c:2845
+msgid "Unable to use current version!"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:61
+msgid "Could not open source"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:69
+msgid "Could not open destination"
+msgstr ""
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:78
+msgid "Destination is read only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:54
+msgid "The event could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:57
+msgid "The task could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:60
+msgid "The journal entry could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:63
+msgid "The item could not be deleted due to a corba error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:70
+msgid "The event could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:73
+msgid "The task could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:76
+msgid "The journal entry could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:79
+msgid "The item could not be deleted because permission was denied"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:86
+msgid "The event could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:89
+msgid "The task could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:92
+msgid "The journal entry could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/delete-error.c:95
+msgid "The item could not be deleted due to an error"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+msgid "Contacts..."
+msgstr "Darempredoù"
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+msgid "Delegate To:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+msgid "Enter Delegate"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-editor.c:547
+msgid "Appoint_ment"
+msgstr "Emgav"
+
+#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../ui/evolution-event-editor.xml.h:14
+msgid "Recurrence"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Deiziadur :"
+
+#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.c:441
+msgid "Or_ganizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:916
+msgid "_Delegatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:918
+msgid "Atte_ndees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1086
+msgid "Event with no start date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1089
+msgid "Event with no end date"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
+msgid "Start date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1267
+msgid "End date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1290
+msgid "Start time is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1297
+msgid "End time is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:905
+msgid "The organizer selected no longer has an account."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:911
+msgid "An organizer is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:926
+msgid "At least one attendee is required."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1199
+msgid "_Add "
+msgstr "Ouzhpennañ "
+
+#: ../calendar/gui/dialogs/event-page.c:2621
+#, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "N'eus ket tu da zigeriñ an deiziadur '%s'."
+
+#: ../calendar/gui/dialogs/event-page.c:2924
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "%d deiz araok an emgav"
+msgstr[1] "%d deiz araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2932
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "%d eur araok an emgav"
+msgstr[1] "%d eur araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2940
+#, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "%d munut araok an emgav"
+msgstr[1] "%d munut araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.c:2956
+msgid "Customize"
+msgstr ""
+
+#. 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/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Ebet"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 deiz araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
+msgid "1 hour before appointment"
+msgstr "1 eur araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:3
+msgid "15 minutes before appointment"
+msgstr "15 munut araok an emgav"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.glade.h:1
+msgid "Atte_ndees..."
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "Rummadoù..."
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "Alarm personelaet :"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
+msgid "Event Description"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "Lec'hiadur"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:6
+msgid "Su_mmary:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/event-page.glade.h:16
+msgid "_Alarm"
+msgstr "Alarm"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+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 "evit"
+
+#. 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.c:307
+msgid "Dele_gatees"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "Eus :"
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Yezh"
+
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Implijer"
+
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
+#: ../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:520
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
+#: ../mail/message-list.etspec.h:12
+msgid "Status"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:1
+msgid "<b>Att_endees</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "C_hange Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Co_ntacts..."
+msgstr "Darempredoù..."
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:6
+msgid "Organizer"
+msgstr ""
+
+#: ../calendar/gui/dialogs/meeting-page.glade.h:7
+#: ../calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
+msgid "Memo"
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.c:551
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../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:3
+msgid "_Memo Content:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:2
+msgid "<b>Calendar options</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:3
+msgid "Add New Calendar"
+msgstr "Ouzhpennañ un deiziadur nevez"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "Deiziadur"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:5
+msgid "Calendar Location"
+msgstr "Lec'hiadur an deiziadur"
+
+#: ../calendar/gui/dialogs/new-calendar.glade.h:6
+msgid "Calendar Name"
+msgstr "Anv an deiziadur"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr "<b>Neuziadoù ar roll an traoù d'ober</b>"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:3
+msgid "Add New Task List"
+msgstr "Ouzhpennañ ur roll an traoù d'ober nevez"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:4
+#, fuzzy
+msgid "Task List Group"
+msgstr "Perzhioù ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/new-task-list.glade.h:5
+msgid "Task List Name"
+msgstr "Anv ar roll an traoù d'ober"
+
+#: ../calendar/gui/dialogs/recur-comp.c:52
+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 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?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:62
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:90
+msgid "This Instance Only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:94
+msgid "This and Prior Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:100
+msgid "This and Future Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recur-comp.c:105
+msgid "All Instances"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:494
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:815
+msgid "Recurrence date is invalid"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
+msgid "on"
+msgstr ""
+
+#. 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:992
+msgid "first"
+msgstr ""
+
+#. 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:998
+msgid "second"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
+msgid "third"
+msgstr ""
+
+#. 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:1008
+msgid "fourth"
+msgstr ""
+
+#. 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:1013
+msgid "last"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "Other Date"
+msgstr ""
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+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:1053
+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:1059
+msgid "21st to 31st"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
+msgid "day"
+msgstr "deiz"
+
+#. 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:1219
+msgid "on the"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
+msgid "occurrences"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
+msgid "Date/Time"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "<b>Exceptions</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
+#: ../mail/mail-config.glade.h:3
+msgid "<b>Preview</b>"
+msgstr "<b>Rakwelet</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
+msgid "<b>Recurrence</b>"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "Every"
+msgstr ""
+
+#. TRANSLATORS: Entire string is for example:
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "This appointment rec_urs"
+msgstr ""
+
+#. 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 ""
+
+#. 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 "miz(ioù)"
+
+#. 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 "sizhun(ioù)"
+
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+msgid "year(s)"
+msgstr "bloaz(ioù)"
+
+#: ../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:518
+msgid "Web Page"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous</span>"
+msgstr "<span weight=\"bold\">A bep seurt</span>"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "<span weight=\"bold\">Status</span>"
+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:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/print.c:2369 ../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:250
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
+msgid "High"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:6
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
+msgid "In Progress"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:7
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
+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:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
+msgid "Normal"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
+msgid "Not Started"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+msgid "Stat_us:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:389
+msgid "Undefined"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+msgid "_Date completed:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
+#: ../widgets/misc/e-send-options.glade.h:31
+msgid "_Priority:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+msgid "_Web Page:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
+msgid "_Task"
+msgstr "Tra d'ober"
+
+#: ../calendar/gui/dialogs/task-editor.c:430
+msgid "Task Details"
+msgstr "Munudoù an tra d'ober"
+
+#: ../calendar/gui/dialogs/task-page.c:821
+msgid "Due date is wrong"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:1649
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "Rummadoù..."
+
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Or_ganiser:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.glade.h:8
+msgid "_Due date:"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "<b>Neuziadoù an deiziadur</b>"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
+msgid "Free/Busy Publishing Settings"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
+msgid "_Daily"
+msgstr "Postel"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#, fuzzy
+msgid "_Manual"
+msgstr "Postel"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "Ger-kuzh :"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr ""
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "Anv implijer :"
+
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+msgid "_Weekly"
+msgstr "Sizhuniek"
+
+#. 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] "%d deiz"
+msgstr[1] "%d deiz"
+
+#. 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] "%d sizhun"
+msgstr[1] "%d sizhun"
+
+#: ../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: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: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:490
+#, c-format
+msgid "%s at 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:501
+#, c-format
+msgid "%s %s before the end 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:506
+#, c-format
+msgid "%s %s after the end 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:513
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#. 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 ""
+
+#. 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-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikit evit digeriñ %s"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
+msgid "Memo:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "Titl ebet"
+
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1103
+#: ../calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
+#: ../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:217
+msgid "Due Date:"
+msgstr ""
+
+#. write status
+#. Status
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
+msgid "Status:"
+msgstr ""
+
+#: ../calendar/gui/e-cal-component-preview.c:248
+msgid "Priority:"
+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:364
+msgid "Public"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr ""
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../calendar/gui/e-calendar-table.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Summary"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:438
+msgid "Free"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
+msgid "Busy"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:603
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
+msgid "Yes"
+msgstr "Ya"
+
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:177
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+msgid "No"
+msgstr "Nann"
+
+#. 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: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:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
+#: ../plugins/itip-formatter/itip-formatter.c:240
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
+msgid "Unknown"
+msgstr "Dianav"
+
+#: ../calendar/gui/e-cal-model.c:920
+msgid "Recurring"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:922
+msgid "Assigned"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
+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 "Skeudenn_dianav.%s"
+
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../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
+msgid "_Save Selected"
+msgstr ""
+
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:408
+msgid "0%"
+msgstr "0%"
+
+#: ../calendar/gui/e-calendar-table.c:409
+msgid "10%"
+msgstr "10%"
+
+#: ../calendar/gui/e-calendar-table.c:410
+msgid "20%"
+msgstr "20%"
+
+#: ../calendar/gui/e-calendar-table.c:411
+msgid "30%"
+msgstr "30%"
+
+#: ../calendar/gui/e-calendar-table.c:412
+msgid "40%"
+msgstr "40%"
+
+#: ../calendar/gui/e-calendar-table.c:413
+msgid "50%"
+msgstr "50%"
+
+#: ../calendar/gui/e-calendar-table.c:414
+msgid "60%"
+msgstr "60%"
+
+#: ../calendar/gui/e-calendar-table.c:415
+msgid "70%"
+msgstr "70%"
+
+#: ../calendar/gui/e-calendar-table.c:416
+msgid "80%"
+msgstr "80%"
+
+#: ../calendar/gui/e-calendar-table.c:417
+msgid "90%"
+msgstr "90%"
+
+#: ../calendar/gui/e-calendar-table.c:418
+msgid "100%"
+msgstr "100%"
+
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
+msgid "Deleting selected objects"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
+msgid "Updating objects"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
+msgid "Save as..."
+msgstr "Gwarediñ dindan..."
+
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
+msgid "Open _Web Page"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
+#: ../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
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "Moulañ..."
+
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
+#: ../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 "Troc'hañ"
+
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../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 "Pegañ"
+
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
+msgid "_Assign Task"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
+#: ../ui/evolution-tasks.xml.h:26
+msgid "_Forward as iCalendar"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1189
+msgid "_Mark as Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1190
+msgid "_Mark Selected Tasks as Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.c:1195
+msgid "_Delete Selected Tasks"
+msgstr "Dilemel an traoù d'ober diuzet"
+
+#: ../calendar/gui/e-calendar-table.c:1428
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "Klikit evit ouzhpennañ un dra d'ober"
+
+#: ../calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
+msgid "Complete"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:6
+msgid "Completion date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+msgid "Due date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../plugins/save-calendar/csv-format.c:397
+msgid "Priority"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+msgid "Start date"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+msgid "Task sort"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1264
+msgid "Moving items"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1266
+msgid "Copying items"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1575
+msgid "New _Appointment..."
+msgstr "Emgav nevez..."
+
+#: ../calendar/gui/e-calendar-view.c:1576
+msgid "New All Day _Event"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1577
+msgid "New _Meeting"
+msgstr "Emvod nevez"
+
+#: ../calendar/gui/e-calendar-view.c:1578
+msgid "New _Task"
+msgstr "Tra d'ober nevez"
+
+#. FIXME: hook in this somehow
+#: ../calendar/gui/e-calendar-view.c:1588
+msgid "_Current View"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1590
+msgid "Select T_oday"
+msgstr "Diuzit hiziv"
+
+#: ../calendar/gui/e-calendar-view.c:1591
+msgid "_Select Date..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1607
+msgid "Cop_y to Calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1608
+msgid "Mo_ve to Calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1609
+msgid "_Delegate Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1610
+msgid "_Schedule Meeting..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1611
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1612
+msgid "_Reply"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
+#: ../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:1618
+msgid "Make this Occurrence _Movable"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:1620
+msgid "Delete _All Occurrences"
+msgstr ""
+
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2033
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr ""
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2037
+#, c-format
+msgid "Organizer: %s"
+msgstr ""
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
+#, c-format
+msgid "Location: %s"
+msgstr "Lec'hiadur : %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2084
+#, c-format
+msgid "Time: %s %s"
+msgstr ""
+
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../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.
+#: ../calendar/gui/e-cell-date-edit-text.c:119
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d/%m/%Y %H:%M:%S"
+
+#: ../calendar/gui/e-cell-date-edit-text.c:124
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#. 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:552
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
+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:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
+msgid "pm"
+msgstr "pm"
+
+#: ../calendar/gui/e-itip-control.c:759
+msgid "Yes. (Complex Recurrence)"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:770
+#, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:775
+#, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:785
+msgid " and "
+msgstr " ha "
+
+#: ../calendar/gui/e-itip-control.c:792
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:805
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:812
+#, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:816
+#, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/e-itip-control.c:827
+#, 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:836
+msgid ", ending on "
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:857
+msgid "Starts"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:870
+msgid "Ends"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:904
+#: ../plugins/save-calendar/csv-format.c:395
+msgid "Due"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
+msgid "iCalendar Information"
+msgstr ""
+
+#. Title
+#: ../calendar/gui/e-itip-control.c:961
+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
+#: ../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
+msgid "An unknown person"
+msgstr ""
+
+#. Describe what the user can do
+#: ../calendar/gui/e-itip-control.c:1084
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/itip-utils.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:1639
+msgid "Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
+msgid "Tentatively Accepted"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
+msgid "Declined"
+msgstr ""
+
+#: ../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:1226
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1305
+#, c-format
+msgid "<b>%s</b> has published meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1306
+msgid "Meeting Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1312
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1314
+#, c-format
+msgid "<b>%s</b> requests your presence at a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1315
+msgid "Meeting Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1321
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1322
+msgid "Meeting Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1326
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1327
+msgid "Meeting Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1334
+#, c-format
+msgid "<b>%s</b> has replied to a meeting request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1335
+msgid "Meeting Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1342
+#, c-format
+msgid "<b>%s</b> has canceled a meeting."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1343
+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
+#, c-format
+msgid "<b>%s</b> has sent an unintelligible message."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1354
+msgid "Bad Meeting Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1381
+#, c-format
+msgid "<b>%s</b> has published task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1382
+msgid "Task Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1389
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1391
+#, c-format
+msgid "<b>%s</b> requests you perform a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1392
+msgid "Task Proposal"
+msgstr ""
+
+#. FIXME Whats going on here?
+#: ../calendar/gui/e-itip-control.c:1398
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1399
+msgid "Task Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1403
+#, c-format
+msgid "<b>%s</b> wishes to receive the latest task information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1404
+msgid "Task Update Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1411
+#, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1412
+msgid "Task Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1419
+#, c-format
+msgid "<b>%s</b> has canceled a task."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1420
+msgid "Task Cancelation"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1431
+msgid "Bad Task Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1455
+#, c-format
+msgid "<b>%s</b> has published free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1456
+msgid "Free/Busy Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1460
+#, c-format
+msgid "<b>%s</b> requests your free/busy information."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1461
+msgid "Free/Busy Request"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1465
+#, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1466
+msgid "Free/Busy Reply"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1471
+msgid "Bad Free/Busy Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1546
+msgid "The message does not appear to be properly formed"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1605
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1638
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1670
+msgid "The attachment has no viewable calendar items"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1904
+msgid "Update complete\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1932
+msgid "Object is invalid and cannot be updated\n"
+msgstr ""
+
+#: ../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:1954
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1971
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
+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
+msgid "Item sent!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+msgid "The item could not be sent!\n"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2130
+msgid "Choose an action:"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2202
+msgid "Update"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2230
+#: ../plugins/groupwise-features/process-meeting.c:48
+msgid "Accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2231
+msgid "Tentatively accept"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2232
+#: ../plugins/groupwise-features/process-meeting.c:50
+msgid "Decline"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2261
+msgid "Send Free/Busy Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2289
+msgid "Update respondent status"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2317
+msgid "Send Latest Information"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
+#: ../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
+msgid "--to--"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr ""
+
+#: ../calendar/gui/e-itip-control.glade.h:10
+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:70
+msgid "Chair Persons"
+msgstr ""
+
+#: ../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:72
+msgid "Optional Participants"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:73
+msgid "Resources"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
+msgid "Individual"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../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:167
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+msgid "Resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:168
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+msgid "Room"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
+msgid "Chair"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
+msgid "Required Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+msgid "Optional Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+msgid "Non-Participant"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
+msgid "Needs Action"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
+msgid "Tentative"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/itip-utils.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:1648
+msgid "Delegated"
+msgstr ""
+
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:470
+msgid "Attendee                          "
+msgstr ""
+
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+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:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
+msgid "%a %m/%d/%Y"
+msgstr ""
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
+msgid "%m/%d/%Y"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+msgid "Out of Office"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:413
+msgid "No Information"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:444
+msgid "O_ptions"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _only working hours"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:471
+msgid "Show _zoomed out"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:486
+msgid "_Update free/busy"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:501
+msgid "_<<"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:519
+msgid "_Autopick"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:534
+msgid ">_>"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:551
+msgid "_All people and resources"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:560
+msgid "All _people and one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:569
+msgid "_Required people"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Required people and _one resource"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:614
+msgid "_Start time:"
+msgstr ""
+
+#: ../calendar/gui/e-meeting-time-sel.c:641
+msgid "_End time:"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:870
+msgid "_Delete Selected Memos"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr ""
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:772
+msgid "Loading memos"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:853
+#, c-format
+msgid "Opening memos at %s"
+msgstr ""
+
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+msgid "Deleting selected objects..."
+msgstr ""
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Roit ho ger-kuzh evit %s"
+
+#: ../calendar/gui/e-tasks.c:884
+msgid "Loading tasks"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:971
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1216
+msgid "Completing tasks..."
+msgstr ""
+
+#: ../calendar/gui/e-tasks.c:1266
+msgid "Expunging"
+msgstr ""
+
+#: ../calendar/gui/e-timezone-entry.c:133
+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:1509
+msgid "%d %B"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:786
+msgid "Updating query"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2234
+msgid "_Custom View"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2235
+msgid "_Save Custom View"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2240
+msgid "_Define Views..."
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2402
+#, c-format
+msgid "Loading appointments at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2421
+#, c-format
+msgid "Loading tasks at %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:2525
+#, c-format
+msgid "Opening %s"
+msgstr ""
+
+#: ../calendar/gui/gnome-cal.c:3430
+msgid "Purging"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:5
+msgid "January"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:6
+msgid "July"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:7
+msgid "June"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:8
+msgid "March"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:9
+msgid "May"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:10
+msgid "November"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:11
+msgid "October"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:12
+msgid "Select Date"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:13
+msgid "September"
+msgstr ""
+
+#: ../calendar/gui/goto-dialog.glade.h:14
+msgid "_Select Today"
+msgstr ""
+
+#: ../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:448
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
+msgid "Event information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+msgid "Task information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+msgid "Journal information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+msgid "Free/Busy information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:639
+msgid "Calendar information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:688
+msgid "Updated"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:696
+msgid "Refresh"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:700
+msgid "Counter-proposal"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:772
+#, c-format
+msgid "Free/Busy information (%s to %s)"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:782
+msgid "iCalendar information"
+msgstr ""
+
+#: ../calendar/gui/itip-utils.c:937
+msgid "You must be an attendee of the event."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:451 ../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 ""
+
+#: ../calendar/gui/memos-component.c:452 ../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 ""
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:526
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../calendar/gui/memos-component.c:575
+msgid "Failed upgrading memos."
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:871
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:884
+msgid "There is no calendar available for creating memos"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:972
+msgid "Memo Source Selector"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1155
+msgid "New memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1156
+msgid "_Memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1157
+msgid "Create a new memo"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1163
+msgid "New memo list"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1164
+msgid "Memo l_ist"
+msgstr ""
+
+#: ../calendar/gui/memos-component.c:1165
+msgid "Create a new memo list"
+msgstr ""
+
+#: ../calendar/gui/memos-control.c:340
+msgid "Print Memos"
+msgstr ""
+
+#: ../calendar/gui/migration.c:162
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../calendar/gui/migration.c:166
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#. FIXME: set proper domain/code
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:794
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: ../calendar/gui/migration.c:962
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "1st"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "2nd"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "3rd"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "4th"
+msgstr ""
+
+#: ../calendar/gui/print.c:493
+msgid "5th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "6th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "7th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "8th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "9th"
+msgstr ""
+
+#: ../calendar/gui/print.c:494
+msgid "10th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "11th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "12th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "13th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "14th"
+msgstr ""
+
+#: ../calendar/gui/print.c:495
+msgid "15th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "16th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "17th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "18th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "19th"
+msgstr ""
+
+#: ../calendar/gui/print.c:496
+msgid "20th"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "21st"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "22nd"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "23rd"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "24th"
+msgstr ""
+
+#: ../calendar/gui/print.c:497
+msgid "25th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "26th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "27th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "28th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "29th"
+msgstr ""
+
+#: ../calendar/gui/print.c:498
+msgid "30th"
+msgstr ""
+
+#: ../calendar/gui/print.c:499
+msgid "31st"
+msgstr ""
+
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:574
+msgid "Su"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "Mo"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "Tu"
+msgstr ""
+
+#: ../calendar/gui/print.c:574
+msgid "We"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Th"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Fr"
+msgstr ""
+
+#: ../calendar/gui/print.c:575
+msgid "Sa"
+msgstr ""
+
+#. Day
+#: ../calendar/gui/print.c:1923
+msgid "Selected day (%a %b %d %Y)"
+msgstr ""
+
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
+msgid "%a %b %d"
+msgstr ""
+
+#: ../calendar/gui/print.c:1949
+msgid "%a %d %Y"
+msgstr ""
+
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: ../calendar/gui/print.c:1960
+#, c-format
+msgid "Selected week (%s - %s)"
+msgstr ""
+
+#. Month
+#: ../calendar/gui/print.c:1968
+msgid "Selected month (%b %Y)"
+msgstr ""
+
+#. Year
+#: ../calendar/gui/print.c:1975
+msgid "Selected year (%Y)"
+msgstr ""
+
+#: ../calendar/gui/print.c:2304
+msgid "Appointment"
+msgstr "Emgav"
+
+#: ../calendar/gui/print.c:2306
+msgid "Task"
+msgstr "Tra d'ober"
+
+#: ../calendar/gui/print.c:2328
+#, c-format
+msgid "Summary: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2379
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2396
+#, c-format
+msgid "Priority: %s"
+msgstr ""
+
+#: ../calendar/gui/print.c:2408
+#, c-format
+msgid "Percent Complete: %i"
+msgstr ""
+
+#: ../calendar/gui/print.c:2420
+#, c-format
+msgid "URL: %s"
+msgstr "URL : %s"
+
+#: ../calendar/gui/print.c:2434
+#, c-format
+msgid "Categories: %s"
+msgstr "Rummadoù: %s"
+
+#: ../calendar/gui/print.c:2445
+msgid "Contacts: "
+msgstr "Darempredoù : "
+
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
+msgid "Print Preview"
+msgstr ""
+
+#: ../calendar/gui/print.c:2620
+msgid "Print Item"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:441
+msgid "_New Task List"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:517
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d tra d'ober"
+msgstr[1] "%d tra d'ober"
+
+#: ../calendar/gui/tasks-component.c:566
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: ../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:890
+msgid "There is no calendar available for creating tasks"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:987
+msgid "Task Source Selector"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1170
+msgid "New task"
+msgstr "Tra d'ober nevez"
+
+#: ../calendar/gui/tasks-component.c:1172
+msgid "Create a new task"
+msgstr "Krouiñ un dra d'ober nevez"
+
+#: ../calendar/gui/tasks-component.c:1178
+msgid "New assigned task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1179
+msgid "Assigne_d Task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1180
+msgid "Create a new assigned task"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1186
+msgid "New task list"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1187
+msgid "Task l_ist"
+msgstr ""
+
+#: ../calendar/gui/tasks-component.c:1188
+msgid "Create a new task list"
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:438
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:441
+msgid "Do not ask me again."
+msgstr ""
+
+#: ../calendar/gui/tasks-control.c:475
+msgid "Print Tasks"
+msgstr ""
+
+#. The first letter of each day of the week starting with Sunday
+#: ../calendar/gui/weekday-picker.c:319
+msgid "SMTWTFS"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:79
+msgid "Appointments and Meetings"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
+msgid "Opening calendar"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:444
+msgid "iCalendar files (.ics)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:445
+msgid "Evolution iCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:573
+msgid "vCalendar files (.vcf)"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:574
+msgid "Evolution vCalendar importer"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:736
+msgid "Calendar Events"
+msgstr ""
+
+#: ../calendar/importers/icalendar-importer.c:773
+msgid "Evolution Calendar intelligent importer"
+msgstr ""
+
+#.
+#. * These are the timezone names from the Olson timezone data.
+#. * We only place them here so gettext picks them up for translation.
+#. * Don't include in any C files.
+#.
+#: ../calendar/zones.h:7
+msgid "Africa/Abidjan"
+msgstr ""
+
+#: ../calendar/zones.h:8
+msgid "Africa/Accra"
+msgstr ""
+
+#: ../calendar/zones.h:9
+msgid "Africa/Addis_Ababa"
+msgstr ""
+
+#: ../calendar/zones.h:10
+msgid "Africa/Algiers"
+msgstr ""
+
+#: ../calendar/zones.h:11
+msgid "Africa/Asmera"
+msgstr ""
+
+#: ../calendar/zones.h:12
+msgid "Africa/Bamako"
+msgstr ""
+
+#: ../calendar/zones.h:13
+msgid "Africa/Bangui"
+msgstr ""
+
+#: ../calendar/zones.h:14
+msgid "Africa/Banjul"
+msgstr ""
+
+#: ../calendar/zones.h:15
+msgid "Africa/Bissau"
+msgstr ""
+
+#: ../calendar/zones.h:16
+msgid "Africa/Blantyre"
+msgstr ""
+
+#: ../calendar/zones.h:17
+msgid "Africa/Brazzaville"
+msgstr ""
+
+#: ../calendar/zones.h:18
+msgid "Africa/Bujumbura"
+msgstr ""
+
+#: ../calendar/zones.h:19
+msgid "Africa/Cairo"
+msgstr ""
+
+#: ../calendar/zones.h:20
+msgid "Africa/Casablanca"
+msgstr ""
+
+#: ../calendar/zones.h:21
+msgid "Africa/Ceuta"
+msgstr ""
+
+#: ../calendar/zones.h:22
+msgid "Africa/Conakry"
+msgstr ""
+
+#: ../calendar/zones.h:23
+msgid "Africa/Dakar"
+msgstr ""
+
+#: ../calendar/zones.h:24
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+#: ../calendar/zones.h:25
+msgid "Africa/Djibouti"
+msgstr ""
+
+#: ../calendar/zones.h:26
+msgid "Africa/Douala"
+msgstr ""
+
+#: ../calendar/zones.h:27
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+#: ../calendar/zones.h:28
+msgid "Africa/Freetown"
+msgstr ""
+
+#: ../calendar/zones.h:29
+msgid "Africa/Gaborone"
+msgstr ""
+
+#: ../calendar/zones.h:30
+msgid "Africa/Harare"
+msgstr ""
+
+#: ../calendar/zones.h:31
+msgid "Africa/Johannesburg"
+msgstr ""
+
+#: ../calendar/zones.h:32
+msgid "Africa/Kampala"
+msgstr ""
+
+#: ../calendar/zones.h:33
+msgid "Africa/Khartoum"
+msgstr ""
+
+#: ../calendar/zones.h:34
+msgid "Africa/Kigali"
+msgstr ""
+
+#: ../calendar/zones.h:35
+msgid "Africa/Kinshasa"
+msgstr ""
+
+#: ../calendar/zones.h:36
+msgid "Africa/Lagos"
+msgstr ""
+
+#: ../calendar/zones.h:37
+msgid "Africa/Libreville"
+msgstr ""
+
+#: ../calendar/zones.h:38
+msgid "Africa/Lome"
+msgstr ""
+
+#: ../calendar/zones.h:39
+msgid "Africa/Luanda"
+msgstr ""
+
+#: ../calendar/zones.h:40
+msgid "Africa/Lubumbashi"
+msgstr ""
+
+#: ../calendar/zones.h:41
+msgid "Africa/Lusaka"
+msgstr ""
+
+#: ../calendar/zones.h:42
+msgid "Africa/Malabo"
+msgstr ""
+
+#: ../calendar/zones.h:43
+msgid "Africa/Maputo"
+msgstr ""
+
+#: ../calendar/zones.h:44
+msgid "Africa/Maseru"
+msgstr ""
+
+#: ../calendar/zones.h:45
+msgid "Africa/Mbabane"
+msgstr ""
+
+#: ../calendar/zones.h:46
+msgid "Africa/Mogadishu"
+msgstr ""
+
+#: ../calendar/zones.h:47
+msgid "Africa/Monrovia"
+msgstr ""
+
+#: ../calendar/zones.h:48
+msgid "Africa/Nairobi"
+msgstr ""
+
+#: ../calendar/zones.h:49
+msgid "Africa/Ndjamena"
+msgstr ""
+
+#: ../calendar/zones.h:50
+msgid "Africa/Niamey"
+msgstr ""
+
+#: ../calendar/zones.h:51
+msgid "Africa/Nouakchott"
+msgstr ""
+
+#: ../calendar/zones.h:52
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+#: ../calendar/zones.h:53
+msgid "Africa/Porto-Novo"
+msgstr ""
+
+#: ../calendar/zones.h:54
+msgid "Africa/Sao_Tome"
+msgstr ""
+
+#: ../calendar/zones.h:55
+msgid "Africa/Timbuktu"
+msgstr ""
+
+#: ../calendar/zones.h:56
+msgid "Africa/Tripoli"
+msgstr ""
+
+#: ../calendar/zones.h:57
+msgid "Africa/Tunis"
+msgstr ""
+
+#: ../calendar/zones.h:58
+msgid "Africa/Windhoek"
+msgstr ""
+
+#: ../calendar/zones.h:59
+msgid "America/Adak"
+msgstr ""
+
+#: ../calendar/zones.h:60
+msgid "America/Anchorage"
+msgstr ""
+
+#: ../calendar/zones.h:61
+msgid "America/Anguilla"
+msgstr ""
+
+#: ../calendar/zones.h:62
+msgid "America/Antigua"
+msgstr ""
+
+#: ../calendar/zones.h:63
+msgid "America/Araguaina"
+msgstr ""
+
+#: ../calendar/zones.h:64
+msgid "America/Aruba"
+msgstr ""
+
+#: ../calendar/zones.h:65
+msgid "America/Asuncion"
+msgstr ""
+
+#: ../calendar/zones.h:66
+msgid "America/Barbados"
+msgstr ""
+
+#: ../calendar/zones.h:67
+msgid "America/Belem"
+msgstr ""
+
+#: ../calendar/zones.h:68
+msgid "America/Belize"
+msgstr ""
+
+#: ../calendar/zones.h:69
+msgid "America/Boa_Vista"
+msgstr ""
+
+#: ../calendar/zones.h:70
+msgid "America/Bogota"
+msgstr ""
+
+#: ../calendar/zones.h:71
+msgid "America/Boise"
+msgstr ""
+
+#: ../calendar/zones.h:72
+msgid "America/Buenos_Aires"
+msgstr ""
+
+#: ../calendar/zones.h:73
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:74
+msgid "America/Cancun"
+msgstr ""
+
+#: ../calendar/zones.h:75
+msgid "America/Caracas"
+msgstr ""
+
+#: ../calendar/zones.h:76
+msgid "America/Catamarca"
+msgstr ""
+
+#: ../calendar/zones.h:77
+msgid "America/Cayenne"
+msgstr ""
+
+#: ../calendar/zones.h:78
+msgid "America/Cayman"
+msgstr ""
+
+#: ../calendar/zones.h:79
+msgid "America/Chicago"
+msgstr ""
+
+#: ../calendar/zones.h:80
+msgid "America/Chihuahua"
+msgstr ""
+
+#: ../calendar/zones.h:81
+msgid "America/Cordoba"
+msgstr ""
+
+#: ../calendar/zones.h:82
+msgid "America/Costa_Rica"
+msgstr ""
+
+#: ../calendar/zones.h:83
+msgid "America/Cuiaba"
+msgstr ""
+
+#: ../calendar/zones.h:84
+msgid "America/Curacao"
+msgstr ""
+
+#: ../calendar/zones.h:85
+msgid "America/Danmarkshavn"
+msgstr ""
+
+#: ../calendar/zones.h:86
+msgid "America/Dawson"
+msgstr ""
+
+#: ../calendar/zones.h:87
+msgid "America/Dawson_Creek"
+msgstr ""
+
+#: ../calendar/zones.h:88
+msgid "America/Denver"
+msgstr ""
+
+#: ../calendar/zones.h:89
+msgid "America/Detroit"
+msgstr ""
+
+#: ../calendar/zones.h:90
+msgid "America/Dominica"
+msgstr ""
+
+#: ../calendar/zones.h:91
+msgid "America/Edmonton"
+msgstr ""
+
+#: ../calendar/zones.h:92
+msgid "America/Eirunepe"
+msgstr ""
+
+#: ../calendar/zones.h:93
+msgid "America/El_Salvador"
+msgstr ""
+
+#: ../calendar/zones.h:94
+msgid "America/Fortaleza"
+msgstr ""
+
+#: ../calendar/zones.h:95
+msgid "America/Glace_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:96
+msgid "America/Godthab"
+msgstr ""
+
+#: ../calendar/zones.h:97
+msgid "America/Goose_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:98
+msgid "America/Grand_Turk"
+msgstr ""
+
+#: ../calendar/zones.h:99
+msgid "America/Grenada"
+msgstr ""
+
+#: ../calendar/zones.h:100
+msgid "America/Guadeloupe"
+msgstr ""
+
+#: ../calendar/zones.h:101
+msgid "America/Guatemala"
+msgstr ""
+
+#: ../calendar/zones.h:102
+msgid "America/Guayaquil"
+msgstr ""
+
+#: ../calendar/zones.h:103
+msgid "America/Guyana"
+msgstr ""
+
+#: ../calendar/zones.h:104
+msgid "America/Halifax"
+msgstr ""
+
+#: ../calendar/zones.h:105
+msgid "America/Havana"
+msgstr ""
+
+#: ../calendar/zones.h:106
+msgid "America/Hermosillo"
+msgstr ""
+
+#: ../calendar/zones.h:107
+msgid "America/Indiana/Indianapolis"
+msgstr ""
+
+#: ../calendar/zones.h:108
+msgid "America/Indiana/Knox"
+msgstr ""
+
+#: ../calendar/zones.h:109
+msgid "America/Indiana/Marengo"
+msgstr ""
+
+#: ../calendar/zones.h:110
+msgid "America/Indiana/Vevay"
+msgstr ""
+
+#: ../calendar/zones.h:111
+msgid "America/Indianapolis"
+msgstr ""
+
+#: ../calendar/zones.h:112
+msgid "America/Inuvik"
+msgstr ""
+
+#: ../calendar/zones.h:113
+msgid "America/Iqaluit"
+msgstr ""
+
+#: ../calendar/zones.h:114
+msgid "America/Jamaica"
+msgstr ""
+
+#: ../calendar/zones.h:115
+msgid "America/Jujuy"
+msgstr ""
+
+#: ../calendar/zones.h:116
+msgid "America/Juneau"
+msgstr ""
+
+#: ../calendar/zones.h:117
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:118
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+#: ../calendar/zones.h:119
+msgid "America/La_Paz"
+msgstr ""
+
+#: ../calendar/zones.h:120
+msgid "America/Lima"
+msgstr ""
+
+#: ../calendar/zones.h:121
+msgid "America/Los_Angeles"
+msgstr ""
+
+#: ../calendar/zones.h:122
+msgid "America/Louisville"
+msgstr ""
+
+#: ../calendar/zones.h:123
+msgid "America/Maceio"
+msgstr ""
+
+#: ../calendar/zones.h:124
+msgid "America/Managua"
+msgstr ""
+
+#: ../calendar/zones.h:125
+msgid "America/Manaus"
+msgstr ""
+
+#: ../calendar/zones.h:126
+msgid "America/Martinique"
+msgstr ""
+
+#: ../calendar/zones.h:127
+msgid "America/Mazatlan"
+msgstr ""
+
+#: ../calendar/zones.h:128
+msgid "America/Mendoza"
+msgstr ""
+
+#: ../calendar/zones.h:129
+msgid "America/Menominee"
+msgstr ""
+
+#: ../calendar/zones.h:130
+msgid "America/Merida"
+msgstr ""
+
+#: ../calendar/zones.h:131
+msgid "America/Mexico_City"
+msgstr ""
+
+#: ../calendar/zones.h:132
+msgid "America/Miquelon"
+msgstr ""
+
+#: ../calendar/zones.h:133
+msgid "America/Monterrey"
+msgstr ""
+
+#: ../calendar/zones.h:134
+msgid "America/Montevideo"
+msgstr ""
+
+#: ../calendar/zones.h:135
+msgid "America/Montreal"
+msgstr ""
+
+#: ../calendar/zones.h:136
+msgid "America/Montserrat"
+msgstr ""
+
+#: ../calendar/zones.h:137
+msgid "America/Nassau"
+msgstr ""
+
+#: ../calendar/zones.h:138
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "America/New_York"
+msgstr ""
+
+#: ../calendar/zones.h:139
+msgid "America/Nipigon"
+msgstr ""
+
+#: ../calendar/zones.h:140
+msgid "America/Nome"
+msgstr ""
+
+#: ../calendar/zones.h:141
+msgid "America/Noronha"
+msgstr ""
+
+#: ../calendar/zones.h:142
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+#: ../calendar/zones.h:143
+msgid "America/Panama"
+msgstr ""
+
+#: ../calendar/zones.h:144
+msgid "America/Pangnirtung"
+msgstr ""
+
+#: ../calendar/zones.h:145
+msgid "America/Paramaribo"
+msgstr ""
+
+#: ../calendar/zones.h:146
+msgid "America/Phoenix"
+msgstr ""
+
+#: ../calendar/zones.h:147
+msgid "America/Port-au-Prince"
+msgstr ""
+
+#: ../calendar/zones.h:148
+msgid "America/Port_of_Spain"
+msgstr ""
+
+#: ../calendar/zones.h:149
+msgid "America/Porto_Velho"
+msgstr ""
+
+#: ../calendar/zones.h:150
+msgid "America/Puerto_Rico"
+msgstr ""
+
+#: ../calendar/zones.h:151
+msgid "America/Rainy_River"
+msgstr ""
+
+#: ../calendar/zones.h:152
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+#: ../calendar/zones.h:153
+msgid "America/Recife"
+msgstr ""
+
+#: ../calendar/zones.h:154
+msgid "America/Regina"
+msgstr ""
+
+#: ../calendar/zones.h:155
+msgid "America/Rio_Branco"
+msgstr ""
+
+#: ../calendar/zones.h:156
+msgid "America/Rosario"
+msgstr ""
+
+#: ../calendar/zones.h:157
+msgid "America/Santiago"
+msgstr ""
+
+#: ../calendar/zones.h:158
+msgid "America/Santo_Domingo"
+msgstr ""
+
+#: ../calendar/zones.h:159
+msgid "America/Sao_Paulo"
+msgstr ""
+
+#: ../calendar/zones.h:160
+msgid "America/Scoresbysund"
+msgstr ""
+
+#: ../calendar/zones.h:161
+msgid "America/Shiprock"
+msgstr ""
+
+#: ../calendar/zones.h:162
+msgid "America/St_Johns"
+msgstr ""
+
+#: ../calendar/zones.h:163
+msgid "America/St_Kitts"
+msgstr ""
+
+#: ../calendar/zones.h:164
+msgid "America/St_Lucia"
+msgstr ""
+
+#: ../calendar/zones.h:165
+msgid "America/St_Thomas"
+msgstr ""
+
+#: ../calendar/zones.h:166
+msgid "America/St_Vincent"
+msgstr ""
+
+#: ../calendar/zones.h:167
+msgid "America/Swift_Current"
+msgstr ""
+
+#: ../calendar/zones.h:168
+msgid "America/Tegucigalpa"
+msgstr ""
+
+#: ../calendar/zones.h:169
+msgid "America/Thule"
+msgstr ""
+
+#: ../calendar/zones.h:170
+msgid "America/Thunder_Bay"
+msgstr ""
+
+#: ../calendar/zones.h:171
+msgid "America/Tijuana"
+msgstr ""
+
+#: ../calendar/zones.h:172
+msgid "America/Tortola"
+msgstr ""
+
+#: ../calendar/zones.h:173
+msgid "America/Vancouver"
+msgstr ""
+
+#: ../calendar/zones.h:174
+msgid "America/Whitehorse"
+msgstr ""
+
+#: ../calendar/zones.h:175
+msgid "America/Winnipeg"
+msgstr ""
+
+#: ../calendar/zones.h:176
+msgid "America/Yakutat"
+msgstr ""
+
+#: ../calendar/zones.h:177
+msgid "America/Yellowknife"
+msgstr ""
+
+#: ../calendar/zones.h:178
+msgid "Antarctica/Casey"
+msgstr ""
+
+#: ../calendar/zones.h:179
+msgid "Antarctica/Davis"
+msgstr ""
+
+#: ../calendar/zones.h:180
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+#: ../calendar/zones.h:181
+msgid "Antarctica/Mawson"
+msgstr ""
+
+#: ../calendar/zones.h:182
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+#: ../calendar/zones.h:183
+msgid "Antarctica/Palmer"
+msgstr ""
+
+#: ../calendar/zones.h:184
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+#: ../calendar/zones.h:185
+msgid "Antarctica/Syowa"
+msgstr ""
+
+#: ../calendar/zones.h:186
+msgid "Antarctica/Vostok"
+msgstr ""
+
+#: ../calendar/zones.h:187
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+#: ../calendar/zones.h:188
+msgid "Asia/Aden"
+msgstr ""
+
+#: ../calendar/zones.h:189
+msgid "Asia/Almaty"
+msgstr ""
+
+#: ../calendar/zones.h:190
+msgid "Asia/Amman"
+msgstr ""
+
+#: ../calendar/zones.h:191
+msgid "Asia/Anadyr"
+msgstr ""
+
+#: ../calendar/zones.h:192
+msgid "Asia/Aqtau"
+msgstr ""
+
+#: ../calendar/zones.h:193
+msgid "Asia/Aqtobe"
+msgstr ""
+
+#: ../calendar/zones.h:194
+msgid "Asia/Ashgabat"
+msgstr ""
+
+#: ../calendar/zones.h:195
+msgid "Asia/Baghdad"
+msgstr ""
+
+#: ../calendar/zones.h:196
+msgid "Asia/Bahrain"
+msgstr ""
+
+#: ../calendar/zones.h:197
+msgid "Asia/Baku"
+msgstr ""
+
+#: ../calendar/zones.h:198
+msgid "Asia/Bangkok"
+msgstr ""
+
+#: ../calendar/zones.h:199
+msgid "Asia/Beirut"
+msgstr ""
+
+#: ../calendar/zones.h:200
+msgid "Asia/Bishkek"
+msgstr ""
+
+#: ../calendar/zones.h:201
+msgid "Asia/Brunei"
+msgstr ""
+
+#: ../calendar/zones.h:202
+msgid "Asia/Calcutta"
+msgstr ""
+
+#: ../calendar/zones.h:203
+msgid "Asia/Choibalsan"
+msgstr ""
+
+#: ../calendar/zones.h:204
+msgid "Asia/Chongqing"
+msgstr ""
+
+#: ../calendar/zones.h:205
+msgid "Asia/Colombo"
+msgstr ""
+
+#: ../calendar/zones.h:206
+msgid "Asia/Damascus"
+msgstr ""
+
+#: ../calendar/zones.h:207
+msgid "Asia/Dhaka"
+msgstr ""
+
+#: ../calendar/zones.h:208
+msgid "Asia/Dili"
+msgstr ""
+
+#: ../calendar/zones.h:209
+msgid "Asia/Dubai"
+msgstr ""
+
+#: ../calendar/zones.h:210
+msgid "Asia/Dushanbe"
+msgstr ""
+
+#: ../calendar/zones.h:211
+msgid "Asia/Gaza"
+msgstr ""
+
+#: ../calendar/zones.h:212
+msgid "Asia/Harbin"
+msgstr ""
+
+#: ../calendar/zones.h:213
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+#: ../calendar/zones.h:214
+msgid "Asia/Hovd"
+msgstr ""
+
+#: ../calendar/zones.h:215
+msgid "Asia/Irkutsk"
+msgstr ""
+
+#: ../calendar/zones.h:216
+msgid "Asia/Istanbul"
+msgstr ""
+
+#: ../calendar/zones.h:217
+msgid "Asia/Jakarta"
+msgstr ""
+
+#: ../calendar/zones.h:218
+msgid "Asia/Jayapura"
+msgstr ""
+
+#: ../calendar/zones.h:219
+msgid "Asia/Jerusalem"
+msgstr ""
+
+#: ../calendar/zones.h:220
+msgid "Asia/Kabul"
+msgstr ""
+
+#: ../calendar/zones.h:221
+msgid "Asia/Kamchatka"
+msgstr ""
+
+#: ../calendar/zones.h:222
+msgid "Asia/Karachi"
+msgstr ""
+
+#: ../calendar/zones.h:223
+msgid "Asia/Kashgar"
+msgstr ""
+
+#: ../calendar/zones.h:224
+msgid "Asia/Katmandu"
+msgstr ""
+
+#: ../calendar/zones.h:225
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+#: ../calendar/zones.h:226
+msgid "Asia/Kuala_Lumpur"
+msgstr ""
+
+#: ../calendar/zones.h:227
+msgid "Asia/Kuching"
+msgstr ""
+
+#: ../calendar/zones.h:228
+msgid "Asia/Kuwait"
+msgstr ""
+
+#: ../calendar/zones.h:229
+msgid "Asia/Macao"
+msgstr ""
+
+#: ../calendar/zones.h:230
+msgid "Asia/Macau"
+msgstr ""
+
+#: ../calendar/zones.h:231
+msgid "Asia/Magadan"
+msgstr ""
+
+#: ../calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr ""
+
+#: ../calendar/zones.h:233
+msgid "Asia/Manila"
+msgstr ""
+
+#: ../calendar/zones.h:234
+msgid "Asia/Muscat"
+msgstr ""
+
+#: ../calendar/zones.h:235
+msgid "Asia/Nicosia"
+msgstr ""
+
+#: ../calendar/zones.h:236
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+#: ../calendar/zones.h:237
+msgid "Asia/Omsk"
+msgstr ""
+
+#: ../calendar/zones.h:238
+msgid "Asia/Oral"
+msgstr ""
+
+#: ../calendar/zones.h:239
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+#: ../calendar/zones.h:240
+msgid "Asia/Pontianak"
+msgstr ""
+
+#: ../calendar/zones.h:241
+msgid "Asia/Pyongyang"
+msgstr ""
+
+#: ../calendar/zones.h:242
+msgid "Asia/Qatar"
+msgstr ""
+
+#: ../calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: ../calendar/zones.h:244
+msgid "Asia/Rangoon"
+msgstr ""
+
+#: ../calendar/zones.h:245
+msgid "Asia/Riyadh"
+msgstr ""
+
+#: ../calendar/zones.h:246
+msgid "Asia/Saigon"
+msgstr ""
+
+#: ../calendar/zones.h:247
+msgid "Asia/Sakhalin"
+msgstr ""
+
+#: ../calendar/zones.h:248
+msgid "Asia/Samarkand"
+msgstr ""
+
+#: ../calendar/zones.h:249
+msgid "Asia/Seoul"
+msgstr ""
+
+#: ../calendar/zones.h:250
+msgid "Asia/Shanghai"
+msgstr ""
+
+#: ../calendar/zones.h:251
+msgid "Asia/Singapore"
+msgstr ""
+
+#: ../calendar/zones.h:252
+msgid "Asia/Taipei"
+msgstr ""
+
+#: ../calendar/zones.h:253
+msgid "Asia/Tashkent"
+msgstr ""
+
+#: ../calendar/zones.h:254
+msgid "Asia/Tbilisi"
+msgstr ""
+
+#: ../calendar/zones.h:255
+msgid "Asia/Tehran"
+msgstr ""
+
+#: ../calendar/zones.h:256
+msgid "Asia/Thimphu"
+msgstr ""
+
+#: ../calendar/zones.h:257
+msgid "Asia/Tokyo"
+msgstr ""
+
+#: ../calendar/zones.h:258
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+#: ../calendar/zones.h:259
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+#: ../calendar/zones.h:260
+msgid "Asia/Urumqi"
+msgstr ""
+
+#: ../calendar/zones.h:261
+msgid "Asia/Vientiane"
+msgstr ""
+
+#: ../calendar/zones.h:262
+msgid "Asia/Vladivostok"
+msgstr ""
+
+#: ../calendar/zones.h:263
+msgid "Asia/Yakutsk"
+msgstr ""
+
+#: ../calendar/zones.h:264
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+#: ../calendar/zones.h:265
+msgid "Asia/Yerevan"
+msgstr ""
+
+#: ../calendar/zones.h:266
+msgid "Atlantic/Azores"
+msgstr ""
+
+#: ../calendar/zones.h:267
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+#: ../calendar/zones.h:268
+msgid "Atlantic/Canary"
+msgstr ""
+
+#: ../calendar/zones.h:269
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+#: ../calendar/zones.h:270
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+#: ../calendar/zones.h:271
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+#: ../calendar/zones.h:272
+msgid "Atlantic/Madeira"
+msgstr ""
+
+#: ../calendar/zones.h:273
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+#: ../calendar/zones.h:274
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+#: ../calendar/zones.h:275
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+#: ../calendar/zones.h:276
+msgid "Atlantic/Stanley"
+msgstr ""
+
+#: ../calendar/zones.h:277
+msgid "Australia/Adelaide"
+msgstr ""
+
+#: ../calendar/zones.h:278
+msgid "Australia/Brisbane"
+msgstr ""
+
+#: ../calendar/zones.h:279
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+#: ../calendar/zones.h:280
+msgid "Australia/Darwin"
+msgstr ""
+
+#: ../calendar/zones.h:281
+msgid "Australia/Hobart"
+msgstr ""
+
+#: ../calendar/zones.h:282
+msgid "Australia/Lindeman"
+msgstr ""
+
+#: ../calendar/zones.h:283
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+#: ../calendar/zones.h:284
+msgid "Australia/Melbourne"
+msgstr ""
+
+#: ../calendar/zones.h:285
+msgid "Australia/Perth"
+msgstr ""
+
+#: ../calendar/zones.h:286
+msgid "Australia/Sydney"
+msgstr ""
+
+#: ../calendar/zones.h:287
+msgid "Europe/Amsterdam"
+msgstr ""
+
+#: ../calendar/zones.h:288
+msgid "Europe/Andorra"
+msgstr ""
+
+#: ../calendar/zones.h:289
+msgid "Europe/Athens"
+msgstr ""
+
+#: ../calendar/zones.h:290
+msgid "Europe/Belfast"
+msgstr ""
+
+#: ../calendar/zones.h:291
+msgid "Europe/Belgrade"
+msgstr ""
+
+#: ../calendar/zones.h:292
+msgid "Europe/Berlin"
+msgstr ""
+
+#: ../calendar/zones.h:293
+msgid "Europe/Bratislava"
+msgstr ""
+
+#: ../calendar/zones.h:294
+msgid "Europe/Brussels"
+msgstr ""
+
+#: ../calendar/zones.h:295
+msgid "Europe/Bucharest"
+msgstr ""
+
+#: ../calendar/zones.h:296
+msgid "Europe/Budapest"
+msgstr ""
+
+#: ../calendar/zones.h:297
+msgid "Europe/Chisinau"
+msgstr ""
+
+#: ../calendar/zones.h:298
+msgid "Europe/Copenhagen"
+msgstr ""
+
+#: ../calendar/zones.h:299
+msgid "Europe/Dublin"
+msgstr ""
+
+#: ../calendar/zones.h:300
+msgid "Europe/Gibraltar"
+msgstr ""
+
+#: ../calendar/zones.h:301
+msgid "Europe/Helsinki"
+msgstr ""
+
+#: ../calendar/zones.h:302
+msgid "Europe/Istanbul"
+msgstr ""
+
+#: ../calendar/zones.h:303
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+#: ../calendar/zones.h:304
+msgid "Europe/Kiev"
+msgstr ""
+
+#: ../calendar/zones.h:305
+msgid "Europe/Lisbon"
+msgstr ""
+
+#: ../calendar/zones.h:306
+msgid "Europe/Ljubljana"
+msgstr ""
+
+#: ../calendar/zones.h:307
+msgid "Europe/London"
+msgstr ""
+
+#: ../calendar/zones.h:308
+msgid "Europe/Luxembourg"
+msgstr ""
+
+#: ../calendar/zones.h:309
+msgid "Europe/Madrid"
+msgstr ""
+
+#: ../calendar/zones.h:310
+msgid "Europe/Malta"
+msgstr ""
+
+#: ../calendar/zones.h:311
+msgid "Europe/Minsk"
+msgstr ""
+
+#: ../calendar/zones.h:312
+msgid "Europe/Monaco"
+msgstr ""
+
+#: ../calendar/zones.h:313
+msgid "Europe/Moscow"
+msgstr ""
+
+#: ../calendar/zones.h:314
+msgid "Europe/Nicosia"
+msgstr ""
+
+#: ../calendar/zones.h:315
+msgid "Europe/Oslo"
+msgstr ""
+
+#: ../calendar/zones.h:316
+msgid "Europe/Paris"
+msgstr ""
+
+#: ../calendar/zones.h:317
+msgid "Europe/Prague"
+msgstr ""
+
+#: ../calendar/zones.h:318
+msgid "Europe/Riga"
+msgstr ""
+
+#: ../calendar/zones.h:319
+msgid "Europe/Rome"
+msgstr ""
+
+#: ../calendar/zones.h:320
+msgid "Europe/Samara"
+msgstr ""
+
+#: ../calendar/zones.h:321
+msgid "Europe/San_Marino"
+msgstr ""
+
+#: ../calendar/zones.h:322
+msgid "Europe/Sarajevo"
+msgstr ""
+
+#: ../calendar/zones.h:323
+msgid "Europe/Simferopol"
+msgstr ""
+
+#: ../calendar/zones.h:324
+msgid "Europe/Skopje"
+msgstr ""
+
+#: ../calendar/zones.h:325
+msgid "Europe/Sofia"
+msgstr ""
+
+#: ../calendar/zones.h:326
+msgid "Europe/Stockholm"
+msgstr ""
+
+#: ../calendar/zones.h:327
+msgid "Europe/Tallinn"
+msgstr ""
+
+#: ../calendar/zones.h:328
+msgid "Europe/Tirane"
+msgstr ""
+
+#: ../calendar/zones.h:329
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+#: ../calendar/zones.h:330
+msgid "Europe/Vaduz"
+msgstr ""
+
+#: ../calendar/zones.h:331
+msgid "Europe/Vatican"
+msgstr ""
+
+#: ../calendar/zones.h:332
+msgid "Europe/Vienna"
+msgstr ""
+
+#: ../calendar/zones.h:333
+msgid "Europe/Vilnius"
+msgstr ""
+
+#: ../calendar/zones.h:334
+msgid "Europe/Warsaw"
+msgstr ""
+
+#: ../calendar/zones.h:335
+msgid "Europe/Zagreb"
+msgstr ""
+
+#: ../calendar/zones.h:336
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+#: ../calendar/zones.h:337
+msgid "Europe/Zurich"
+msgstr ""
+
+#: ../calendar/zones.h:338
+msgid "Indian/Antananarivo"
+msgstr ""
+
+#: ../calendar/zones.h:339
+msgid "Indian/Chagos"
+msgstr ""
+
+#: ../calendar/zones.h:340
+msgid "Indian/Christmas"
+msgstr ""
+
+#: ../calendar/zones.h:341
+msgid "Indian/Cocos"
+msgstr ""
+
+#: ../calendar/zones.h:342
+msgid "Indian/Comoro"
+msgstr ""
+
+#: ../calendar/zones.h:343
+msgid "Indian/Kerguelen"
+msgstr ""
+
+#: ../calendar/zones.h:344
+msgid "Indian/Mahe"
+msgstr ""
+
+#: ../calendar/zones.h:345
+msgid "Indian/Maldives"
+msgstr ""
+
+#: ../calendar/zones.h:346
+msgid "Indian/Mauritius"
+msgstr ""
+
+#: ../calendar/zones.h:347
+msgid "Indian/Mayotte"
+msgstr ""
+
+#: ../calendar/zones.h:348
+msgid "Indian/Reunion"
+msgstr ""
+
+#: ../calendar/zones.h:349
+msgid "Pacific/Apia"
+msgstr ""
+
+#: ../calendar/zones.h:350
+msgid "Pacific/Auckland"
+msgstr ""
+
+#: ../calendar/zones.h:351
+msgid "Pacific/Chatham"
+msgstr ""
+
+#: ../calendar/zones.h:352
+msgid "Pacific/Easter"
+msgstr ""
+
+#: ../calendar/zones.h:353
+msgid "Pacific/Efate"
+msgstr ""
+
+#: ../calendar/zones.h:354
+msgid "Pacific/Enderbury"
+msgstr ""
+
+#: ../calendar/zones.h:355
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+#: ../calendar/zones.h:356
+msgid "Pacific/Fiji"
+msgstr ""
+
+#: ../calendar/zones.h:357
+msgid "Pacific/Funafuti"
+msgstr ""
+
+#: ../calendar/zones.h:358
+msgid "Pacific/Galapagos"
+msgstr ""
+
+#: ../calendar/zones.h:359
+msgid "Pacific/Gambier"
+msgstr ""
+
+#: ../calendar/zones.h:360
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+#: ../calendar/zones.h:361
+msgid "Pacific/Guam"
+msgstr ""
+
+#: ../calendar/zones.h:362
+msgid "Pacific/Honolulu"
+msgstr ""
+
+#: ../calendar/zones.h:363
+msgid "Pacific/Johnston"
+msgstr ""
+
+#: ../calendar/zones.h:364
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+#: ../calendar/zones.h:365
+msgid "Pacific/Kosrae"
+msgstr ""
+
+#: ../calendar/zones.h:366
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+#: ../calendar/zones.h:367
+msgid "Pacific/Majuro"
+msgstr ""
+
+#: ../calendar/zones.h:368
+msgid "Pacific/Marquesas"
+msgstr ""
+
+#: ../calendar/zones.h:369
+msgid "Pacific/Midway"
+msgstr ""
+
+#: ../calendar/zones.h:370
+msgid "Pacific/Nauru"
+msgstr ""
+
+#: ../calendar/zones.h:371
+msgid "Pacific/Niue"
+msgstr ""
+
+#: ../calendar/zones.h:372
+msgid "Pacific/Norfolk"
+msgstr ""
+
+#: ../calendar/zones.h:373
+msgid "Pacific/Noumea"
+msgstr ""
+
+#: ../calendar/zones.h:374
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+#: ../calendar/zones.h:375
+msgid "Pacific/Palau"
+msgstr ""
+
+#: ../calendar/zones.h:376
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+#: ../calendar/zones.h:377
+msgid "Pacific/Ponape"
+msgstr ""
+
+#: ../calendar/zones.h:378
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+#: ../calendar/zones.h:379
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+#: ../calendar/zones.h:380
+msgid "Pacific/Saipan"
+msgstr ""
+
+#: ../calendar/zones.h:381
+msgid "Pacific/Tahiti"
+msgstr ""
+
+#: ../calendar/zones.h:382
+msgid "Pacific/Tarawa"
+msgstr ""
+
+#: ../calendar/zones.h:383
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+#: ../calendar/zones.h:384
+msgid "Pacific/Truk"
+msgstr ""
+
+#: ../calendar/zones.h:385
+msgid "Pacific/Wake"
+msgstr ""
+
+#: ../calendar/zones.h:386
+msgid "Pacific/Wallis"
+msgstr ""
+
+#: ../calendar/zones.h:387
+msgid "Pacific/Yap"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
+#, c-format
+msgid "%.0fK"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
+#, c-format
+msgid "%.0fM"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
+#, c-format
+msgid "%.0fG"
+msgstr ""
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:988
+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:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
+#, 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:246 ../widgets/misc/e-attachment.c:449
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:557
+msgid "Posting destination"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:558
+msgid "Choose folders to post the message to."
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:589
+msgid "Click here for the address book"
+msgstr ""
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: ../composer/e-msg-composer-hdrs.c:619
+msgid "_Reply-To:"
+msgstr ""
+
+#.
+#. * From
+#.
+#: ../composer/e-msg-composer-hdrs.c:626
+msgid "Fr_om:"
+msgstr ""
+
+#.
+#. * Subject
+#.
+#: ../composer/e-msg-composer-hdrs.c:633
+msgid "S_ubject:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:642
+msgid "_To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:643
+msgid "Enter the recipients of the message"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:646
+msgid "_Cc:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:647
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:650
+msgid "_Bcc:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:651
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+
+#.
+#. * Post-To
+#.
+#: ../composer/e-msg-composer-hdrs.c:658
+msgid "_Post To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:663
+msgid "Click here to select folders to post to"
+msgstr ""
+
+#: ../composer/e-msg-composer-hdrs.c:669
+msgid "Post To:"
+msgstr ""
+
+#: ../composer/e-msg-composer-select-file.c:82
+msgid "A_ttach"
+msgstr ""
+
+#: ../composer/e-msg-composer-select-file.c:239
+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:835
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+msgid "Hide _Attachment Bar"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
+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:1402
+msgid "Could not open file"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1410
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:1689
+msgid "Untitled Message"
+msgstr ""
+
+#. NB: This function is never used anymore
+#: ../composer/e-msg-composer.c:1724
+msgid "Open File"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:2151 ../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:2254
+msgid "Si_gnature:"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
+msgid "Compose Message"
+msgstr ""
+
+#: ../composer/e-msg-composer.c:4974
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:1
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:2
+msgid "All accounts have been removed."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:3
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:4
+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:18
+msgid "Because &quot;{1}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:6
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:7
+msgid "Could not create composer window."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:8
+msgid "Could not create message."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:9
+msgid "Could not read signature file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:10
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:11
+msgid "Could not save to autosave file &quot;{0}&quot;."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:12
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:13
+msgid "Do you want to recover unfinished messages?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:14
+msgid "Download in progress. Do you want to send the mail?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:15
+msgid "Error saving to autosave because &quot;{1}&quot;."
+msgstr ""
+
+#: ../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:17
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+
+#: ../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:19
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:22
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:23
+msgid "Unfinished messages found"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:24
+msgid "Warning: Modified Message"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:25
+msgid "You cannot attach the file `{0}' to this message."
+msgstr ""
+
+#: ../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
+msgid "_Do not Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:29
+msgid "_Recover"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:30
+msgid "_Save Message"
+msgstr "Gwarediñ ar gemennadenn"
+
+#: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:515
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../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 ""
+
+#: ../data/evolution.keys.in.in.h:1
+msgid "address card"
+msgstr ""
+
+#: ../data/evolution.keys.in.in.h:2
+msgid "calendar information"
+msgstr "Titouroù an deiziadur"
+
+#: ../designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "<b>Implijerion :</b>"
+
+#: ../designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:10
+msgid "No, Do not Change Status"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
+msgstr ""
+
+#: ../designs/OOA/ooa.glade.h:13
+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>Oc'h atoriñ Postel</b>"
+
+#: ../designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
+msgstr "<b>O kas Postel :</b>"
+
+#: ../designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:6
+msgid "Always send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: ../designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: ../e-util/e-dialog-utils.c:281
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
+msgid "Overwrite file?"
+msgstr "Skrivañ war ar restr ?"
+
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
+msgid "Evolution Error"
+msgstr "Fazi Evolution"
+
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
+msgid "Evolution Warning"
+msgstr ""
+
+#: ../e-util/e-error.c:124
+msgid "Evolution Information"
+msgstr "Titour Evolution"
+
+#: ../e-util/e-error.c:126
+msgid "Evolution Query"
+msgstr ""
+
+#. setup a dummy error
+#: ../e-util/e-error.c:443
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:2
+msgid "Cannot open file &quot;{0}&quot;."
+msgstr "N'eus ket tu da zigeriñ ar restr &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "Cannot save file &quot;{0}&quot;."
+msgstr "N'eus ket tu da warediñ ar restr &quot;{0}&quot;."
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:5
+msgid "File exists &quot;{0}&quot;."
+msgstr ""
+
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+msgid "_Overwrite"
+msgstr "Skrivañ war"
+
+#: ../e-util/eggtrayicon.c:121
+msgid "The orientation of the tray."
+msgstr ""
+
+#: ../filter/filter-datespec.c:78
+#, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:79
+#, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../filter/filter-datespec.c:285
+msgid "<click here to select a date>"
+msgstr ""
+
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+msgid "now"
+msgstr "bremañ"
+
+#. 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 ""
+
+#: ../filter/filter-datespec.c:415
+msgid "Select a time to compare against"
+msgstr ""
+
+#: ../filter/filter-file.c:289
+msgid "Choose a file"
+msgstr "Dibabit ur restr"
+
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
+msgid "Important"
+msgstr ""
+
+#. forest green
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
+msgid "To Do"
+msgstr ""
+
+#. blue
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
+msgid "Later"
+msgstr "Diwezhatoc'h"
+
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr ""
+
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr ""
+
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr ""
+
+#: ../filter/filter-rule.c:868
+msgid "Find items:"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "All related"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "Replies"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "Replies and parents"
+msgstr ""
+
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr ""
+
+#: ../filter/filter-rule.c:891
+msgid "Include threads"
+msgstr ""
+
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:311
+msgid "Incoming"
+msgstr ""
+
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
+msgid "Outgoing"
+msgstr ""
+
+#: ../filter/filter.error.xml.h:1
+msgid "Bad regular expression &quot;{0}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:2
+msgid "Could not compile regular expression &quot;{1}&quot;."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:3
+msgid "File &quot;{0}&quot; does not exist or is not a regular file."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:4
+msgid "Missing date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:5
+msgid "Missing file name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+msgid "Missing name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:7
+msgid "Name &quot;{0}&quot; already used."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:8
+msgid "Please choose another name."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:9
+msgid "You must choose a date."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:10
+msgid "You must name this filter."
+msgstr ""
+
+#: ../filter/filter.error.xml.h:11
+msgid "You must specify a file name."
+msgstr ""
+
+#: ../filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr ""
+
+#: ../filter/filter.glade.h:2
+msgid "Compare against"
+msgstr ""
+
+#: ../filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr ""
+
+#: ../filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: ../filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: ../filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:13
+msgid "ago"
+msgstr ""
+
+#: ../filter/filter.glade.h:17
+msgid "months"
+msgstr ""
+
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr ""
+
+#: ../filter/filter.glade.h:19
+msgid "the current time"
+msgstr ""
+
+#: ../filter/filter.glade.h:20
+msgid "the time you specify"
+msgstr ""
+
+#: ../filter/filter.glade.h:22
+msgid "years"
+msgstr ""
+
+#: ../filter/rule-editor.c:378
+msgid "Add Rule"
+msgstr ""
+
+#: ../filter/rule-editor.c:454
+msgid "Edit Rule"
+msgstr ""
+
+#: ../filter/rule-editor.c:732
+msgid "Rule name"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+msgid "Mail"
+msgstr "Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
+msgid "Mail Accounts"
+msgstr ""
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: ../mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Dibaboù gwellañ Postel"
+
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "Postel"
+
+#: ../mail/em-account-editor.c:403
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: ../mail/em-account-editor.c:410
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
+msgid "Select Folder"
+msgstr ""
+
+#: ../mail/em-account-editor.c:778
+msgid "Ask for each message"
+msgstr ""
+
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
+msgid "Identity"
+msgstr ""
+
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
+msgid "Receiving Email"
+msgstr "Oc'h atoriñ Postel"
+
+#: ../mail/em-account-editor.c:2013
+msgid "Automatically check for _new mail every"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
+msgid "Sending Email"
+msgstr "O kas Postel"
+
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
+msgid "Defaults"
+msgstr "Dre ziouer"
+
+#. Security settings
+#: ../mail/em-account-editor.c:2319 ../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:2356 ../mail/em-account-editor.c:2447
+msgid "Receiving Options"
+msgstr "Oc'h atoriñ neuziadoù"
+
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+msgid "Checking for New Mail"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr ""
+
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
+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:466
+msgid "[Default]"
+msgstr ""
+
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:518 ../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:524
+msgid "Account name"
+msgstr ""
+
+#: ../mail/em-account-prefs.c:526
+msgid "Protocol"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:967
+msgid "Unnamed"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:936
+msgid "Language(s)"
+msgstr "Yezh(où)"
+
+#: ../mail/em-composer-prefs.c:979
+msgid "Add signature script"
+msgstr ""
+
+#: ../mail/em-composer-prefs.c:999
+msgid "Signature(s)"
+msgstr ""
+
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: ../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:1712
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: ../mail/em-filter-editor.c:155
+msgid "_Filter Rules"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: ../mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:27
+msgid "is"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../ui/evolution-mail-message.xml.h:48
+msgid "Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:39
+msgid "Match All"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:40
+msgid "Message Body"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:41
+msgid "Message Header"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:42
+msgid "Message is Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:43
+msgid "Message is not Junk"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:44
+msgid "Move to Folder"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:45
+msgid "Pipe to Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:46
+msgid "Play Sound"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+msgid "Read"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:48
+msgid "Recipients"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:49
+msgid "Regex Match"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:50
+msgid "Replied to"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:51
+msgid "returns"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:52
+msgid "returns greater than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:53
+msgid "returns less than"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:54
+msgid "Run Program"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:56
+msgid "Sender"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:57
+msgid "Set Status"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:58
+msgid "Size (kB)"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:59
+msgid "sounds like"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:60
+msgid "Source Account"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:61
+msgid "Specific header"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:62
+msgid "starts with"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:64
+msgid "Stop Processing"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
+#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../smime/lib/e-cert.c:1132
+msgid "Subject"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:66
+msgid "Unset Status"
+msgstr ""
+
+#. and now for the action area
+#: ../mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr ""
+
+#: ../mail/em-folder-browser.c:144
+msgid "C_reate Search Folder From 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
+msgid "Total messages:"
+msgid_plural "Total messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. 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:316
+#: ../plugins/groupwise-features/properties.glade.h:3
+msgid "Folder Properties"
+msgstr ""
+
+#: ../mail/em-folder-selection-button.c:123
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: ../mail/em-folder-selector.c:261
+msgid "Create"
+msgstr "Krouiñ"
+
+#: ../mail/em-folder-selector.c:265
+msgid "Folder _name:"
+msgstr "Anv ar renkell :"
+
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
+msgid "Search Folders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+msgid "UNMATCHED"
+msgstr ""
+
+#: ../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:150
+#: ../plugins/exchange-operations/exchange-folder.c:598
+msgid "Inbox"
+msgstr ""
+
+#: ../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:153
+msgid "Sent"
+msgstr "Kaset"
+
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+msgid "Loading..."
+msgstr "O kargañ..."
+
+#: ../mail/em-folder-tree.c:694
+msgid "Mail Folder Tree"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:854
+#, c-format
+msgid "Moving folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:856
+#, c-format
+msgid "Copying folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
+#, c-format
+msgid "Moving messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
+#, c-format
+msgid "Copying messages into folder %s"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:881
+msgid "Cannot drop message(s) into toplevel store"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
+msgid "_Copy to Folder"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
+msgid "_Move to Folder"
+msgstr ""
+
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-messagedisplay.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:52
+msgid "_View"
+msgstr "Gwelout"
+
+#: ../mail/em-folder-tree.c:2043
+msgid "Open in _New Window"
+msgstr "Digeriñ e-barzh ur prenestr nevez"
+
+#: ../mail/em-folder-tree.c:2047
+msgid "_Copy..."
+msgstr "Kopiañ..."
+
+#: ../mail/em-folder-tree.c:2048
+msgid "_Move..."
+msgstr "Dilec'hiañ"
+
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2052
+msgid "_New Folder..."
+msgstr "Renkell nevez..."
+
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
+msgid "_Rename..."
+msgstr "Adenvel..."
+
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
+msgid "_Empty Trash"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:104
+#, c-format
+msgid "Copying `%s' to `%s'"
+msgstr ""
+
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
+msgid "Select folder"
+msgstr "Dibabit ur renkell"
+
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
+msgid "C_opy"
+msgstr "Kopiañ"
+
+#: ../mail/em-folder-utils.c:581
+#: ../plugins/groupwise-features/share-folder-common.c:145
+#, c-format
+msgid "Creating folder `%s'"
+msgstr "O krouiñ ar renkell `%s'"
+
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:388
+msgid "Create folder"
+msgstr "Krouiñ ur renkell"
+
+#: ../mail/em-folder-utils.c:730
+#: ../plugins/groupwise-features/install-shared.c:164
+#: ../plugins/groupwise-features/share-folder-common.c:388
+msgid "Specify where to create the folder:"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
+msgid "_Reply to Sender"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1083 ../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:1086 ../ui/evolution-mail-message.xml.h:107
+msgid "_Edit as New Message..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1092
+msgid "U_ndelete"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1093
+msgid "_Move to Folder..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1094
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1097
+msgid "Mar_k as Read"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1098
+msgid "Mark as _Unread"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1099
+msgid "Mark as _Important"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1100
+msgid "_Mark as Unimportant"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1101
+msgid "Mark as _Junk"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1102
+msgid "Mark as _Not Junk"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1103
+msgid "Mark for Follo_w Up..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "Ebet"
+
+#: ../mail/em-folder-view.c:1111
+msgid "Fla_g Completed"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1112
+msgid "Cl_ear Flag"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1115
+msgid "Crea_te Rule From Message"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1116
+msgid "Search Folder from _Subject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1117
+msgid "Search Folder from Se_nder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1118
+msgid "Search Folder from _Recipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1119
+msgid "Search Folder from Mailing _List"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1123
+msgid "Filter on Sub_ject"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1124
+msgid "Filter on Sen_der"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1125
+msgid "Filter on Re_cipients"
+msgstr ""
+
+#: ../mail/em-folder-view.c:1126
+msgid "Filter on _Mailing List"
+msgstr ""
+
+#. default charset used in mail view
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
+msgid "Default"
+msgstr "Dre ziouer"
+
+#: ../mail/em-folder-view.c:2110
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+#: ../plugins/print-message/print-message.c:87
+msgid "Print Message"
+msgstr "Moulañ ar gemennadenn"
+
+#: ../mail/em-folder-view.c:2266
+msgid "Unable to retrieve message"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2461
+msgid "Create _Search Folder"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2462
+msgid "_From this Address"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2463
+msgid "_To this Address"
+msgstr ""
+
+#: ../mail/em-folder-view.c:2817
+#, c-format
+msgid "Click to mail %s"
+msgstr ""
+
+#. message-search popup match count string
+#: ../mail/em-format-html-display.c:496
+#, c-format
+msgid "Matches: %d"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
+msgid "Unsigned"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:756
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
+msgid "Valid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:757
+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:758 ../mail/em-format-html.c:609
+msgid "Invalid signature"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:758
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:759
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:759
+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:765 ../mail/em-format-html.c:616
+msgid "Unencrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:765
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
+msgid "Encrypted, weak"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:766
+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:767 ../mail/em-format-html.c:618
+msgid "Encrypted"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:767
+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:768 ../mail/em-format-html.c:619
+msgid "Encrypted, strong"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:768
+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:869 ../smime/gui/smime-ui.glade.h:48
+msgid "_View Certificate"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:884
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1174
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1182
+msgid "Overdue:"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1185
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1245
+msgid "_View Inline"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1246
+msgid "_Hide"
+msgstr "Kuzhat"
+
+#: ../mail/em-format-html-display.c:1247
+msgid "_Fit to Width"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1248
+msgid "Show _Original Size"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1874
+msgid "Select folder to save all attachments..."
+msgstr ""
+
+#: ../mail/em-format-html-display.c:1921
+msgid "_Save Selected..."
+msgstr ""
+
+#. Cant i put in the number of attachments here ?
+#: ../mail/em-format-html-display.c:1988
+#, c-format
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
+msgid "S_ave"
+msgstr "Gwarediñ"
+
+#: ../mail/em-format-html-display.c:2006
+msgid "S_ave All"
+msgstr "Gwarediñ an holl"
+
+#: ../mail/em-format-html-display.c:2067
+msgid "No Attachment"
+msgstr ""
+
+#: ../mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: ../mail/em-format-html.c:610
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: ../mail/em-format-html.c:881
+msgid "Malformed external-body part."
+msgstr ""
+
+#: ../mail/em-format-html.c:911
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:922
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: ../mail/em-format-html.c:924
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:945
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: ../mail/em-format-html.c:956
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: ../mail/em-format-html.c:1183
+msgid "Formatting message"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../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 "Eus"
+
+#: ../mail/em-format-html.c:1476 ../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:1476 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
+#: ../mail/message-list.etspec.h:14
+msgid "To"
+msgstr ""
+
+#: ../mail/em-format-html.c:1476 ../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:1476 ../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:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
+msgid "Mailer"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: ../mail/em-format-html.c:1615
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: ../mail/em-format-html.c:1618
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: ../mail/em-format-html.c:1628 ../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:1651 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
+msgid "Newsgroups"
+msgstr ""
+
+#: ../mail/em-format.c:1102
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: ../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:1271 ../mail/em-format.c:1427
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+
+#: ../mail/em-format.c:1279
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: ../mail/em-format.c:1446
+msgid "Unsupported signature format"
+msgstr ""
+
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+msgid "Error verifying signature"
+msgstr ""
+
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+msgid "Unknown error verifying signature"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:103
+msgid "Every time"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:104
+msgid "Once per day"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:105
+msgid "Once per week"
+msgstr ""
+
+#: ../mail/em-mailer-prefs.c:106
+msgid "Once per month"
+msgstr ""
+
+#: ../mail/em-migrate.c:1209
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: ../mail/em-migrate.c:1648
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1674
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:1859
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2063
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2077
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2106
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2712
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: ../mail/em-migrate.c:2731
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+msgid "_Reply to sender"
+msgstr ""
+
+#: ../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:620
+msgid "_Open Link in Browser"
+msgstr "Digeriñ an ere e-barzh ar furcher gwiad"
+
+#: ../mail/em-popup.c:621
+msgid "_Send New Message To..."
+msgstr "Kas ur gemennadenn nevez da ..."
+
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
+msgstr "Ouzhpennañ d'ar c'harned chomlec'h"
+
+#: ../mail/em-subscribe-editor.c:615
+msgid "This store does not support subscriptions, or they are not enabled."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:644
+msgid "Subscribed"
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:648
+msgid "Folder"
+msgstr "Renkell"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: ../mail/em-subscribe-editor.c:869
+msgid "Please select a server."
+msgstr ""
+
+#: ../mail/em-subscribe-editor.c:890
+msgid "No server has been selected"
+msgstr "N'eus servijer ebet a zo bet diuzet"
+
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
+msgstr ""
+
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr ""
+
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
+msgid "message"
+msgstr "Kemennadenn"
+
+#: ../mail/em-utils.c:668
+msgid "Save Message..."
+msgstr "Gwarediñ ar gemennadenn..."
+
+#: ../mail/em-utils.c:717
+msgid "Add address"
+msgstr "Ouzhpennañ ar chomlec'h"
+
+#. Drop filename for messages from a mailbox
+#: ../mail/em-utils.c:1201
+#, c-format
+msgid "Messages from %s"
+msgstr "Kemennadennoù eus %s"
+
+#: ../mail/em-vfolder-editor.c:112
+msgid "Search _Folders"
+msgstr "Klask renkelloù"
+
+#: ../mail/em-vfolder-rule.c:576
+msgid "Search Folder source"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight color"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight color."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to compose messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to compose messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:10
+msgid "Default charset in which to display messages"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:11
+msgid "Default charset in which to display messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:12
+msgid "Default forward style"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:13
+msgid "Default height of the Composer Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:14
+msgid "Default height of the Message Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:15
+msgid "Default height of the Subscribe dialog"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:16
+msgid "Default reply style"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:17
+msgid "Default width of the Composer Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:18
+msgid "Default width of the Message Window"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:19
+msgid "Default width of the Subscribe dialog"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:20
+msgid "Draw spelling error indicators on words as you type."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:21
+msgid "Empty Trash folders on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:22
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:23
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:24
+msgid "Enable/disable caret mode"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:27
+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
+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
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:30
+msgid "List of Labels and their associated colors"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accepted licenses"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:32
+msgid "List of accounts"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:33
+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
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:35
+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
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:37
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:38
+msgid "Load images for HTML messages over http"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:39
+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
+msgid "Log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:41
+msgid "Log filter actions to the specified log file."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:42
+msgid "Logfile to log filter actions"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:43
+msgid "Logfile to log filter actions."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:44
+msgid "Mark as Seen after specified timeout"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:45
+msgid "Mark as Seen after specified timeout."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:46
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:47
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:49
+msgid "Message Window default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:50
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:52
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:53
+msgid "New Mail Notify sound file"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:54
+msgid "New Mail Notify type"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:55
+msgid "Prompt on empty subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:56
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:57
+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
+msgid "Prompt when user expunges"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:59
+msgid "Prompt when user only fills Bcc"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to open 10 or more messages at once"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:61
+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
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:63
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:64
+msgid "Recognize links in text and replace them."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:65
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:66
+msgid "Run junk test on incoming mail"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:67
+msgid "Send HTML mail by default"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:68
+msgid "Send HTML mail by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:69
+msgid "Show Animations"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:70
+msgid "Show animated images as animations."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:71
+msgid "Show deleted messages (with a strike-through) in the message-list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:72
+msgid "Show deleted messages in the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:75
+msgid "Sound file to play when new mail arrives."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:76
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:77
+msgid "Spell check inline"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:78
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:79
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:80
+msgid "Terminal font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:81
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:82
+msgid "The terminal font for mail display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:83
+msgid "The variable width font for mail display"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:84
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:85
+msgid "Thread the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:86
+msgid "Thread the message-list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:87
+msgid "Thread the message-list based on Subject"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:88
+msgid "Timeout for marking message as Seen"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:89
+msgid "Timeout for marking message as Seen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:90
+msgid "UID string of the default account."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:91
+msgid "Use Spamassassin daemon and client"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:92
+msgid "Use Spamassassin daemon and client (spamc/spamd)"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:93
+msgid "Use custom fonts"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:94
+msgid "Use custom fonts for displaying mail"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:95
+msgid "Use only local spam tests."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:96
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:97
+msgid "Variable width font"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:98
+msgid "View/Bcc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:99
+msgid "View/Bcc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:100
+msgid "View/Cc menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:101
+msgid "View/Cc menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:102
+msgid "View/From menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:103
+msgid "View/From menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:104
+msgid "View/PostTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:105
+msgid "View/PostTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:106
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:107
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.in.h:108
+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:192
+msgid "Importing Elm data"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:381
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: ../mail/importers/elm-importer.c:382
+msgid "Import mail from Elm."
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
+msgid "Destination folder:"
+msgstr ""
+
+#: ../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:223
+msgid "Berkeley Mailbox (mbox)"
+msgstr ""
+
+#: ../mail/importers/evolution-mbox-importer.c:224
+msgid "Importer Berkeley Mailbox format folders"
+msgstr ""
+
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
+#, c-format
+msgid "Importing `%s'"
+msgstr "Oc'h enporzhiañ `%s'"
+
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr ""
+
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
+msgid "Importing mailbox"
+msgstr ""
+
+#: ../mail/importers/mail-importer.c:376
+#, c-format
+msgid "Scanning %s"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:74
+#, c-format
+msgid "Priority Filter \"%s\""
+msgstr ""
+
+#: ../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"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:687
+msgid ""
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
+msgstr ""
+
+#: ../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"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1251
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1708
+msgid "Importing Netscape data"
+msgstr ""
+
+#: ../mail/importers/netscape-importer.c:1908
+msgid "Settings"
+msgstr "Neuziadoù"
+
+#: ../mail/importers/netscape-importer.c:1913
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Postel da %s"
+
+#: ../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:229
+msgid "Importing Pine data"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:433
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: ../mail/importers/pine-importer.c:434
+msgid "Import mail from Pine."
+msgstr ""
+
+#: ../mail/mail-autofilter.c:79
+#, c-format
+msgid "Mail to %s"
+msgstr "Postel da %s"
+
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
+#, c-format
+msgid "Mail from %s"
+msgstr "Postel eus %s"
+
+#: ../mail/mail-autofilter.c:266
+#, c-format
+msgid "Subject is %s"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:301
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: ../mail/mail-autofilter.c:372
+msgid "Add Filter Rule"
+msgstr ""
+
+#: ../mail/mail-component.c:521
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:523
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:546
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:548
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d kaset"
+msgstr[1] "%d kaset"
+
+#: ../mail/mail-component.c:550
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:554
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:556
+#, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-component.c:779
+msgid "New Mail Message"
+msgstr "Kemennadenn postel nevez"
+
+#: ../mail/mail-component.c:780
+msgid "_Mail Message"
+msgstr "Kemennadenn postel"
+
+#: ../mail/mail-component.c:781
+msgid "Compose a new mail message"
+msgstr "Skrivañ ur gemennadenn postel nevez"
+
+#: ../mail/mail-component.c:787
+msgid "New Mail Folder"
+msgstr ""
+
+#: ../mail/mail-component.c:788
+msgid "Mail _Folder"
+msgstr ""
+
+#: ../mail/mail-component.c:789
+msgid "Create a new mail folder"
+msgstr ""
+
+#: ../mail/mail-component.c:933
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "Pouezus"
+
+#. 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
+msgid "_To Do"
+msgstr ""
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+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.glade.h:2
+msgid " Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
+msgid "<b>SSL is not supported in this build of Evolution</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sig_natures</b>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:6
+msgid "<b>_Languages</b>"
+msgstr "<b>Yezhoù</b>"
+
+#: ../mail/mail-config.glade.h:7
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr "<span weight=\"bold\">Dilemel ar bostel</span>"
+
+#: ../mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Receipts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Options</span>"
+msgstr "<span weight=\"bold\">Neuziadoù</span>"
+
+#: ../mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:35
+msgid "Account Management"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:36
+msgid "Add Ne_w Signature..."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:37
+msgid "Add _Script"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:38
+msgid "Al_ways sign outgoing messages when using this account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:39
+msgid "Also encrypt to sel_f when sending encrypted mail"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:40
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:41
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:42
+msgid "Always _trust keys in my keyring when encrypting"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:43
+msgid "Always encrypt to _myself when sending encrypted mail"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:44
+msgid "Attach original message"
+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
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:49
+msgid "Beep w_hen new mail arrives"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:50
+msgid "C_haracter set:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:51
+msgid "Ch_eck for Supported Types "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
+msgid "Check in_coming mail for junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:53
+msgid "Check spelling while I _type"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:54
+msgid "Checks incoming mail messages to be Junk"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:55
+msgid "Cle_ar"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:56
+msgid "Clea_r"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:57
+msgid "Color for _misspelled words:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:58
+msgid "Colors"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:59
+msgid "Confirm _when expunging a folder"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:60
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:66
+msgid "De_fault"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:67
+msgid "Default character e_ncoding:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:70
+msgid "Digitally _sign outgoing messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:71
+msgid "Do not quote original message"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+msgid "Done"
+msgstr "Graet"
+
+#: ../mail/mail-config.glade.h:73
+msgid "Drafts _Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:75
+msgid "Email Accounts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:76
+msgid "Email _Address:"
+msgstr "Chomlec'h ar bostel :"
+
+#: ../mail/mail-config.glade.h:77
+msgid "Empty trash folders on e_xit"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:78
+msgid "Encry_ption certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:79
+msgid "Encrypt out_going messages (by default)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:82
+msgid "Fi_xed-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:83
+msgid "Font Properties"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:84
+msgid "Format messages in _HTML"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:85
+msgid "Full Nam_e:"
+msgstr "Anv leun :"
+
+#: ../mail/mail-config.glade.h:87
+msgid "HTML Mail"
+msgstr "Postel HTML"
+
+#: ../mail/mail-config.glade.h:88
+msgid "Headers"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:89
+msgid "Highlight _quotations with"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:90
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:93
+msgid "Inline"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:95
+msgid "Languages Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:97
+msgid "Mail Configuration"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:98
+msgid "Mail Headers Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:100
+msgid "Mailbox location"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:101
+msgid "Message Composer"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:102
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:103
+msgid "Or_ganization:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:104
+msgid "PGP/GPG _Key ID:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:107
+msgid "Play sound file when new mail arri_ves"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:108
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:110
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:111
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:112
+msgid "Please select among the following options"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:113
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:114
+msgid "Quote original message"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:115
+msgid "Quoted"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:116
+msgid "Re_member password"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:117
+msgid "Re_ply-To:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:119
+msgid "Remember _password"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:120
+msgid "S_elect..."
+msgstr "Diuzit..."
+
+#: ../mail/mail-config.glade.h:121
+msgid "S_tandard Font:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:122
+msgid "Se_lect..."
+msgstr "Diuzit..."
+
+#: ../mail/mail-config.glade.h:124
+msgid "Select HTML fixed width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:125
+msgid "Select HTML fixed width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:126
+msgid "Select HTML variable width font"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:127
+msgid "Select HTML variable width font for printing"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:129
+msgid "Send message receipts:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:131
+msgid "Sending Mail"
+msgstr "O kas postel"
+
+#: ../mail/mail-config.glade.h:132
+msgid "Sent _Messages Folder:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:133
+msgid "Ser_ver requires authentication"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:134
+msgid "Server _Type: "
+msgstr "Seurt servijer : "
+
+#: ../mail/mail-config.glade.h:135
+msgid "Sig_ning certificate:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:136
+msgid "Signat_ure:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:137
+msgid "Signatures"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:138
+msgid "Signatures Table"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:139
+msgid "Specify _filename:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:140
+msgid "Spell Checking"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:141
+msgid "T_ype: "
+msgstr "Seurt : "
+
+#: ../mail/mail-config.glade.h:142
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:143
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
+msgstr ""
+
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+msgid "User_name:"
+msgstr "Anv implijer :"
+
+#: ../mail/mail-config.glade.h:150
+msgid "V_ariable-width:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:151
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:155
+msgid "_Add Signature"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:156
+msgid "_Always load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:157
+msgid "_Do not notify me when new mail arrives"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:158
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:160
+msgid "_Forward style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:161
+msgid "_Load images in mail from contacts"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:162
+msgid "_Make this my default account"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:163
+msgid "_Mark messages as read after"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:165
+msgid "_Never load images from the Internet"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:166
+msgid "_Path:"
+msgstr "Hent :"
+
+#: ../mail/mail-config.glade.h:167
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:168
+msgid "_Prompt when sending messages with an empty subject line"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:169
+msgid "_Reply style:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:170
+msgid "_Script:"
+msgstr ""
+
+#. If enabled, show animation; if disabled, only display a static image without any animation
+#: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:174
+msgid "_Use Secure Connection:"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:175
+msgid "_Use the same fonts as other applications"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:176
+msgid "color"
+msgstr "liv"
+
+#: ../mail/mail-config.glade.h:177
+msgid "description"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:3
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:4
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:5
+msgid "Case _sensitive"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
+msgid "Co_mpleted"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:8
+msgid "F_ind:"
+msgstr "Klask :"
+
+#: ../mail/mail-dialogs.glade.h:9
+msgid "Find in Message"
+msgstr "Klask e-barzh ar gemennadenn"
+
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
+#: ../mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:11
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:12
+msgid "License Agreement"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:13
+msgid "None Selected"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:14
+msgid "S_erver:"
+msgstr "Servijer :"
+
+#: ../mail/mail-dialogs.glade.h:15
+msgid "Security Information"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+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
+msgid "_Accept License"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
+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"
+msgstr ""
+
+#: ../mail/mail-folder-cache.c:858
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:104
+msgid "Filtering Folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:265
+msgid "Fetching Mail"
+msgstr ""
+
+#. sending mail, filtering failed
+#: ../mail/mail-ops.c:565
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
+msgstr ""
+
+#: ../mail/mail-ops.c:623
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:735
+#, c-format
+msgid "Sending message %d of %d"
+msgstr ""
+
+#: ../mail/mail-ops.c:760
+#, c-format
+msgid "Failed to send %d of %d messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
+msgstr ""
+
+#: ../mail/mail-ops.c:764
+msgid "Complete."
+msgstr ""
+
+#: ../mail/mail-ops.c:861
+msgid "Saving message to folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:946
+#, c-format
+msgid "Moving messages to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:946
+#, c-format
+msgid "Copying messages to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1169
+msgid "Forwarded messages"
+msgstr ""
+
+#: ../mail/mail-ops.c:1212
+#, c-format
+msgid "Opening folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1284
+#, c-format
+msgid "Opening store %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1362
+#, c-format
+msgid "Removing folder %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1456
+#, c-format
+msgid "Storing folder '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1521
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1522
+#, c-format
+msgid "Storing account '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1577
+msgid "Refreshing folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
+msgid "Expunging folder"
+msgstr ""
+
+#: ../mail/mail-ops.c:1661
+#, c-format
+msgid "Emptying trash in '%s'"
+msgstr ""
+
+#: ../mail/mail-ops.c:1662
+msgid "Local Folders"
+msgstr ""
+
+#: ../mail/mail-ops.c:1745
+#, c-format
+msgid "Retrieving message %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:1855
+#, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../mail/mail-ops.c:1941
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "O warediñ %d kemennadenn"
+msgstr[1] "O warediñ %d kemennadenn"
+
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2019
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2091
+msgid "Saving attachment"
+msgstr ""
+
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2120
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2269
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2269
+#, c-format
+msgid "Reconnecting to %s"
+msgstr ""
+
+#: ../mail/mail-ops.c:2385
+msgid "Checking Service"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:158
+msgid "Canceling..."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:329
+msgid "Send & Receive Mail"
+msgstr "Kas hag atoriñ Postel"
+
+#: ../mail/mail-send-recv.c:336
+msgid "Cancel _All"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:425
+msgid "Updating..."
+msgstr ""
+
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
+msgid "Waiting..."
+msgstr "O c'hortoz..."
+
+#: ../mail/mail-send-recv.c:709
+msgid "Checking for new mail"
+msgstr ""
+
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
+#, c-format
+msgid "Enter Password for %s"
+msgstr "Roit ho ger-kuzh evit %s"
+
+#: ../mail/mail-session.c:206
+msgid "Enter Password"
+msgstr "Roit ho ger-kuzh"
+
+#: ../mail/mail-session.c:241
+msgid "User canceled operation."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:384
+msgid "Edit signature"
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:431
+msgid "Enter a name for this signature."
+msgstr ""
+
+#: ../mail/mail-signature-editor.c:434
+#: ../plugins/groupwise-features/properties.glade.h:5
+msgid "Name:"
+msgstr "Anv :"
+
+#: ../mail/mail-tools.c:120
+#, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:150
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: ../mail/mail-tools.c:256
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: ../mail/mail-tools.c:258
+msgid "Forwarded message"
+msgstr ""
+
+#: ../mail/mail-tools.c:298
+#, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Renkell siek : `%s'"
+
+#: ../mail/mail-vfolder.c:91
+#, c-format
+msgid "Setting up Search Folder: %s"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:240
+#, c-format
+msgid "Updating Search Folders for '%s:%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:247
+#, c-format
+msgid "Updating Search Folders for '%s'"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1050
+msgid "Edit Search Folder"
+msgstr ""
+
+#: ../mail/mail-vfolder.c:1134
+msgid "New Search Folder"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:1
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:2
+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."
+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 signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../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:9
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+
+#: ../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:11
+msgid "Are you sure you want to open {0} messages at once?"
+msgstr ""
+
+#: ../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:13
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder &quot;{0}&quot;?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:14
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#: ../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:16
+msgid "Are you sure you want to send a message without a subject?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:17
+msgid "Because &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:19
+msgid "Because &quot;{2}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:20
+msgid "Blank Signature"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:21
+msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:22
+msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:23
+msgid "Cannot create folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:24
+msgid "Cannot create temporary save directory."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:25
+msgid "Cannot create the save directory, because &quot;{1}&quot;"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:26
+msgid "Cannot delete folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:27
+msgid "Cannot delete system folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../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:29
+msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:30
+msgid "Cannot open source &quot;{1}&quot;"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:31
+msgid "Cannot open source &quot;{2}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:32
+msgid "Cannot open target &quot;{2}&quot;."
+msgstr ""
+
+#: ../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 "
+"license."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:34
+msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:35
+msgid "Cannot rename or move system folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:36
+msgid "Cannot save changes to account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:37
+msgid "Cannot save to directory &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:38
+msgid "Cannot save to file &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:39
+msgid "Cannot set signature script &quot;{0}&quot;."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:41
+msgid "Could not save signature file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:42
+msgid "Delete &quot;{0}&quot;?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:43
+msgid "Delete account?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:44
+msgid "Discard changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:45
+msgid "Do not delete"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:46
+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:48
+msgid "Do you want to mark all messages as read?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:49
+msgid "Do you wish to save your changes?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:50
+msgid "Enter password."
+msgstr "Roit ho ger-kuzh"
+
+#: ../mail/mail.error.xml.h:51
+msgid "Error loading filter definitions."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:52
+msgid "Error while performing operation."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:53
+msgid "Error while {0}."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:54
+msgid "File exists but cannot overwrite it."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:55
+msgid "File exists but is not a regular file."
+msgstr ""
+
+#: ../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: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: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:61
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: ../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:63
+msgid "Ignore"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:64
+msgid "Invalid authentication"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:65
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#: ../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 "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:67
+msgid "Mark all messages as read"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:68
+msgid "Mark all messages as read in the selected folder"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:69
+msgid "Missing folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:71
+msgid "No sources selected."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:72
+msgid "Opening too many messages at once may take a long time."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:73
+msgid "Please check your account settings and try again."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:74
+msgid "Please enable the account or send using another account."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:75
+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:76
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:79
+msgid "Please provide an unique name to identify this signature."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:80
+msgid "Please wait."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:81
+msgid "Problem migrating old mail folder &quot;{0}&quot;."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:82
+msgid "Querying server"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:83
+msgid "Querying server for a list of supported authentication mechanisms."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:84
+msgid "Read receipt requested."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:85
+msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:86
+msgid "Search Folders automatically updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:87
+msgid "Send Receipt"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:88
+msgid "Signature Already Exists"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:89
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:90
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#: ../mail/mail.error.xml.h:93
+msgid ""
+"The following Search Folder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    &quot;{1}&quot;\n"
+"And have been updated."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:103
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:104
+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:106
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:108
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:110
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:111
+msgid "Unable to connect to the GroupWise server."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:112
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:113
+msgid "Unable to read license file."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:114
+msgid "Use _Default"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:115
+msgid "Use default drafts folder?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:116
+msgid "You have not filled in all of the required information."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:117
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:118
+msgid "You may not create two accounts with the same name."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:119
+msgid "You must name this Search Folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:120
+msgid "You must specify a folder."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:121
+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:123
+msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+msgid "_Append"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:125
+msgid "_Discard changes"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:127
+msgid "_Expunge"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:128
+msgid "_Open Messages"
+msgstr "Digeriñ kemennadennoù"
+
+#: ../mail/message-list.c:1000
+msgid "Unseen"
+msgstr ""
+
+#: ../mail/message-list.c:1001
+msgid "Seen"
+msgstr ""
+
+#: ../mail/message-list.c:1002
+msgid "Answered"
+msgstr ""
+
+#: ../mail/message-list.c:1003
+msgid "Multiple Unseen Messages"
+msgstr ""
+
+#: ../mail/message-list.c:1004
+msgid "Multiple Messages"
+msgstr ""
+
+#: ../mail/message-list.c:1008
+msgid "Lowest"
+msgstr ""
+
+#: ../mail/message-list.c:1009
+msgid "Lower"
+msgstr ""
+
+#: ../mail/message-list.c:1013
+msgid "Higher"
+msgstr ""
+
+#: ../mail/message-list.c:1014
+msgid "Highest"
+msgstr ""
+
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
+msgid "?"
+msgstr ""
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
+#: ../widgets/table/e-cell-date.c:72
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
+msgid "%b %d %Y"
+msgstr ""
+
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr ""
+
+#: ../mail/message-list.c:3442
+msgid "Generating message list"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:3
+msgid "Due By"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:4
+msgid "Flag Status"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:5
+msgid "Flagged"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:8
+msgid "Original Location"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:9
+msgid "Received"
+msgstr ""
+
+#: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+msgid "Size"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:75
+msgid "Call"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:76
+msgid "Do Not Forward"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:77
+msgid "Follow-Up"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:78
+msgid "For Your Information"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:80
+msgid "No Response Necessary"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+msgid "Reply"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+msgid "Reply to All"
+msgstr ""
+
+#: ../mail/message-tag-followup.c:84
+msgid "Review"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:2
+msgid "Message contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:3
+msgid "Recipients contain"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:4
+msgid "Sender contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:5
+msgid "Subject contains"
+msgstr ""
+
+#: ../mail/searchtypes.xml.h:6
+msgid "Subject or Sender contains"
+msgstr ""
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+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 "
+"play them directly from evolution."
+msgstr ""
+
+#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
+msgid "Audio inline plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:109
+msgid "Backup Evolution directory"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:111
+msgid "Restore Evolution directory"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:113
+msgid "Check Evolution archive"
+msgstr ""
+
+#: ../plugins/backup-restore/backup.c:115
+msgid "Restart Evolution"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+msgid "A plugin for backing up and restore Evolution data and settings."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+msgid "Backup and restore plugin"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+msgid "Backup Settings..."
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "Backup and restore Evolution data and settings"
+msgstr ""
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+msgid "Restore Settings..."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
+msgid "Automatic Contacts"
+msgstr ""
+
+#. Enable BBDB checkbox
+#: ../plugins/bbdb/bbdb.c:454
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr ""
+
+#. Enable Gaim Checkbox
+#: ../plugins/bbdb/bbdb.c:490
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+
+#. Synchronize now button.
+#: ../plugins/bbdb/bbdb.c:507
+msgid "Synchronize with _buddy list now"
+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 messages. Also fills in IM contact information from your buddy "
+"lists."
+msgstr ""
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "Implij SSL"
+
+#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
+msgid "Local Calendars"
+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
+msgid "_Secure connection"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
+msgid "HTTP Calendars"
+msgstr ""
+
+#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+msgid "Provides core functionality for webcal and http calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:54
+#: ../plugins/calendar-weather/calendar-weather.c:60
+msgid "Weather: Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:61
+msgid "Weather: Fog"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:62
+msgid "Weather: Partly Cloudy"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:63
+msgid "Weather: Rain"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:64
+msgid "Weather: Snow"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:65
+msgid "Weather: Sunny"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:66
+msgid "Weather: Thunderstorms"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:267
+msgid "Select a location"
+msgstr "Diuzit ul lec'hiadur"
+
+#: ../plugins/calendar-weather/calendar-weather.c:654
+msgid "_Units:"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:661
+msgid "Metric (Celsius, cm, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/calendar-weather.c:662
+msgid "Imperial (Fahrenheit, inches, etc)"
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+msgid "Provides core functionality for weather calendars."
+msgstr ""
+
+#: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
+msgid "Weather Calendars"
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopiañ ar chomlec'h postel"
+
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
+msgid "Copy tool"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr ""
+
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+msgid "Checks whether Evolution is the default mail client on startup."
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+msgid "Default Mail Client "
+msgstr ""
+
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+msgid "Do you want to make Evolution your default e-mail client?"
+msgstr ""
+
+#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:109
+msgid "Mark as _default folder"
+msgstr ""
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+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 ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
+msgid "_Account:"
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr ""
+
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
+msgid "_User:"
+msgstr ""
+
+#. i18n: "Secure Password Authentication" is an Outlookism
+#: ../plugins/exchange-operations/exchange-account-setup.c:63
+msgid "Secure Password"
+msgstr ""
+
+#. i18n: "NTLM" probably doesn't translate
+#: ../plugins/exchange-operations/exchange-account-setup.c:66
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:74
+msgid "Plaintext Password"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:76
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
+msgid "Out Of Office"
+msgstr ""
+
+#: ../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:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
+msgid "I am out of the office"
+msgstr ""
+
+#: ../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:328
+msgid "Change the password for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
+msgid "Change Password"
+msgstr ""
+
+#. Delegation Assistant
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
+msgid "Manage the delegate settings for Exchange account"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
+msgid "Delegation Assitant"
+msgstr ""
+
+#. Miscelleneous settings
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
+msgid "Miscelleneous"
+msgstr "A bep seurt"
+
+#. Folder Size
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
+msgid "View the size of all Exchange folders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
+msgid "Folders Size"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
+msgid "Exchange Settings"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
+msgid "_OWA URL:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
+msgid "A_uthenticate"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
+msgid "Authentication Type"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
+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
+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
+msgid "The two passwords do not match. Please re-enter the passwords."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
+msgid "Confirm Password:"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
+msgid "Current Password:"
+msgstr "Ger-kuzh en implij :"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
+msgid "New Password:"
+msgstr "Ger-kuzh nevez :"
+
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+msgid "Your current password has expired. Please change your password now."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+msgid "Custom"
+msgstr "Personelaet"
+
+#: ../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
+#, c-format
+msgid "Permissions for %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:421
+msgid "Delegate To"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:562
+#, c-format
+msgid "Remove the delegate %s?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:680
+msgid "Could not access Active Directory"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:692
+msgid "Could not find self in Active Directory"
+msgstr ""
+
+#: ../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:717
+#, c-format
+msgid "Could not remove delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:777
+msgid "Could not update list of delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:795
+#, c-format
+msgid "Could not add delegate %s"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.c:963
+msgid "Error reading delegates list."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+msgid "C_alendar:"
+msgstr "Deiziadur :"
+
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+msgid "Co_ntacts:"
+msgstr "Darempredoù :"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid "Delegates"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "Aozer (lenn, krouiñ, kemmañ)"
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+msgid "Permissions for"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr ""
+
+#: ../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:14
+msgid "_Delegate can see private items"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
+msgid "_Inbox:"
+msgstr ""
+
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+msgid "_Tasks:"
+msgstr "Traoù d'ober :"
+
+#: ../plugins/exchange-operations/exchange-folder-permission.c:58
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
+msgid "Permissions..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+msgid "Folder Name"
+msgstr "Anv ar renkell"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+msgid "Folder Size"
+msgstr "Ment ar renkell"
+
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
+#: ../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:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
+msgid "Unsubscribe Folder..."
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
+#, c-format
+msgid "Really unsubscribe from folder \"%s\"?"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
+#, c-format
+msgid "Unsubscribe from \"%s\""
+msgstr ""
+
+#: ../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 "Kemmañ ar ger-kuzh"
+
+#: ../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 ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+msgid "Add User:"
+msgstr "Ouzhpennañ implijer :"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
+msgid "Add User"
+msgstr "Ouzhpennañ implijer :"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
+msgid "<b>Permissions</b>"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
+msgid "Cannot Delete"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
+msgid "Cannot Edit"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
+msgid "Create items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
+msgid "Create subfolders"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+msgid "Delete Any Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+msgid "Delete Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
+msgid "Edit Any Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
+msgid "Edit Own Items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
+msgid "Folder contact"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
+msgid "Folder owner"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
+msgid "Folder visible"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
+msgid "Read items"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
+msgid "Role: "
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+msgid "Select User"
+msgstr "Diuzit implijer"
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+msgid "Address Book..."
+msgstr "Karned chomlec'h..."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
+msgid "Subscribe to Other User's Contacts"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
+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
+msgid "Exchange Operations"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+msgid "Cannot change password due to configuration problems."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
+msgid "Cannot display folders."
+msgstr "N'eus ket tu da ziskouez renkelloù"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+msgid "Could not authenticate to server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+msgid "Could not change password."
+msgstr "Ne oa ket tu da gemmañ ar ger-kuzh."
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+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
+msgid "Could not connect to Exchange server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+msgid "Could not connect to server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+msgid "Could not determine folder permissions for delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+msgid "Could not find Exchange Web Storage System."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+msgid "Could not locate server {0}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+msgid "Could not make {0} a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+msgid "Could not read folder permissions"
+msgstr ""
+
+#: ../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:17
+msgid "Could not read out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+msgid "Could not update folder permissions."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+msgid "Could not update out-of-office state"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+msgid "Exchange Account is offline."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+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"
+"need to enable this functionality in order for \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"
+"{0}\n"
+"  "
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+msgid "Failed to update delegates:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
+msgid "Folder already exists"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:35
+msgid "Folder does not exist"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
+msgid "Folder offline"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
+#: ../shell/e-shell.c:1269
+msgid "Generic error"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+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
+msgid "Mailbox for {0} is not on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+msgid "Make sure the URL is correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+msgid "Make sure the server name is spelled correctly and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+msgid "Make sure the username and password are correct and try again."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+msgid "No Global Catalog server configured for this account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+msgid "No mailbox for user {0} on {1}."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+msgid "No such user {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
+msgid "Password successfully changed."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
+msgid "Please restart Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+msgid "Please select a user."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Server rejected password because it is too weak."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+msgid "The Exchange account will be disabled when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+msgid "The Exchange account will be removed when you quit Evolution"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+msgid "The Exchange server is not compatible with Exchange Connector."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+msgid ""
+"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
+msgid ""
+"This probably means that your server requires \n"
+"you to specify the Windows domain name \n"
+"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
+"\n"
+"Or you might have just typed your password wrong."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+msgid "Try again with a different password."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+msgid "Unable to add user to access control list:"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+msgid "Unable to edit delegates."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+msgid "Unknown error looking up {0}"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+msgid "Unknown error."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+msgid "Unknown type"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+msgid "Unsupported operation"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+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
+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 mail on this server."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+msgid "You may only configure a single Exchange account."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+msgid ""
+"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
+msgid ""
+"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
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+msgid "Your password has expired."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+msgid "{0} cannot be added to an access control list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+msgid "{0} is already a delegate"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+msgid "{0} is already in the list"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
+msgid "Subscribe to Other User's Tasks"
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
+msgid "Check folder permissions"
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+msgid "Allows unsubscribing of mail folders in the folder tree context menu."
+msgstr ""
+
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe Folders"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+msgid "Checklist"
+msgstr ""
+
+#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
+msgid "Groupwise Account Setup"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:77
+msgid "Junk Settings"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:90
+msgid "<b>Junk Mail Settings</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-mail-settings.c:112
+msgid "Junk Mail Settings..."
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:1
+msgid "<b>Junk List:</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:2
+msgid "Email:"
+msgstr "Postel :"
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:5
+#: ../plugins/mail-account-disable/mail-account-disable.c:46
+msgid "_Disable"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:6
+msgid "_Enable"
+msgstr ""
+
+#: ../plugins/groupwise-features/junk-settings.glade.h:7
+msgid "_Junk List"
+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
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
+#: ../widgets/misc/e-send-options.glade.h:17
+msgid "Send Options"
+msgstr ""
+
+#: ../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
+msgid "Groupwise Features"
+msgstr ""
+
+#: ../plugins/groupwise-features/process-meeting.c:49
+msgid "Accept Tentatively"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "<b>Users:</b>"
+msgstr "<b>Implijerion :</b>"
+
+#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Message"
+msgstr "Kemennadenn"
+
+#: ../plugins/groupwise-features/properties.glade.h:6
+msgid "Shared Folder Notification"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:8
+msgid "The participants will receive the following notification.\n"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:11
+msgid "_Contacts..."
+msgstr "Darempredoù..."
+
+#: ../plugins/groupwise-features/properties.glade.h:12
+msgid "_Customize notification message"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:13
+msgid "_Not Shared"
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:15
+msgid "_Shared With ..."
+msgstr ""
+
+#: ../plugins/groupwise-features/properties.glade.h:16
+msgid "_Sharing"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
+msgid "<b>Name</b>"
+msgstr "<b>Anv</b>"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+msgid "Access Rights"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+msgid "Add/Edit"
+msgstr "Ouzhpennañ/Kemmañ"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+msgid "Con_tacts"
+msgstr "Darempredoù"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+msgid "Modify _folders/options/rules/"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+msgid "Read items marked _private"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+msgid "Reminder Notes"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+msgid "Subscribe to my _alarms"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+msgid "Subscribe to my _notifications"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../ui/evolution-mail-message.xml.h:126
+msgid "_Read"
+msgstr "Lenn"
+
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
+msgid "_Write"
+msgstr "Skrivañ"
+
+#: ../plugins/groupwise-features/proxy-listing.glade.h:1
+msgid "Proxy"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+msgid "<b>Account Name</b>"
+msgstr ""
+
+#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
+msgid "Proxy Login"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/groupwise-features/proxy-login.c:505
+msgid "_Proxy Login..."
+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:702
+msgid "The Proxy tab will be available only when the account is enabled."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:322
+msgid "Users"
+msgstr "Implijerion"
+
+#: ../plugins/groupwise-features/share-folder-common.c:323
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:342
+msgid "New _Shared Folder..."
+msgstr ""
+
+#: ../plugins/groupwise-features/share-folder-common.c:450
+msgid "Sharing"
+msgstr ""
+
+#: ../plugins/groupwise-features/status-track.c:242
+msgid "Track Message Status..."
+msgstr ""
+
+#: ../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
+msgid "Hula Account Setup"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:198
+msgid "Import ICS"
+msgstr ""
+
+#: ../plugins/import-ics-attachments/icsimporter.c:226
+msgid "Select Task List"
+msgstr "Diuzit ur roll an traoù d'ober"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:230
+msgid "Select Calendar"
+msgstr "Diuzit un deiziadur"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:261
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "Enporzhiañ"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+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
+msgid "No output directory!"
+msgstr ""
+
+#: ../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 "Ne oa ket tu da gemmañ ar ger-kuzh."
+
+#: ../plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr ""
+
+#: ../plugins/ipod-sync/sync.c:231
+#, fuzzy
+msgid "Could not open addressbook!"
+msgstr "Dic'houest da gargañ ar c'harned-chomlec'h"
+
+#: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "Kuitaet en deus karned chomlec'h Evolution hep abeg."
+
+#: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
+msgid "Could not open calendar/todo!"
+msgstr "N'eus ket tu dilemel ar c'harned chomlec'h."
+
+#: ../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:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:488
+msgid "Unable to find any calendars"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:495
+msgid "Unable to find this meeting in any calendar"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:499
+msgid "Unable to find this task in any task list"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:503
+msgid "Unable to find this journal entry in any journal"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:529
+msgid "Searching for an existing version of this appointment"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:726
+msgid "Unable to parse item"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:782
+#, c-format
+msgid "Unable to send item to calendar '%s'.  %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:793
+#, c-format
+msgid "Sent to calendar '%s' as accepted"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:797
+#, c-format
+msgid "Sent to calendar '%s' as tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:802
+#, c-format
+msgid "Sent to calendar '%s' as declined"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:807
+#, c-format
+msgid "Sent to calendar '%s' as canceled"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:900
+#, c-format
+msgid "Organizer has removed the delegate %s "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:907
+msgid "Sent a cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:909
+msgid "Could not send the cancelation notice to the delegate"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:994
+msgid "Attendee status could not be updated because the status is invalid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1021
+#, c-format
+msgid "Unable to update attendee. %s"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1025
+msgid "Attendee status updated"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1152
+msgid "The calendar attached is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1153
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+msgid "The item in the calendar is not valid"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
+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:1213
+msgid "The calendar attached contains multiple items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1214
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+
+#. Delete message after acting
+#. FIXME Need a schema for this
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+msgid "_Delete message after acting"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr ""
+
+#. Source selector
+#: ../plugins/itip-formatter/itip-formatter.c:2019
+msgid "Select the calendars to search for meeting conflicts"
+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:241 ../widgets/misc/e-dateedit.c:467
+msgid "Today"
+msgstr "Hiziv"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:189
+msgid "Today %H:%M"
+msgstr "Hiziv %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:193
+msgid "Today %H:%M:%S"
+msgstr "Hiziv %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:202
+msgid "Today %l:%M:%S %p"
+msgstr "Hiziv %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:212
+msgid "Tomorrow"
+msgstr "Warc'hoazh"
+
+#. strftime format of a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:217
+msgid "Tomorrow %H:%M"
+msgstr "Warc'hoazh %H:%M"
+
+#. strftime format of a time,
+#. in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:221
+msgid "Tomorrow %H:%M:%S"
+msgstr "Warc'hoazh %H:%M:%S"
+
+#. strftime format of a time,
+#. in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:226
+msgid "Tomorrow %l:%M %p"
+msgstr "Warc'hoazh %l:%M %p"
+
+#. strftime format of a time,
+#. in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:230
+msgid "Tomorrow %l:%M:%S %p"
+msgstr "Warc'hoazh %l:%M:%S %p"
+
+#. strftime format of a weekday.
+#: ../plugins/itip-formatter/itip-view.c:249
+#, 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:254
+msgid "%A %H:%M"
+msgstr "%A %H:%M"
+
+#. strftime format of a weekday and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:258
+msgid "%A %H:%M:%S"
+msgstr "%A %H:%M:%S"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:263
+msgid "%A %l:%M %p"
+msgstr "%A %l:%M %p"
+
+#. strftime format of a weekday and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:267
+msgid "%A %l:%M:%S %p"
+msgstr "%A %l:%M:%S %p"
+
+#. strftime format of a weekday and a date
+#. without a year.
+#: ../plugins/itip-formatter/itip-view.c:276
+msgid "%A, %B %e"
+msgstr "%A, %B %e"
+
+#. strftime format of a weekday, a date
+#. without a year and a time,
+#. in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:282
+msgid "%A, %B %e %H:%M"
+msgstr "%A, %B %e %H:%M"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:286
+msgid "%A, %B %e %H:%M:%S"
+msgstr "%A, %B %e %H:%M:%S"
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:291
+msgid "%A, %B %e %l:%M %p"
+msgstr ""
+
+#. strftime format of a weekday, a date without a year
+#. and a time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:295
+msgid "%A, %B %e %l:%M:%S %p"
+msgstr "%A, %B %e %l:%M:%S %p"
+
+#. strftime format of a weekday and a date.
+#: ../plugins/itip-formatter/itip-view.c:301
+msgid "%A, %B %e, %Y"
+msgstr "%A, %B %e, %Y"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:306
+msgid "%A, %B %e, %Y %H:%M"
+msgstr "%A, %B %e, %Y %H:%M"
+
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
+#: ../plugins/itip-formatter/itip-view.c:310
+msgid "%A, %B %e, %Y %H:%M:%S"
+msgstr "%A, %B %e, %Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: ../plugins/itip-formatter/itip-view.c:315
+msgid "%A, %B %e, %Y %l:%M %p"
+msgstr "%A, %B %e, %Y %l:%M %p"
+
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
+#: ../plugins/itip-formatter/itip-view.c:319
+msgid "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%A, %B %e, %Y %l:%M:%S %p"
+
+#: ../plugins/itip-formatter/itip-view.c:344
+#, c-format
+msgid "<b>%s</b> through %s has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:346
+#, c-format
+msgid "<b>%s</b> has published the following meeting information:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:351
+#, c-format
+msgid "<b>%s</b> has delegated the following meeting to you:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#, c-format
+msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
+#, c-format
+msgid "<b>%s</b> requests your presence at the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:362
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:364
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:367
+#, c-format
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:370
+#, c-format
+msgid "<b>%s</b> has sent back the following meeting response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:374
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:376
+#, c-format
+msgid "<b>%s</b> has canceled the following meeting."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:379
+#, c-format
+msgid "<b>%s</b> has proposed the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:385
+#, c-format
+msgid "<b>%s</b> has declined the following meeting changes."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:412
+#, c-format
+msgid "<b>%s</b> through %s has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:414
+#, c-format
+msgid "<b>%s</b> has published the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:419
+#, c-format
+msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:422
+#, c-format
+msgid "<b>%s</b> through %s has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:424
+#, c-format
+msgid "<b>%s</b> has assigned you a task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:430
+#, c-format
+msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:432
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:435
+#, 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
+#, c-format
+msgid "<b>%s</b> has sent back the following assigned task response:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:442
+#, c-format
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:444
+#, c-format
+msgid "<b>%s</b> has canceled the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:447
+#, c-format
+msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:451
+#, c-format
+msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:453
+#, c-format
+msgid "<b>%s</b> has declined the following assigned task:"
+msgstr ""
+
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "Digeriñ an deiziadur"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:714
+msgid "_Tentative all"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+msgid "_Tentative"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:715
+msgid "_Accept all"
+msgstr ""
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+msgid "_Send Information"
+msgstr "Kas titouroù"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr ""
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:888
+msgid "Start time:"
+msgstr ""
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:897
+msgid "End time:"
+msgstr ""
+
+#. Comment
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
+msgid "Comment:"
+msgstr "Addispleg :"
+
+#: ../plugins/itip-formatter/itip-view.c:977
+msgid "Send u_pdates to attendees"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:986
+msgid "A_pply to all instances"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+msgid "Displays text/calendar parts in messages."
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
+msgid "Itip Formatter"
+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; ?"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid "This meeting has been delegated"
+msgstr ""
+
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
+msgstr ""
+
+#: ../plugins/mail-account-disable/mail-account-disable.c:47
+msgid "Proxy _Logout"
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
+msgid "Allows disabling of accounts."
+msgstr ""
+
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable Account"
+msgstr ""
+
+#: ../plugins/mail-remote/client.c:30
+#, c-format
+msgid "System error: %s"
+msgstr ""
+
+#: ../plugins/mail-remote/client.c:32
+#, c-format
+msgid "Camel error: %s"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:476
+msgid "Account cannot send e-mail"
+msgstr ""
+
+#: ../plugins/mail-remote/evolution-mail-store.c:605
+msgid "No store available"
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgstr ""
+
+#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
+msgid "Mail Remote"
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+msgid "Con_vert to Meeting"
+msgstr ""
+
+#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+msgid "Mail to meeting"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
+msgid "Mail to task"
+msgstr ""
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+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
+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 ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
+msgid "Mailing List Actions"
+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
+msgid "Mailing _List"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
+msgstr ""
+
+#: ../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
+msgid "_Post message to list"
+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
+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 ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+msgid "Action not available"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
+msgid "Malformed header"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
+msgid "No e-mail action"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+msgid "Posting not allowed"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+msgid "Send e-mail message to mailing list?"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
+msgid "_Edit message"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
+msgid "_Send message"
+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"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+msgid "Post a message to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr ""
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+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 ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
+msgid "Marks the selected calendar for offline viewing."
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
+msgid "_Do not make this available offline"
+msgstr ""
+
+#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
+msgid "_Mark Calendar for offline use"
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+msgid "A plugin which implements mono plugins."
+msgstr ""
+
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Mono Loader"
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
+msgid "Generates a D-BUS message when new mail arrives."
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
+msgid "New Mail Notification"
+msgstr ""
+
+#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
+msgid "New mail notify"
+msgstr ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
+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
+#: ../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 ""
+
+#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+msgid "_Plugins"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:43
+msgid "Author(s)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:193
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
+msgid "Plugin"
+msgstr ""
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+msgid ""
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
+"\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
+msgid "Plain Text Mode"
+msgstr ""
+
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+msgid "Prefer plain-text"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:150
+msgid "HTML Mode"
+msgstr ""
+
+#: ../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: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
+msgid "Prints the message"
+msgstr ""
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr ""
+
+#: ../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
+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
+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 ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr ""
+
+#: ../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 "Porzh"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+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 "Restr :"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+msgid "_Publish as:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
+msgid "Spamassassin (built-in)"
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
+msgid "Spamassassin junk plugin"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+msgid "A plugin for saving all attachments or parts of a message at once."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
+msgid "Save attachments"
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+msgid "Save Attachments ..."
+msgstr ""
+
+#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+msgid "Save all attachments"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:338
+msgid "Select save base name"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:358
+msgid "MIME Type"
+msgstr ""
+
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
+msgid "Save"
+msgstr "Gwarediñ"
+
+#.
+#. * 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
+msgid "%F %T"
+msgstr "%F %T"
+
+#: ../plugins/save-calendar/csv-format.c:385
+msgid "UID"
+msgstr "UID"
+
+#: ../plugins/save-calendar/csv-format.c:387
+msgid "Description List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:388
+msgid "Categories List"
+msgstr "Roll ar rummadoù"
+
+#: ../plugins/save-calendar/csv-format.c:389
+msgid "Comment List"
+msgstr "Roll an addisplegoù"
+
+#: ../plugins/save-calendar/csv-format.c:391
+msgid "Created"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:392
+msgid "Contact List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:393
+msgid "Start"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:394
+msgid "End"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:396
+msgid "percent Done"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:398
+msgid "URL"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:399
+msgid "Attendees List"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:401
+msgid "Modified"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:552
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:559
+msgid "Prepend a header"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:568
+msgid "Value delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:574
+msgid "Record delimiter:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:580
+msgid "Encapsulate values with:"
+msgstr ""
+
+#: ../plugins/save-calendar/csv-format.c:602
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+msgid "Save Selected"
+msgstr ""
+
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+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.
+#. * Also check out http://www.w3.org/2002/12/cal/tzd
+#. *
+#: ../plugins/save-calendar/rdf-format.c:158
+msgid "%FT%T"
+msgstr "%FT%T"
+
+#: ../plugins/save-calendar/rdf-format.c:396
+msgid "RDF format (.rdf)"
+msgstr "Furmad RDF (.rdf)"
+
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
+msgid "Select destination file"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+msgid "Select one source"
+msgstr ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+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 ""
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+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 ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:85
+msgid "Evolution Setup Assistant"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:88
+msgid "Welcome"
+msgstr "Donedigezh vat"
+
+#: ../plugins/startup-wizard/startup-wizard.c:89
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:140
+#: ../shell/e-shell-importer.c:147
+msgid "Please select the information that you would like to import:"
+msgstr ""
+
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
+#, c-format
+msgid "From %s:"
+msgstr "Eus %s :"
+
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
+msgid "Importing data."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+msgid "Indicates if threading of messages should fall back to subject."
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+msgid "Subject Threading"
+msgstr ""
+
+#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+msgid "Thread messages by subject"
+msgstr ""
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: ../plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+msgid "Evolution Shell Config factory"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "A GNOME Print description of the current printer settings"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Configuration version"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default sidebar width"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default window height"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+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: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:8
+msgid "Last upgraded configuration version"
+msgstr ""
+
+#: ../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:10
+msgid "Printer settings"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Sidebar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Skip development warning dialog"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
+msgid "Start in offline mode"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+msgid "The default height for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+msgid "The default width for the main window, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+msgid "The default width for the sidebar, in pixels."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+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:20
+msgid "Toolbar is visible"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether Evolution will start up in offline mode instead of online mode."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether the sidebar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+msgid "Whether the window buttons should be visible."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+msgid "Window button style"
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+msgid "Window buttons are visible"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr ""
+
+#: ../shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
+msgid "(Untitled)"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:135
+msgid "Choose the type of importer to run:"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:138
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+
+#: ../shell/e-shell-importer.c:144
+msgid "Choose the destination for this import"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:150
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
+"settings found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:285
+msgid "F_ilename:"
+msgstr "Anv ar restr :"
+
+#: ../shell/e-shell-importer.c:290
+msgid "Select a file"
+msgstr "Diuzit ur restr"
+
+#: ../shell/e-shell-importer.c:302
+msgid "File _type:"
+msgstr "Seurt ar restr :"
+
+#: ../shell/e-shell-importer.c:338
+msgid "Import data and settings from _older programs"
+msgstr ""
+
+#: ../shell/e-shell-importer.c:341
+msgid "Import a _single file"
+msgstr ""
+
+#: ../shell/e-shell-settings-dialog.c:318
+msgid "Evolution Preferences"
+msgstr ""
+
+#: ../shell/e-shell-utils.c:118
+msgid "No folder name specified."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:125
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:131
+msgid "Folder name cannot contain the character \"/\"."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:137
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
+
+#: ../shell/e-shell-utils.c:143
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: ../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:79
+#, c-format
+msgid "Error executing %s."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:128
+msgid "Bug buddy is not installed."
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:136
+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:561
+msgid "translator-credits"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:806
+msgid "_Work Online"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
+msgid "_Work Offline"
+msgstr ""
+
+#: ../shell/e-shell-window-commands.c:832
+msgid "Work Offline"
+msgstr ""
+
+#: ../shell/e-shell-window.c:371
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:379
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: ../shell/e-shell-window.c:386
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr ""
+
+#: ../shell/e-shell-window.c:786
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: ../shell/e-shell.c:633
+msgid "Uknown system error."
+msgstr ""
+
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
+msgid "OK"
+msgstr "Mat eo"
+
+#: ../shell/e-shell.c:1263
+msgid "Invalid arguments"
+msgstr ""
+
+#: ../shell/e-shell.c:1265
+msgid "Cannot register on OAF"
+msgstr ""
+
+#: ../shell/e-shell.c:1267
+msgid "Configuration Database not found"
+msgstr ""
+
+#: ../shell/e-user-creatable-items-handler.c:685
+msgid "New"
+msgstr "Nevez"
+
+#: ../shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr ""
+
+#: ../shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr ""
+
+#: ../shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr ""
+
+#: ../shell/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+
+#: ../shell/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr ""
+
+#: ../shell/import.glade.h:3
+msgid "Import File"
+msgstr ""
+
+#: ../shell/import.glade.h:4
+msgid "Import Location"
+msgstr ""
+
+#: ../shell/import.glade.h:5
+msgid "Importer Type"
+msgstr ""
+
+#: ../shell/import.glade.h:6
+msgid "Select Importers"
+msgstr ""
+
+#: ../shell/import.glade.h:7
+msgid "Select a File"
+msgstr "Diuzit ur restr"
+
+#: ../shell/import.glade.h:8
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+
+#. Preview/Alpha/Beta version warning message
+#: ../shell/main.c:231
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"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.gnome.org.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
+
+#: ../shell/main.c:255
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+
+#: ../shell/main.c:262
+msgid "Do not tell me again"
+msgstr ""
+
+#: ../shell/main.c:472
+msgid "Start Evolution activating the specified component"
+msgstr ""
+
+#: ../shell/main.c:476
+msgid "Start in online mode"
+msgstr ""
+
+#: ../shell/main.c:479
+msgid "Forcibly shut down all Evolution components"
+msgstr ""
+
+#: ../shell/main.c:483
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: ../shell/main.c:486
+msgid "Send the debugging output of all components to a file."
+msgstr ""
+
+#: ../shell/main.c:488
+msgid "Disable loading of any plugins."
+msgstr ""
+
+#: ../shell/main.c:519
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:1
+msgid "Are you sure you want to forget all remembered passwords?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:2
+msgid "Continue"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:3
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:4
+msgid "Evolution can not start."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:7
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:8
+msgid "Really delete old data?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:9
+msgid ""
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:15
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:19
+msgid "Upgrade from previous version failed: {0}"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:20
+msgid ""
+"Upgrading your data and settings will require up to {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:23
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:26
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:31
+msgid "_Forget"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:32
+msgid "_Keep Data"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:33
+msgid "_Remind Me Later"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:34
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: ../smime/gui/ca-trust-dialog.c:104
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: ../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: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: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 ""
+
+#: ../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:276
+#: ../smime/gui/certificate-manager.c:490
+msgid "Purposes"
+msgstr ""
+
+#: ../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:293
+msgid "Expires"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:481
+msgid "E-Mail Address"
+msgstr ""
+
+#: ../smime/gui/certificate-viewer.c:341
+#, c-format
+msgid "Certificate Viewer: %s"
+msgstr ""
+
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr ""
+
+#. we're setting the password initially
+#: ../smime/gui/component.c:70
+msgid "Enter new password for certificate database"
+msgstr ""
+
+#: ../smime/gui/component.c:72
+msgid "Enter new password"
+msgstr ""
+
+#. FIXME: add serial no, validity date, uses
+#: ../smime/gui/e-cert-selector.c:121
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
+
+#: ../smime/gui/e-cert-selector.c:174
+msgid "Select certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:10
+msgid "Authorities"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:11
+msgid "Backup"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
+msgid "Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:17
+msgid "Certificates Table"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:18
+msgid "Common Name (CN)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:19
+msgid "Contact Certificates"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:21
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:22
+msgid "Dummy window only"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:23
+msgid "Edit"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:24
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:25
+msgid "Email Recipient Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:26
+msgid "Email Signer Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:27
+msgid "Expires On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:29
+msgid "Import"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:30
+msgid "Issued On"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:31
+msgid "MD5 Fingerprint"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:32
+msgid "Organization (O)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:33
+msgid "Organizational Unit (OU)"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:34
+msgid "SHA1 Fingerprint"
+msgstr ""
+
+#: ../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:823
+msgid "SSL Server Certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:38
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify email users."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:41
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:42
+msgid "View"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:43
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:44
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:45
+msgid "You have certificates on file that identify these people:"
+msgstr ""
+
+#: ../smime/gui/smime-ui.glade.h:46
+msgid "Your Certificates"
+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:664
+msgid "Certificate already exists"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+msgid "%d/%m/%Y"
+msgstr ""
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:425
+msgid "Sign"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:426
+msgid "Encrypt"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:531
+msgid "Version"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:546
+msgid "Version 1"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:549
+msgid "Version 2"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:552
+msgid "Version 3"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:634
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:637
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:640
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:667
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:670
+msgid "Certificate Key Usage"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:673
+msgid "Netscape Certificate Type"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:676
+msgid "Certificate Authority Key Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:688
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:739
+msgid "Algorithm Identifier"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:747
+msgid "Algorithm Parameters"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:769
+msgid "Subject Public Key Info"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:774
+msgid "Subject Public Key Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:789
+msgid "Subject's Public Key"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
+msgid "Error: Unable to process extension"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+msgid "Object Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:835
+msgid "SSL Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:839
+msgid "Email Certificate Authority"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:867
+msgid "Signing"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:871
+msgid "Non-repudiation"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:875
+msgid "Key Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:879
+msgid "Data Encipherment"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:883
+msgid "Key Agreement"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:887
+msgid "Certificate Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:891
+msgid "CRL Signer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:939
+msgid "Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
+msgid "Not Critical"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:965
+msgid "Extensions"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1036
+#, c-format
+msgid "%s = %s"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
+msgid "Certificate Signature Algorithm"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1101
+msgid "Issuer"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1155
+msgid "Issuer Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1174
+msgid "Subject Unique ID"
+msgstr ""
+
+#: ../smime/lib/e-cert.c:1217
+msgid "Certificate Signature Value"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:266
+msgid "Enter password for PKCS12 file:"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:365
+msgid "Imported Certificate"
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:321
+msgid "An attachment to add."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:322
+msgid "Content type of the attachment."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:323
+msgid "The filename to display in the mail."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:324
+msgid "Description of the attachment."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:325
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
+
+#: ../tools/evolution-launch-composer.c:326
+msgid "Default subject for the message."
+msgstr ""
+
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: ../tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr ""
+
+#: ../tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:5
+msgid "Contact _Preview"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:7
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:10
+msgid "Copy to Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:11
+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:14
+msgid "Del_ete Address Book"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:16
+msgid "Delete selected contacts"
+msgstr ""
+
+#: ../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
+msgid "Mo_ve All Contacts To..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:20
+msgid "Move Selected Contacts to Another Folder..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:22
+msgid "Move to Folder..."
+msgstr ""
+
+#: ../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:25
+msgid "Previews the contacts to be printed"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:28
+msgid "Print selected contacts"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:30
+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:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
+msgid "Select All"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../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:37
+msgid "Send a message to the selected contacts."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:38
+msgid "Send message to contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:39
+msgid "Send selected contacts to another person."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:40
+msgid "Show contact preview window"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:42
+msgid "Stop"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:43
+msgid "Stop Loading"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:44
+msgid "View the current contact"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
+#: ../ui/evolution-tasks.xml.h:21
+msgid "_Actions"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:48
+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:53
+msgid "_Move Contact to..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+msgid "_New"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr ""
+
+#: ../ui/evolution-addressbook.xml.h:63
+msgid "_Send Message to Contact..."
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:6
+msgid "Delete _all Occurrences"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:8
+msgid "Delete the appointment"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:11
+msgid "Go To"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:12
+msgid "Go back"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:13
+msgid "Go forward"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:14
+msgid "List"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:15
+msgid "Month"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
+msgid "Next"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:18
+msgid "Previews the calendar to be printed"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
+msgid "Previous"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:22
+msgid "Print this calendar"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+msgid "Purg_e"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:25
+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 ""
+
+#: ../ui/evolution-calendar.xml.h:28
+msgid "Select today"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:29
+msgid "Show as list"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:35
+msgid "View the current appointment"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:36
+msgid "Week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
+#: ../ui/evolution-calendar.xml.h:42
+msgid "_Open Appointment"
+msgstr ""
+
+#: ../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:3
+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:7
+msgid "Cut selection to clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
+msgid "Paste text from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
+msgid "Select all text"
+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
+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:14 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:15 ../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:18 ../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:41
+msgid "_File"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
+msgid "_Help"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr ""
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "Neuziadoù"
+
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:3
+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-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+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
+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
+msgid "_Alarms"
+msgstr "Alarmoù"
+
+#: ../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
+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
+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
+msgid "_Recurrence"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+msgid "_Status Field"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+msgid "_Type Field"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:3
+msgid "Copy the selected folder into another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:4
+msgid "Create a new folder for storing mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:5
+msgid "Create or edit Search Folder definitions"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:7
+msgid "Empty _Trash"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "Renkell"
+
+#: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _Preview"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:10
+msgid "Move the selected folder into another folder"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
+msgid "Permanently remove all deleted messages from all folders"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:13
+msgid "Search F_olders"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:14
+msgid "Show message preview window"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:15
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:16
+msgid "_Copy Folder To..."
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:18
+msgid "_Move Folder To..."
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "_New..."
+msgstr "Nevez..."
+
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Subscriptions"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:1
+msgid "Change the name of this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:2
+msgid "Change the properties of this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:4
+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:7
+msgid "Cut selected message(s) to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:9
+msgid "E_xpunge"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:10
+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 ""
+
+#: ../ui/evolution-mail-list.xml.h:14
+msgid "Hide _Read Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:15
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:17
+msgid "Paste message(s) from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:18
+msgid "Permanently remove all deleted messages from this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:19
+msgid "Permanently remove this folder"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:20
+msgid "Select Message _Thread"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Select _All Messages"
+msgstr ""
+
+#: ../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:23
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:24
+msgid "Select all visible messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:25
+msgid "Sh_ow Hidden Messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:26
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:27
+msgid "Temporarily hide all messages that have already been read"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Temporarily hide the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:29
+msgid "Threaded Message list"
+msgstr ""
+
+#: ../ui/evolution-mail-list.xml.h:31
+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 ""
+
+#: ../ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr ""
+
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
+msgid "Add Sender to Address Book"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:5
+msgid "All Message _Headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:6
+msgid "Apply filter rules to the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:7
+msgid "Check for _Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:8
+msgid "Compose _New Message"
+msgstr "Skrivañ ur gemennadenn nevez"
+
+#: ../ui/evolution-mail-message.xml.h:9
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:10
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:11
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:14
+msgid "Create R_ule"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:15
+msgid "Create a Search Folder for these recipients"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:16
+msgid "Create a Search Folder for this mailing list"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:17
+msgid "Create a Search Folder for this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:18
+msgid "Create a Search Folder for this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:19
+msgid "Create a rule to filter messages from this sender"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:20
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
+
+#: ../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:22
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:23
+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:26
+msgid "Display the next important message"
+msgstr ""
+
+#: ../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 previous important message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:31
+msgid "Display the previous message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:32
+msgid "Display the previous unread message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:49
+msgid "Mar_k as"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:50
+msgid "Mark the selected messages as having been read"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:51
+msgid "Mark the selected messages as important"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:52
+msgid "Mark the selected messages as junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:53
+msgid "Mark the selected messages as not being junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:54
+msgid "Mark the selected messages as not having been read"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:55
+msgid "Mark the selected messages as unimportant"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected messages for deletion"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:57
+msgid "Move selected messages to another folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:59
+msgid "Next _Important Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:60
+msgid "Next _Thread"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:61
+msgid "Next _Unread Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:62
+msgid "Not Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:63
+msgid "Open a window for composing a mail message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:65
+msgid "Open the selected messages in the composer for editing"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "P_revious Unread Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:68
+msgid "Pos_t New Message to Folder"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:69
+msgid "Post a Repl_y"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:70
+msgid "Post a message to a Public folder"
+msgstr ""
+
+#: ../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:72
+msgid "Pr_evious Important Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:73
+msgid "Preview the message to be printed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:77
+msgid "Print this message"
+msgstr "Moulañ ar gemennadenn-mañ"
+
+#: ../ui/evolution-mail-message.xml.h:78
+msgid "Re_direct"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:79
+msgid "Redirect (bounce) the selected message to someone"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:84
+msgid "Reset the text to its original size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Save the selected messages as a text file"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from Mailing _List..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Recipients..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:88
+msgid "Search Folder from S_ubject..."
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:89
+msgid "Search Folder from Sen_der..."
+msgstr ""
+
+#: ../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:91
+msgid "Select _All Text"
+msgstr "Diuz pep tra"
+
+#: ../ui/evolution-mail-message.xml.h:92
+msgid "Select all the text in a message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:93
+msgid "Set up the page settings for your current printer"
+msgstr ""
+
+#: ../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:95
+msgid "Show messages in the normal style"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:96
+msgid "Show messages with all email headers"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:97
+msgid "Show the raw email source of the message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:98
+msgid "Undelete the selected messages"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:99
+msgid "Uni_mportant"
+msgstr ""
+
+#: ../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
+msgid "_Caret Mode"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:106
+msgid "_Delete Message"
+msgstr "Dilemel ar gemennadenn"
+
+#: ../ui/evolution-mail-message.xml.h:108
+msgid "_Find in Message..."
+msgstr "Klask e-barzh ar gemennadenn..."
+
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:111
+msgid "_Go To"
+msgstr "Mont da"
+
+#: ../ui/evolution-mail-message.xml.h:112
+msgid "_Important"
+msgstr "Pouezus"
+
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:114
+msgid "_Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:115
+msgid "_Load Images"
+msgstr "Kargañ skeudennoù"
+
+#: ../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:120
+msgid "_Normal Size"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:121
+msgid "_Not Junk"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:122
+msgid "_Open in New Window"
+msgstr "Digeriñ e-barzh ur prenestr nevez"
+
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Previous Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:128
+msgid "_Save Message..."
+msgstr "Gwarediñ ar gemennadenn..."
+
+#: ../ui/evolution-mail-message.xml.h:129
+msgid "_Undelete Message"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:130
+msgid "_Unread"
+msgstr ""
+
+#: ../ui/evolution-mail-message.xml.h:131
+msgid "_Zoom In"
+msgstr ""
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "Serriñ ar prenestr-mañ"
+
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
+msgid "Main toolbar"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr ""
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:13
+msgid "Close the current file"
+msgstr "Serriñ ar restr en implij"
+
+#: ../ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Certificate"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:14
+msgid "For_mat"
+msgstr "Furmad"
+
+#: ../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 "HTML"
+
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:13
+msgid "Open a file"
+msgstr "Digeriñ ur restr"
+
+#: ../ui/evolution-message-composer.xml.h:14
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:15
+msgid "PGP Sign"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:16
+msgid "R_equest Read Receipt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:17
+msgid "S/MIME Encrypt"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "S/MIME Sign"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Gwarediñ dindan"
+
+#: ../ui/evolution-message-composer.xml.h:21
+msgid "Save Draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "Save _As..."
+msgstr "Gwarediñ dindan..."
+
+#: ../ui/evolution-message-composer.xml.h:23
+msgid "Save _Draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "Save as draft"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:25
+msgid "Save in folder..."
+msgstr "Gwarediñ dindan ar renkell..."
+
+#: ../ui/evolution-message-composer.xml.h:26
+msgid "Save the current file"
+msgstr "Gwarediñ ar restr en implij"
+
+#: ../ui/evolution-message-composer.xml.h:27
+msgid "Save the current file with a different name"
+msgstr "Gwarediñ ar restr en implij dindan un anv disheñvel"
+
+#: ../ui/evolution-message-composer.xml.h:28
+msgid "Save the message in a specified folder"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:29
+msgid "Send"
+msgstr "Kas"
+
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
+msgid "Send the mail in HTML format"
+msgstr "Kas ar bostel e furmad HTML"
+
+#: ../ui/evolution-message-composer.xml.h:31
+msgid "Send this message"
+msgstr "Kas ar gemennadenn-mañ"
+
+#: ../ui/evolution-message-composer.xml.h:32
+msgid "Set the message priority to high"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:33
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:34
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:35
+msgid "Toggles whether the BCC field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the CC field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the From chooser is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:38
+msgid "Toggles whether the Post-To field is displayed"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:39
+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:43
+msgid "_Cc Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:45
+msgid "_Delete all"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:48
+msgid "_From Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:49
+msgid "_Open..."
+msgstr "Digeriñ..."
+
+#: ../ui/evolution-message-composer.xml.h:50
+msgid "_Post-To Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritize Message"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:52
+msgid "_Reply-To Field"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:54
+msgid "_Security"
+msgstr ""
+
+#: ../ui/evolution-message-composer.xml.h:55
+msgid "_To Field"
+msgstr ""
+
+#: ../ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "Serriñ"
+
+#: ../ui/evolution-signature-editor.xml.h:15
+msgid "H_TML"
+msgstr "HTML"
+
+#: ../ui/evolution-signature-editor.xml.h:17
+msgid "Save and Close"
+msgstr "Gwarediñ ha serriñ"
+
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:21
+msgid "Save and _Close"
+msgstr "Gwarediñ ha serriñ"
+
+#: ../ui/evolution-signature-editor.xml.h:22
+msgid "Save the current file and close the window"
+msgstr "Gwarediñ ar restr en implij ha serriñ ar prenestr"
+
+#: ../ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Adkargañ ar roll"
+
+#: ../ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../ui/evolution-subscribe.xml.h:12
+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
+msgid "Status Details"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Time Zone"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Details"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:3
+msgid "Copy selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:5
+msgid "Cut selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:12
+msgid "Paste tasks from the clipboard"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr ""
+
+#: ../ui/evolution-tasks.xml.h:20
+msgid "View the selected task"
+msgstr "Gwelout an dra d'ober diuzet"
+
+#: ../ui/evolution-tasks.xml.h:27
+msgid "_Open Task"
+msgstr "Digeriñ un dra d'ober"
+
+#: ../ui/evolution.xml.h:1
+msgid "About Evolution..."
+msgstr "A-zivout Evolution..."
+
+#: ../ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr ""
+
+#: ../ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ../ui/evolution.xml.h:5
+msgid "Create a new window displaying this folder"
+msgstr ""
+
+#: ../ui/evolution.xml.h:6
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr ""
+
+#: ../ui/evolution.xml.h:7
+msgid "Display window buttons with icons and text"
+msgstr ""
+
+#: ../ui/evolution.xml.h:8
+msgid "Display window buttons with icons only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:9
+msgid "Display window buttons with text only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:10
+msgid "Exit the program"
+msgstr ""
+
+#: ../ui/evolution.xml.h:11
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr ""
+
+#: ../ui/evolution.xml.h:12
+msgid "Hide window buttons"
+msgstr ""
+
+#: ../ui/evolution.xml.h:13
+msgid "I_mport..."
+msgstr "Enporzhiañ..."
+
+#: ../ui/evolution.xml.h:14
+msgid "Icons _and text"
+msgstr "Arlun ha testenn"
+
+#: ../ui/evolution.xml.h:15
+msgid "Import data from other programs"
+msgstr ""
+
+#: ../ui/evolution.xml.h:17
+msgid "New _Window"
+msgstr "Prenestr nevez"
+
+#: ../ui/evolution.xml.h:18
+msgid "Prefere_nces"
+msgstr "Dibaboù gwellañ"
+
+#: ../ui/evolution.xml.h:19
+msgid "Send / Receive"
+msgstr "Kas / Atoriñ"
+
+#: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "Kas / Atoriñ"
+
+#: ../ui/evolution.xml.h:21
+msgid "Send queued items and retrieve new items"
+msgstr ""
+
+#: ../ui/evolution.xml.h:22
+msgid "Set up Pilot configuration"
+msgstr ""
+
+#: ../ui/evolution.xml.h:23
+msgid "Show information about Evolution"
+msgstr "Diskouez titouroù diwar-benn Evolution"
+
+#: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "Barrenn gostez"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "Barrenn stad"
+
+#: ../ui/evolution.xml.h:26
+msgid "Submit Bug Report"
+msgstr ""
+
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:31
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: ../ui/evolution.xml.h:32
+msgid "Submit a bug report using Bug Buddy"
+msgstr ""
+
+#: ../ui/evolution.xml.h:33
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ../ui/evolution.xml.h:34
+msgid "Tool_bar"
+msgstr "Barrenn ostilhoù"
+
+#: ../ui/evolution.xml.h:35
+msgid "Tool_bar style"
+msgstr ""
+
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Diskouez/Kuzhad ar varrenn gostez"
+
+#: ../ui/evolution.xml.h:37
+msgid "View/Hide the Status Bar"
+msgstr "Diskouez/Kuzhat ar varrenn stad"
+
+#: ../ui/evolution.xml.h:38
+msgid "_About"
+msgstr "A-zivout"
+
+#: ../ui/evolution.xml.h:39
+msgid "_Close Window"
+msgstr "Serriñ ar prenestr"
+
+#: ../ui/evolution.xml.h:42
+msgid "_Forget Passwords"
+msgstr ""
+
+#: ../ui/evolution.xml.h:44
+msgid "_Hide buttons"
+msgstr ""
+
+#: ../ui/evolution.xml.h:45
+msgid "_Icons only"
+msgstr "Arlunoù hepken"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Quick Reference"
+msgstr ""
+
+#: ../ui/evolution.xml.h:48
+msgid "_Quit"
+msgstr "Mont kuit"
+
+#: ../ui/evolution.xml.h:49
+msgid "_Switcher Appearance"
+msgstr ""
+
+#: ../ui/evolution.xml.h:50
+msgid "_Synchronization Options..."
+msgstr ""
+
+#: ../ui/evolution.xml.h:51
+msgid "_Text only"
+msgstr ""
+
+#: ../ui/evolution.xml.h:53
+msgid "_Window"
+msgstr "Prenestr"
+
+#: ../views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr ""
+
+#: ../views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr ""
+
+#: ../views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr ""
+
+#: ../views/calendar/galview.xml.h:5
+msgid "_Work Week View"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:1
+msgid "As _Sent Folder"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:2
+msgid "By S_tatus"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:3
+msgid "By Se_nder"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:4
+msgid "By Su_bject"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:5
+msgid "By _Follow Up Flag"
+msgstr ""
+
+#: ../views/mail/galview.xml.h:6
+msgid "_Messages"
+msgstr "Kemennadennoù"
+
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr ""
+
+#: ../views/tasks/galview.xml.h:1
+msgid "With _Due Date"
+msgstr ""
+
+#: ../views/tasks/galview.xml.h:2
+msgid "With _Status"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
+msgid "UTC"
+msgstr "UTC"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>Time Zones</b>"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+msgid "<b>_Selection</b>"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid "Select a Time Zone"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+msgid "TimeZone Combobox"
+msgstr ""
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-model.c:188
+msgid "Collection"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views.glade.h:4
+#, no-c-format
+msgid "Define Views for %s"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views-dialog.c:333
+#: ../widgets/menus/gal-define-views-dialog.c:335
+msgid "Define Views"
+msgstr ""
+
+#: ../widgets/menus/gal-define-views.glade.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr ""
+
+#: ../widgets/menus/gal-define-views.glade.h:5
+msgid "_Edit..."
+msgstr "Aozañ..."
+
+#: ../widgets/menus/gal-view-factory-etable.c:39
+#: ../widgets/table/e-table-header-item.c:1840
+#: ../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
+msgid "Instance"
+msgstr ""
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+msgid "Save Current View"
+msgstr "Gwarediñ ar sell en implij"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+msgid "_Create new view"
+msgstr "Krouiñ ur sell nevez"
+
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+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 "Sell personelaet"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "Gwarediñ ar sell personelaet"
+
+#: ../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 "C_urrent View"
+msgstr "Sell en implij"
+
+#: ../widgets/menus/gal-view-menus.c:359
+msgid "Save Custom View..."
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:80
+msgid "Factory"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.c:115
+msgid "Define New View"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+msgid "Name of new view:"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+msgid "Type of View"
+msgstr ""
+
+#: ../widgets/menus/gal-view-new-dialog.glade.h:4
+msgid "Type of view:"
+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:416
+msgid "MTWTFSS"
+msgstr "LMMYGSS"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../widgets/misc/e-calendar-item.c:1093
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr ""
+
+#: ../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:3563
+#: ../widgets/text/e-text.c:3564
+msgid "Fill color"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../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:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
+msgid "GDK fill color"
+msgstr ""
+
+#: ../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:3585
+#: ../widgets/text/e-text.c:3586
+msgid "Fill stipple"
+msgstr ""
+
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
+msgid "X1"
+msgstr "X1"
+
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
+msgid "X2"
+msgstr "X2"
+
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
+msgid "Y1"
+msgstr "Y1"
+
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
+msgid "Y2"
+msgstr "Y2"
+
+#: ../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:3015
+msgid "Minimum width"
+msgstr ""
+
+#: ../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: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
+msgid "Spacing"
+msgstr ""
+
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
+msgid "Now"
+msgstr "Bremañ"
+
+#: ../widgets/misc/e-cell-date-edit.c:793
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr ""
+
+#: ../widgets/misc/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:64
+msgid "Baltic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Central European"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:66
+msgid "Chinese"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:67
+msgid "Cyrillic"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:68
+msgid "Greek"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:69
+msgid "Hebrew"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:70
+msgid "Japanese"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:71
+msgid "Korean"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:73
+msgid "Turkish"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:74
+msgid "Unicode"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:75
+msgid "Western European"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:76
+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
+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
+msgid "Simplified"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:102
+msgid "Ukrainian"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:105
+msgid "Visual"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:174
+#, c-format
+msgid "Unknown character set: %s"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:219
+msgid "Character Encoding"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:234
+msgid "Enter the character set to use"
+msgstr ""
+
+#: ../widgets/misc/e-charset-picker.c:341
+msgid "Other..."
+msgstr "All..."
+
+#: ../widgets/misc/e-charset-picker.c:482
+msgid "Ch_aracter Encoding"
+msgstr ""
+
+#: ../widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
+
+#: ../widgets/misc/e-dateedit.c:321
+msgid "Date and Time"
+msgstr "Deiziad hag an eur"
+
+#: ../widgets/misc/e-dateedit.c:340
+msgid "Text entry to input date"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:362
+msgid "Click this button to show a calendar"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:384
+msgid "Combo box to select time"
+msgstr ""
+
+#: ../widgets/misc/e-dateedit.c:385
+msgid "Time"
+msgstr ""
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
+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:1439 ../widgets/misc/e-dateedit.c:1766
+msgid "%I:%M %p"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:181
+msgid "Expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:197
+msgid "Use underline"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:198
+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
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
+msgid "Expander Size"
+msgstr ""
+
+#: ../widgets/misc/e-expander.c:223 ../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 ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.c:202
+msgid "_Searches"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.c:204
+msgid "Searches"
+msgstr ""
+
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:227
+msgid "Save Search"
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
+msgid "_Save Search..."
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
+msgid "_Edit Saved Searches..."
+msgstr ""
+
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
+msgid "_Advanced Search..."
+msgstr ""
+
+#: ../widgets/misc/e-image-chooser.c:172
+msgid "Choose Image"
+msgstr ""
+
+#: ../widgets/misc/e-map.c:627
+msgid "World Map"
+msgstr ""
+
+#: ../widgets/misc/e-map.c:629
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:103
+msgid "Sync with:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+msgid "Empty message"
+msgstr ""
+
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+msgid "Reflow model"
+msgstr ""
+
+#: ../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:371
+msgid "Search"
+msgstr "Klask"
+
+#: ../widgets/misc/e-search-bar.c:588
+msgid "_Search"
+msgstr "Klask"
+
+#: ../widgets/misc/e-search-bar.c:594
+msgid "_Find Now"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
+msgid "_Clear"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:686
+msgid "Search Type"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:890
+msgid "Item ID"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:897
+msgid "Subitem ID"
+msgstr ""
+
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
+msgid "Text"
+msgstr "Testenn"
+
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr ""
+
+#: ../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:554
+#: ../widgets/table/e-tree-selection-model.c:818
+msgid "Cursor Column"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:214
+msgid "Sorter"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:221
+msgid "Selection Mode"
+msgstr ""
+
+#: ../widgets/misc/e-selection-model.c:229
+msgid "Cursor Mode"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.c:522
+msgid "When de_leted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:1
+msgid "<b>Delivery Options</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:2
+msgid "<b>Replies</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:3
+msgid "<b>Return Notification</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:4
+msgid "<b>Status Tracking</b>"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:5
+msgid "A_uto-delete sent item"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:6
+msgid "C_lassification"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:7
+msgid "Creat_e a sent item to track information"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:8
+msgid "Deli_vered and opened"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:9
+msgid "Gene_ral Options"
+msgstr "Neuziadoù dre vras"
+
+#: ../widgets/misc/e-send-options.glade.h:10
+msgid ""
+"None\n"
+"Mail Receipt"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:12
+msgid ""
+"Public\n"
+"Private\n"
+"Confidential\n"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:16
+msgid "R_eply requested"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:18
+msgid "Sta_tus Tracking"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:19
+msgid ""
+"Undefined\n"
+"High\n"
+"Standard\n"
+"Low"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:23
+msgid "When acce_pted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:24
+msgid "When co_mpleted:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:25
+msgid "When decli_ned:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:27
+msgid "_After:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:28
+msgid "_All information"
+msgstr "Titour all"
+
+#: ../widgets/misc/e-send-options.glade.h:29
+msgid "_Delay message delivery"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Delivered"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:32
+msgid "_Set expiration date"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:33
+msgid "_Until:"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:34
+msgid "_When convenient"
+msgstr ""
+
+#: ../widgets/misc/e-send-options.glade.h:35
+msgid "_When opened:"
+msgstr ""
+
+#: ../widgets/misc/e-task-widget.c:208
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
+
+#: ../widgets/misc/e-task-widget.c:213
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr ""
+
+#: ../widgets/misc/e-url-entry.c:107
+msgid "Click here to go to URL"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:2
+msgid "Edit Master Category List..."
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:3
+msgid "Item(s) belong to these _categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:4
+msgid "_Available Categories:"
+msgstr ""
+
+#: ../widgets/misc/gal-categories.glade.h:5
+msgid "categories"
+msgstr "rummadoù"
+
+#: ../widgets/table/e-cell-combo.c:177
+msgid "popup list"
+msgstr ""
+
+#: ../widgets/table/e-cell-date.c:64
+msgid "%l:%M %p"
+msgstr "%l:%M %p"
+
+#: ../widgets/table/e-cell-pixbuf.c:397
+msgid "Selected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:404
+msgid "Focused Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-pixbuf.c:411
+msgid "Unselected Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1749
+msgid "Strikeout Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1756
+msgid "Underline Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1763
+msgid "Bold Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1770
+msgid "Color Column"
+msgstr ""
+
+#: ../widgets/table/e-cell-text.c:1784
+msgid "BG Color Column"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:1
+msgid "<- _Remove"
+msgstr "<- Dilemel"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:2
+#: ../widgets/table/e-table-config.glade.h:1
+msgid "A_vailable Fields:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:3
+#: ../widgets/table/e-table-config.glade.h:2
+msgid "Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:4
+#: ../widgets/table/e-table-config.glade.h:3
+msgid "Clear All"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:5
+#: ../widgets/table/e-table-config.glade.h:4
+msgid "Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:7
+msgid "Group Items By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:8
+msgid "Move _Down"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:9
+msgid "Move _Up"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:11
+msgid "Sh_ow these fields in order:"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
+#: ../widgets/table/e-table-config.glade.h:10
+msgid "Show Fields"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show field in View"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Sort"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:15
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Sort Items By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Then By"
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:17
+msgid "_Add ->"
+msgstr "Ouzhpennañ ->"
+
+#: ../widgets/table/e-table-config-no-group.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:16
+msgid "_Fields Shown..."
+msgstr ""
+
+#: ../widgets/table/e-table-config-no-group.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:20
+msgid "_Sort..."
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:150
+msgid "State"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Ascending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+msgid "(Descending)"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:314
+msgid "Not sorted"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:355
+msgid "No grouping"
+msgstr ""
+
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr ""
+
+#: ../widgets/table/e-table-config.glade.h:17
+msgid "_Group By..."
+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:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1805
+msgid "DnD code"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:84
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1819
+msgid "Full Header"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:126
+msgid "Add a column..."
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser.glade.h:1
+msgid "Field Chooser"
+msgstr ""
+
+#: ../widgets/table/e-table-field-chooser.glade.h:2
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:346
+#, c-format
+msgid "%s : %s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:352
+#, c-format
+msgid "%s (%d item)"
+msgstr ""
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr ""
+
+#: ../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:2973 ../widgets/table/e-table-item.c:2974
+msgid "Alternating Row Colors"
+msgstr ""
+
+#: ../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: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: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: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: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: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: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:3001 ../widgets/table/e-table-item.c:3002
+msgid "Cursor mode"
+msgstr ""
+
+#: ../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:2966 ../widgets/table/e-table-item.c:2967
+msgid "Selection model"
+msgstr ""
+
+#: ../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: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: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: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: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:1466
+msgid "Customize Current View"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Sort Ascending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1487
+msgid "Sort Descending"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1488
+msgid "Unsort"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1490
+msgid "Group By This Field"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1491
+msgid "Group By Box"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1493
+msgid "Remove This Column"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1494
+msgid "Add a Column..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1496
+msgid "Alignment"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1497
+msgid "Best Fit"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1498
+msgid "Format Columns..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1500
+msgid "Customize Current View..."
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
+#: ../widgets/text/e-entry.c:1264
+msgid "Fontset"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1833
+#: ../widgets/table/e-table-sorter.c:175
+msgid "Sort Info"
+msgstr ""
+
+#: ../widgets/table/e-table-header-item.c:1847
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
+msgid "Tree"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+msgid "Table header"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+msgid "Table model"
+msgstr ""
+
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+msgid "Cursor row"
+msgstr ""
+
+#: ../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:3322
+msgid "Use click to add"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+msgid "ETree table adapter"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3305
+msgid "Retro Look"
+msgstr ""
+
+#: ../widgets/table/e-tree.c:3306
+msgid "Draw lines and +/- expanders."
+msgstr ""
+
+#: ../widgets/text/e-entry-test.c:49
+msgid "Minicard Test"
+msgstr ""
+
+#: ../widgets/text/e-entry-test.c:50
+#, fuzzy
+msgid "Copyright (C) 2000, Helix Code, Inc."
+msgstr "Copyright (C) 2000, Ximian, 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:3478 ../widgets/text/e-text.c:3479
+msgid "Event Processor"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
+msgid "Font"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
+msgid "GDKFont"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+msgid "Justification"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Use ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "Ellipsis"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "Line wrap"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+msgid "Break characters"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
+msgid "Max lines"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Allow newlines"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+msgid "Draw borders"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+msgid "Draw background"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+msgid "Draw button"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+msgid "Cursor position"
+msgstr ""
+
+#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
+msgid "Emulate label resize"
+msgstr ""
+
+#: ../widgets/text/e-text.c:2721
+msgid "Input Methods"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
+msgid "Bold"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+msgid "Strikeout"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+msgid "Anchor"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
+msgid "Clip Width"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
+msgid "Clip Height"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
+msgid "Clip"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+msgid "Fill clip rectangle"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+msgid "X Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+msgid "Y Offset"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+msgid "Text width"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+msgid "Text height"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+msgid "IM Context"
+msgstr ""
+
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+msgid "Handle Popup"
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 47c8240f30..52920cf1b4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-20 07:13+0200\n"
-"PO-Revision-Date: 2006-04-24 07:14+0200\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
+"POT-Creation-Date: 2006-04-29 10:50+0200\n"
+"PO-Revision-Date: 2006-04-29 10:51+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr ""
 # fitxer: addressbook.gui.component.ca.po
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "llibreta d'adreces de l'Evolution"
 
@@ -43,10 +43,10 @@ msgid "New Contact List"
 msgstr "Nova llista de contactes"
 
 # fitxer: addressbook.tools.ca.po
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, fuzzy, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "la llibreta d'adreces té %d targeta"
 msgstr[1] "la llibreta d'adreces té %d targetes"
 
@@ -71,37 +71,37 @@ msgstr "Contacte: "
 msgid "evolution minicard"
 msgstr "minitargeta de l'evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Té alarmes."
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Té recurrències."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "És una reunió."
 
 # fitxer: calendar.ca.po.2
-#: ../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 "Esdeveniment del calendari: el resum és %s."
 
 # fitxer: calendar.ca.po.2
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Esdeveniment de calendari: no té resum."
 
 # fitxer: calendar.ca.po.2
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Esdeveniments de la visualització del calendari"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Captura el focus"
 
@@ -136,14 +136,14 @@ msgstr "Vés a una data"
 msgid "a table to view and select the current time range"
 msgstr "una taula per a visualitzar i seleccionar el rang de temps actual"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Té %d esdeveniment."
 msgstr[1] "Té %d esdeveniments."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "No té esdeveniments."
 
@@ -250,23 +250,23 @@ msgid "Click here, you can find more events."
 msgstr "Cliqueu aquí per a veure més esdeveniments."
 
 # fitxer: calendar.ca.po.5
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visualització mensual: %s. %s"
 
 # fitxer: calendar.ca.po.5
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visualització setmanal: %s. %s"
 
 # fitxer: data.ca.po
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "visualització del calendari per a un mes"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "visualització del calendari per a una o més setmanes"
 
@@ -932,10 +932,10 @@ msgstr "_Nova llibreta d'adreces"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../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"
@@ -967,7 +967,7 @@ msgstr "S'està accedint anònimament al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
@@ -1418,6 +1418,7 @@ msgstr "minuts"
 #: ../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
@@ -3041,17 +3042,17 @@ msgstr "Modificat"
 msgid "Contact Editor - %s"
 msgstr "Editor de contactes - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 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:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Cap imatge"
 
 # fitxer: calendar.ca.po.4
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -3060,7 +3061,7 @@ msgstr ""
 "\n"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacte invàlid."
 
@@ -3095,10 +3096,10 @@ msgstr "_Seleccioneu la llibreta d'adreces"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Esteu segur de voler\n"
 "suprimir aquests contactes (%s)?"
@@ -3117,7 +3118,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Esteu segur de voler\n"
 "suprimir el contacte (%s)?"
@@ -3477,8 +3478,8 @@ msgstr "Desa com a VCard..."
 # fitxer: calendar.ca.po.5
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Obre"
@@ -3558,13 +3559,13 @@ msgstr "Re_talla"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copia"
@@ -4924,19 +4925,16 @@ msgstr "Esteu segur de voler suprimir aquesta cita?"
 
 # fitxer: mail.ca.po.3
 #: ../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 "Esteu segur que voleu esborrar aquesta entrada al diari?"
 
 # fitxer: mail.ca.po.3
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Esteu segur de voler suprimir aquesta reunió?"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Esteu segur de voler suprimir aquesta tasca?"
 
@@ -5463,7 +5461,7 @@ msgstr "_Temps de migdiada:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -6437,11 +6435,11 @@ msgstr "Alarmes"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
 msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 
 # fitxer: composer.ca.po
@@ -6451,7 +6449,7 @@ msgstr "Adjunta fitxers"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propietats del fitxer adjunt"
@@ -6461,21 +6459,21 @@ msgstr "Propietats del fitxer adjunt"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripció:"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
 # fitxer: composer.ca.po
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Tipus MIME:"
@@ -6975,7 +6973,7 @@ msgstr[1] "%d missatges adjunts"
 # fitxer: mail.ca.po.3
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mou"
 
@@ -7132,10 +7130,6 @@ msgstr "No s'ha pogut obrir el destí"
 msgid "Destination is read only"
 msgstr "El destí només es pot llegir"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
@@ -7870,7 +7864,7 @@ msgstr "<span weight=\"bold\">Estat</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completada"
@@ -8140,7 +8134,7 @@ msgstr "%s per a un tipus d'activador desconegut"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliqueu per obrir %s"
@@ -8238,7 +8232,7 @@ msgstr "Lliure"
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupat"
 
@@ -8256,8 +8250,8 @@ msgstr ""
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
@@ -8265,7 +8259,7 @@ msgstr "Sí"
 # fitxer: calendar.ca.po.4
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
@@ -8277,8 +8271,8 @@ msgstr "No"
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -8313,9 +8307,9 @@ msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
@@ -8399,28 +8393,28 @@ msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -8429,17 +8423,17 @@ msgid "_Print..."
 msgstr "Im_primeix..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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 "Re_talla"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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
@@ -8447,33 +8441,33 @@ msgid "_Paste"
 msgstr "E_nganxa"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix les tasques selecciona_des"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliqueu per afegir una tasca"
@@ -8516,131 +8510,131 @@ msgid "Task sort"
 msgstr "Ordre de les tasques"
 
 # fitxer: camel.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Moure elements"
 
 # fitxer: camel.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiar elements"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nova cit_a..."
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nou _esdeveniment de tot el dia"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Re_unió nova"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "_Tasca nova"
 
 # fitxer: widgets.ca.po
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Visualització a_ctual"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
 #
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Selecciona av_ui"
 
 # fitxer: mail.ca.po.1
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecciona data..."
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
 # fitxer: mail.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delega la reunió..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Planifica la _reunió..."
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
 # fitxer: mail.ca.po.1
 #
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Respon"
 
 # fitxer: mail.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
 # fitxer: ui.evolution-calendar.xml.h.ca.po
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Per_met moure aquest element"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
 # fitxer: calendar.ca.po.4
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organitzador: %s <%s>"
 
 # fitxer: calendar.ca.po.4
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organitzador: %s"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Ubicació: %s"
 
 # fitxer: calendar.ca.po.3
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -8828,7 +8822,7 @@ msgstr ""
 # fitxer: calendar.ca.po.3
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -8843,7 +8837,7 @@ msgstr "Provisionalment acceptat"
 # fitxer: calendar.ca.po.3
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -9249,14 +9243,14 @@ msgstr "Recursos"
 
 # fitxer: calendar.ca.po.3
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
@@ -9264,58 +9258,58 @@ msgstr "Grup"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurs"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Habitació"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Cadira"
 
 # fitxer: calendar.ca.po.3
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participació necessària"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participació opcional"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "No es participa"
 
 # fitxer: calendar.ca.po.3
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Precisa d'una acció"
 
 # fitxer: calendar.ca.po.3
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisionalment"
 
 # fitxer: calendar.ca.po.3
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -9327,15 +9321,15 @@ msgid "Attendee                          "
 msgstr "Assistent"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En procés"
 
 # fitxer: calendar.ca.po.3
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -9344,97 +9338,97 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora de l'oficina"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Cap informació"
 
 # fitxer: calendar.ca.po.4
 #
 #
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Ass_istents..."
 
 # fitxer: addressbook.printing.ca.po
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pcions"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "M_ostra només les hores de treball"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Tria _automàtica"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Tot_es les persones i recursos"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pe_rsones necessàries"
 
 # fitxer: calendar.ca.po.3
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 # fitxer: calendar.ca.po.4
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
@@ -12591,12 +12585,12 @@ msgstr "De_sa el missatge"
 # fitxer: shell.ca.po
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:520
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
 # fitxer: calendar.ca.po.3
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Aplicacions de treball en grup"
 
@@ -13176,7 +13170,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Control de preferències de correu de l'Evolution"
 
 # fitxer: mail.ca.po.3
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -13853,14 +13847,14 @@ msgid "Copying `%s' to `%s'"
 msgstr "S'està copiant '%s' a '%s'"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opia"
 
@@ -13886,175 +13880,175 @@ msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Reenvia"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marca com a _no llegit"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "No el _marquis com a important"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marca per al se_guiment..."
 
 # fitxer: filter.ca.po
 #
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiqueta"
 
 # fitxer: calendar.ca.po.4
 #
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Cap"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "S'ha completat el sen_yalador"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "N_eteja el senyalador"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla del missatge"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Cerca una carpeta per l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Cerca una carpeta pel remite_nt"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Cerca una carpeta pels destinata_ris"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Cerca una carpeta per la _llista de correu"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtra per l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtra pel remi_tent"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtra pels _destinataris"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Fil_tra per la llista de correu"
 
 # fitxer: camel.ca.po.3
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminat"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
 # fitxer: composer.ca.po
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "No s'ha pogut recuperar el missatge"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crea una carpeta de _cerca"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "D'a_questa adreça"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "A aques_ta adreça"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliqueu per enviar un correu a en/na %s"
@@ -14399,7 +14393,7 @@ msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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'ha produït un error desconegut en analitzar el missatge S/MIME"
 
@@ -14418,12 +14412,12 @@ msgid "Unsupported signature format"
 msgstr "No se suporta el format de la signatura"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
 # fitxer: mail.ca.po.3
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
@@ -16641,7 +16635,8 @@ msgid ""
 msgstr ""
 "Ja existeix una carpeta que no és buida a &quot;{1}&quot;.\n"
 "\n"
-"Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir el seu contingut, o sortir."
+"Podeu escollir ignorar aquesta carpeta, sobreescriure o afegir el seu "
+"contingut, o sortir."
 
 #: ../mail/mail.error.xml.h:5
 msgid ""
@@ -19598,10 +19593,9 @@ msgid "Itip Formatter"
 msgstr "Formatador d'itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; ha delegat la reunió. Voleu afegir el delegat &quot;{1}"
 "&quot;?"
@@ -19694,7 +19688,7 @@ 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 "Con_verteix a tasca"
+msgstr "Con_verteix a taska"
 
 # fitxer: mail.ca.po.2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
@@ -20194,7 +20188,7 @@ msgstr "Tipus MIME"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Desa"
 
@@ -20454,23 +20448,28 @@ msgstr "Alçada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Estat per defecte de la finestra"
+
+# fitxer: shell.ca.po
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Amplada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
-#: ../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 ""
 "ID o àlies del component a mostrar per defecte a l'inici de manera "
 "predeterminada."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Última versió de la configuració actualitzada"
 
 # fitxer: shell.ca.po
-#: ../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 ""
@@ -20478,26 +20477,26 @@ msgstr ""
 "desconnectada."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Configuració de la impressora"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "La barra lateral és visible"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr ""
 "Si s'ha d'ometre el diàleg d'avís de que és una versió de desenvolupament"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Inicia desconnectat"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20506,21 +20505,21 @@ msgstr ""
 "configuració (per exemple \"2.6.0\")."
 
 # fitxer: tools.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Alçada predeterminada de la finestra principal, en píxels."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Amplada predeterminada de la finestra principal, en píxels."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "L'amplada predeterminada de la barra lateral, en píxels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20528,7 +20527,7 @@ msgstr ""
 "La darrera versió actualitzada de l'Evolution, amb nivell major/menor/"
 "configuració (per exemple \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20538,40 +20537,44 @@ msgstr ""
 "\"toolbar\". Si s'habilita \"toolbar\", l'estil dels botons es determina "
 "mitjançant la configuració de la barra d'eines del GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "La barra d'eines és visible"
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Si l'Evolution s'inicia en mode desconnectat en comptes de connectat."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Si la finestra s'ha de maximitzar."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Si s'ha de veure la barra lateral."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Si s'ha de veure la barra d'eines."
 
 # fitxer: shell.ca.po
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Si les versions de desenvolupament de l'Evolution no mostren el diàleg "
 "d'avís."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Si s'ha de veure els botons de la finestra."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estil del botó de la finestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Els botons de la finestra són visibles"
 
@@ -20714,7 +20717,7 @@ msgstr "No es pot executar el Bug buddy."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Víctor Nieto <vnie2025@alu-etsetb.upc.es>\n"
@@ -20726,41 +20729,41 @@ msgstr ""
 "Gil Forcada <gilforcada@guifi.net>"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Treballa connectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "L'Evolution està actualment connectat. Cliqueu aquest botó per treballar "
 "desconnectat."
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "L'Evolution està procedint per treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "L'Evolution està actualment desconnectat. Cliqueu aquest botó per treballar "
 "connectat."
 
 # fitxer: mail.ca.po.2
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Commuta a %s"
@@ -20917,41 +20920,35 @@ msgid "Do not tell me again"
 msgstr "No ho tornis a mostrar"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:466
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:470
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Inicia connectat"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:473
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
 # fitxer: shell.ca.po
-#: ../shell/main.c:480
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de la depuració de tots els components a un fitxer."
 
-#: ../shell/main.c:482
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Inhabilita la càrrega de connectors."
 
-# fitxer: mail.ca.po.3
-#: ../shell/main.c:513
-#
-msgid "- The Evolution PIM and Email Client"
-msgstr "EL gestor d'informació personal i client de correu de l'Evolution"
-
 # fitxer: shell.ca.po
-#: ../shell/main.c:524
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21872,7 +21869,7 @@ msgstr "Selecciona-ho tot"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccion_a-ho tot"
@@ -22160,12 +22157,12 @@ msgid "Paste from clipboard"
 msgstr "Enganxa el porta-retalls"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Enganxa el text del porta-retalls"
 
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Selecciona tot el text"
 
@@ -22207,24 +22204,18 @@ msgid "Close"
 msgstr "Tanca"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nsereix"
-
-# fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "Fitxer _adjunt..."
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Tan_ca"
 
 # fitxer: ui.evolution-comp-editor.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
@@ -22232,10 +22223,15 @@ msgid "_File"
 msgstr "_Fitxer"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "A_juda"
 
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Insereix"
+
 # fitxer: addressbook.printing.ca.po
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
@@ -22485,7 +22481,7 @@ msgstr "_Mou la carpeta a..."
 # fitxer: ui.evolution.xml.h.ca.po
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
-msgstr "_Nova..."
+msgstr "_Nou..."
 
 # fitxer: mail.ca.po.1
 #.
@@ -23295,6 +23291,12 @@ msgid "HT_ML"
 msgstr "HT_ML"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nsereix"
+
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Obre un fitxer"
@@ -24068,11 +24070,6 @@ msgstr "Tipus de visualització"
 msgid "Type of view:"
 msgstr "Tipus de visualització:"
 
-# fitxer: composer.ca.po
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
-
 # fitxer: widgets.ca.po
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -25319,10 +25316,6 @@ msgstr "Menú emergent de l'ansa"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "No s'ha entregat el missatge amb assumpte &quot;{0}&quot;."
 
-# fitxer: ui.evolution-message-composer.xml.h.ca.po
-#~ msgid "_Insert"
-#~ msgstr "_Insereix"
-
 # fitxer: calendar.ca.po.4
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld segons)"
diff --git a/po/cy.po b/po/cy.po
index 29de6068de..2855b41f71 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-24 23:12+0100\n"
-"PO-Revision-Date: 2006-04-24 23:15+0100\n"
+"POT-Creation-Date: 2006-05-19 21:58+0100\n"
+"PO-Revision-Date: 2006-05-19 21:46-0000\n"
 "Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "llyfr cyfeiriadau Evolution"
 
@@ -54,10 +54,10 @@ msgstr "Cyswllt Newydd"
 msgid "New Contact List"
 msgstr "Rhestr Gysylltiadau Newydd"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, fuzzy, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
 msgstr[1] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
 msgstr[2] "%d cerdyn yn y blygell llyfr cyfeiriadau cyfredol"
@@ -79,32 +79,32 @@ msgstr "Cyswllt:"
 msgid "evolution minicard"
 msgstr "cerdyn bychan Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Mae ganddo larymau."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Mae'n ail-ddigwydd."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Mae'n gyfarfod."
 
-#: ../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 "Digwyddiad Calendr: Crynodeb yw %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Digwyddiad Calendr: Does ganddo ddim crynodeb."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "gweld digwyddiad calendr"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Cipio Ffocws"
 
@@ -133,7 +133,7 @@ msgstr "Ewch i'r Dyddiad"
 msgid "a table to view and select the current time range"
 msgstr "Tabl i weld ac i ddewis yr amrediad amser presennol"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -141,7 +141,7 @@ msgstr[0] "Mae ganddo %d digwyddiad."
 msgstr[1] "Mae ganddo %d ddigwyddiad."
 msgstr[2] "Mae ganddo %d digwyddiad."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Does ganddo ddim digwyddiad."
 
@@ -176,8 +176,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:829 ../calendar/gui/e-day-view.c:1517
-#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -208,8 +208,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:833 ../calendar/gui/e-day-view.c:1533
-#: ../calendar/gui/e-week-view-main-item.c:347
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -235,21 +235,21 @@ msgstr "Botwm Naid"
 msgid "Click here, you can find more events."
 msgstr "Cliciwch yma, gallwch ganfod rhagor o ddigwyddiadau."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Golwg Mis: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Golwg Wythnos: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "gwybodaeth galendr am fis"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "golwg galendr am un wythnos neu fwy"
 
@@ -821,10 +821,10 @@ msgstr "Llyfr Cyfeiriadau _Newydd"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../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"
@@ -849,7 +849,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Yn cyrchu'r gweinydd LDAP yn ddienw"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Methwyd dilysu.\n"
 
@@ -898,7 +898,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI y blygell a ddefnyddiwyd diwethaf yn y ddeialog dewis enwau."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Lleoliad cwarel fertigol"
 
@@ -1231,6 +1231,7 @@ msgstr "munudau"
 #: ../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
@@ -2546,15 +2547,15 @@ msgstr "Newidiwyd"
 msgid "Contact Editor - %s"
 msgstr "Golygydd Cysylltiadau - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Dewiswch ddelwedd ar gyfer y cyswllt hwn"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Dim delwedd"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2562,7 +2563,23 @@ msgstr ""
 "Mae'r data cyswllt yn annilys:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "Mae gan '%s' ffurf annilys"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "Mae gan %s'%s' ffurf annilys"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "Mae %s'%s' yn wag"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Cyswllt annilys."
 
@@ -2587,10 +2604,10 @@ msgid "_Select Address Book"
 msgstr "_Dewis Llyfr Cyfeiriadau"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r rhestr gysylltiadau (%s) ?"
@@ -2604,10 +2621,10 @@ msgstr ""
 "am ddileu'r rhestrau cysylltiadau hyn?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu'r cyswllt (%s) ?"
@@ -2905,8 +2922,8 @@ msgstr "Cadw fel VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Agor"
@@ -2963,13 +2980,13 @@ msgstr "_Torri"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copïo"
@@ -3729,12 +3746,12 @@ msgstr "Mewnforiwr VCard Evolution"
 msgid "Print envelope"
 msgstr "Argraffu amlen"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Argraffu cysylltiadau"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Argraffu cyswllt"
 
@@ -3892,7 +3909,7 @@ msgstr "Graddliwio"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4127,17 +4144,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r apwyntiad hwn?"
 
 #: ../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 "Ydych chi'n siŵr eich bod am ddileu'r cofnod dyddlyfr hwn?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r cyfarfod?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Ydych chi'n siŵr eich bod am ddileu'r dasg?"
 
@@ -4456,7 +4470,7 @@ msgid "Calendar and Tasks"
 msgstr "Calendr a Thasgau"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendrau"
 
@@ -4560,8 +4574,8 @@ msgstr "Apwyntiadau"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4577,7 +4591,7 @@ msgstr "Amser _hepian:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4594,31 +4608,32 @@ msgstr "_Hepian"
 msgid "location of appointment"
 msgstr "lleoliad yr apwyntiad"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Dim crynodeb ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Dim disgrifiad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Dim gwybodaeth lleoliad ar gael."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Mae gennych %d larwm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4630,7 +4645,7 @@ msgstr ""
 "hwn ei gyflunio i anfon e-bost.  Bydd Evolution yn dangos\n"
 "blwch deialog atgoffa arferol yn lle hynny."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4647,7 +4662,7 @@ msgstr ""
 "\n"
 "Ydych chi'n siŵr eich bod am redeg y rhaglen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Peidiwch â gofyn ynghylch y rhaglen hon eto."
 
@@ -4752,95 +4767,91 @@ msgid "Default reminder value"
 msgstr "Gwerth atgoffad rhagosodedig"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Transparency"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy server URLs"
 msgstr "LAU gweinyddion statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "LAU templed statws rhydd/prysur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Cuddio tasgau sydd wedi gorffen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Cuddio unedau tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Cuddio gwerth tasg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Awr diwedd dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Awr cychwyn dydd gwaith, ar ffurf cloc bedair awr ar hugain, 0 i 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Yr ysbeidiau a ddangosir yng ngolygon Dydd ac Wythnos Waith, mewn munudau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Amser larwm diweddaraf"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Rhestr LAU gweinyddion i gyhoeddi gwybodaeth statws rhydd/prysur."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Llinell Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Lliw Llinell Marcus Bains - Golwg Dydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Lliw Llinell Marcus Bains - Bar amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Munud diwedd dydd gwaith, 0 i 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Munud cychwyn dydd gwaith, 0 i 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Lleoliad cwarel llorweddol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Lleoliad cwarel fertigol golwg Mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Nifer o unedau i'w pennu ar gyfer nodyn atgoffa rhagosodedig."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Nifer o unedau i benderfynu pryd i guddio tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Lliw tasgau hwyr"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4848,7 +4859,7 @@ msgstr ""
 "Lleoliad y cwarel llorweddol, rhwng y calendr llywio dyddiadau a'r rhestr "
 "dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4856,7 +4867,7 @@ msgstr ""
 "Lleoliad y cwarel llorweddol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
 "rhestr dasgau pan yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4864,7 +4875,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng yr olwg tasgau a'r cwarel rhagolwg tasgau, "
 "mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4872,7 +4883,7 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng yr olwg a'r calendr llywio dyddiadau a'r "
 "rhestr dasgau pan yn yr olwg mis, mewn picseli"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4880,66 +4891,66 @@ msgstr ""
 "Lleoliad y cwarel fertigol, rhwng y calendr llywio dyddiadau a'r rhestr "
 "dasgau pan ddim yn yr olwg mis, mewn picseli."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Rhaglenni y caniateir eu rhedeg gan larymau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Dangos y maes RSVP yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Dangos y maes Rôl yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Dangos amserau gorffen apwyntiad yn y golygon wythnos a mis"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Dangos y maes categorïau yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Gweld larymau dangos yn y gilfach hysbysu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Dangos y maes statws yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Dangos y cwarel \"Rhagolwg\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Dangos y cwarel \"Rhagolwg\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr ""
 "Dangos y maes cylchfa amser yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Dangos y maes math yn y golygydd digwyddiadau/tasgau/cyfarfodydd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Dangos rhifau wythnos yn y llywiwr dyddiadau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Lliw tasgau i fod i ddod i ben heddiw"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Lleoliad fertigol cwarel Tasgau"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4949,7 +4960,7 @@ msgstr ""
 "Rhoddir rhan defnyddiwr y cyfeiriad e-bost yn lle %u, a'r enw parth yn lle %"
 "d."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4958,61 +4969,55 @@ msgstr ""
 "calendr, ar ffurf lleoliad cylchfa amser Olsen heb ei gyfieithu, fel "
 "\"Europe/London\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Rhaniadau amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Yr amser ganodd y larwm diwethaf, ar ffurf time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Ffurf cloc bedair awr ar hugain"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unedau nodyn atgoffa rhagosodedig, \"munudau\", \"oriau\" neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unedau er mwyn penderfynu p'un ai i guddio tasgau, \"munudau\", \"oriau\" "
 "neu \"dyddiau\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Dechrau wythnos"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Y dydd mae'r wythnos yn cychwyn, o Ddydd Sul (0) i Ddydd Sadwrn (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "P'un ai i ddefnyddio'r hambwrdd hysbysu ar gyfer larymau gweledol."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "P'un ai i ofyn am gadarnhad cyn dileu apwyntiad neu dasg."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "P'un ai i ofyn am gadarnhad cyn gwaredu apwyntiadau a thasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5020,80 +5025,80 @@ msgstr ""
 "P'un ai i gywasgu penwythnosau yn yr olwg mis, fydd yn rhoi Dydd Sadwrn a "
 "Dydd Sul yng ngofod un diwrnod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "P'un ai i ddangos amser gorffen digwyddiadau yng ngolygon wythnos a mis."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "P'un ai i dynnu Llinell Marcus Bains (llinell yr amser presennol) ar y "
 "calendr."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "A ddylid cuddio tasgau gorffenedig yn y golwg tasgau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "P'un ai i osod nodyn atgoffa rhagosodedig ar gyfer apwyntiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes RSVP yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "P'un ai i ddangos maes categorïau yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes rôl yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes statws yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "P'un ai i ddangos amserau ar ffurf bedair awr ar hugain yn lle defnyddio am/"
 "pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "P'un ai i ddangos maes cylchfa amser yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "P'un ai i ddangos maes math yn y golygydd digwyddiad/tasg/cyfarfod."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "P'un ai i ddangos rhifau wythnos yn y llywiwr dyddiadau."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Dyddiau gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Awr gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Munud gorffen dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Awr dechrau dydd gwaith"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Munud cychwyn dydd gwaith"
 
@@ -5194,59 +5199,59 @@ msgstr "Methwyd uwchraddio calendrau."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Methu agor y calendr '%s' er mwyn creu digwyddiadau a chyfarfodydd"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Does dim calendr ar gael er mwyn creu digwyddiadau a chyfarfodydd"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Dewisydd Ffynhonnell Galendr"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Apwyntiad"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Creu apwyntiad newydd"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Cyfarfod Newydd"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Cyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Creu cais newydd am gyfarfod"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Apwyntiad drwy'r diwrnod newydd"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Apwyntiad Drwy'r Diwrnod"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Creu apwyntiad gydol-y-dydd newydd"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Calendr newydd"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Calendr"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Creu calendr newydd"
 
@@ -5407,11 +5412,11 @@ msgstr "Larymau"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
 msgstr "Awgrymu dangos atodiadau'n awtomatig"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
@@ -5419,7 +5424,7 @@ msgid "Attach file(s)"
 msgstr "Atodi ffeil(iau)"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Priodweddau atodiad"
@@ -5428,19 +5433,19 @@ msgstr "Priodweddau atodiad"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Disgrifiad:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Enw'r ffeil:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Math MIME:"
@@ -5864,7 +5869,7 @@ msgstr[2] "%d neges wedi'u hatodi"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Symud"
 
@@ -5920,7 +5925,7 @@ msgid "_Add attachment..."
 msgstr "Ychwanegu _atodiad..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1468
-#: ../mail/em-format-html-display.c:2068
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Dangos Atodiadau"
 
@@ -5970,7 +5975,7 @@ msgstr "Dim crynodeb"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
-#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:399
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "atodiad"
 
@@ -5998,10 +6003,6 @@ msgstr "Methwyd agor y cyrchfan"
 msgid "Destination is read only"
 msgstr "Cyrchfan darllen-yn-unig"
 
-#: ../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 "Methwyd dileu'r digwyddiad oherwydd gwall corba"
@@ -6615,7 +6616,7 @@ msgstr "<span weight=\"bold\">Statws</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Cyflawnwyd"
@@ -6643,7 +6644,7 @@ msgstr "Isel"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:387
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
 #: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Arferol"
@@ -6844,7 +6845,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s am fath sbardun anhysbys"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliciwch i agor %s"
@@ -6927,7 +6928,7 @@ msgstr "Yn Rhydd"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Prysur"
 
@@ -6941,17 +6942,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ie"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nage"
@@ -6962,21 +6963,21 @@ msgstr "Nage"
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Ail-ddigwydd"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Wedi Neilltuo"
 
@@ -6984,7 +6985,7 @@ msgstr "Wedi Neilltuo"
 msgid "Save As..."
 msgstr "Cadw Fel..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1916
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
 
@@ -6993,9 +6994,9 @@ msgstr "Dewiswch blygell i gadw'r atodiadau sydd wedi'u dewis..."
 msgid "untitled_image.%s"
 msgstr "delwedd_dideitl.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Cadw Fel..."
 
@@ -7062,25 +7063,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Dileu gwrthrych dewisedig"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Diweddaru gwrthrychau"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Cadw fel..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Agor Tudalen _Gwe"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7088,44 +7089,44 @@ msgstr "Agor Tudalen _Gwe"
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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 "_Torri"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Gludo"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Neilltuo Tasg"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Gyrru ymlaen fel iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcio yn gyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcio'r tasgau a ddewiswyd yn rai cyflawn"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Dileu'r tasgau a ddewiswyd"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliciwch i ychwanegu tasg"
@@ -7160,105 +7161,105 @@ msgstr "Dyddiad cychwyn"
 msgid "Task sort"
 msgstr "Trefnu Tasg"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Symud eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copïo eitemau"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "_Apwyntiad Newydd..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "_Digwyddiad Newydd Drwy'r Dydd"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "_Cyfarfod Newydd"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "_Tasg Newydd"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Golwg _Cyfredol"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Dewis _Heddiw"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Dewis Dyddiad..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Copïo i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Symud i Galendr..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Dirprwyo Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Trefnu Cyfarfod..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Gyrru Ymlaen fel iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Ateb"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Ateb i _Bawb"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Galluogi _symud y digwyddiad hwn"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Dileu _digwyddiad hyn"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Dileu _Pob digwyddiadau"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Trefnydd: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2183
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Trefnydd: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2199 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Lleoliad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2230
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Amser: %s %s"
@@ -7288,7 +7289,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:586
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Rhaniadau amser %02i munud"
@@ -7299,19 +7300,19 @@ msgstr "Rhaniadau amser %02i munud"
 #. 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:825 ../calendar/gui/e-day-view.c:1500
-#: ../calendar/gui/e-week-view-main-item.c:324 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7428,7 +7429,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7441,7 +7442,7 @@ msgstr "Wedi derbyn yn betrus"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7769,63 +7770,63 @@ msgid "Resources"
 msgstr "Adnoddau"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Unigol"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grŵp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Adnodd"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Ystafell"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Cadeirydd"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Cyfranogwyr Angenrheidiol"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Cyfranwyr Dewisol"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ddim yn Cyfrannu"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Angen Gweithred"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "I'w gadarnhau"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7836,14 +7837,14 @@ msgstr "Dirprwywyd"
 msgid "Attendee                          "
 msgstr "Mynychwr                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Mewn Proses"
 
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B, %d, %Y"
 
@@ -7851,78 +7852,78 @@ msgstr "%A, %B, %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Allan o'r Swyddfa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Dim Gwybodaeth"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Mynychwyr..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Opsiynau"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Dangos oriau gweithio yn _unig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Dangos wedi _crebachu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Diweddaru rhydd/prysur"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Awtoddewis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Pob person ac adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Pob _person ac un adnodd"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pobl _angenrheidiol"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pob person sydd _angen ac un atodiad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Amser _dechrau:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Amser diwedd:"
 
@@ -7990,7 +7991,7 @@ msgstr "Dewiswch Gylchfa Amser"
 #. 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:341 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -10172,7 +10173,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Bar Atodiadau"
 
@@ -10193,15 +10194,15 @@ msgstr "Methu atodi ffeil %s: %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Methu atodi'r ffeil %s: nid yw'n ffeil arferol"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Cyrchfan postio "
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Dewiswch blygellau i bostio'r neges ati."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 
@@ -10212,45 +10213,45 @@ msgstr "Cliciwch yma ar gyfer y llyfr cyfeiriadau"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Ateb at:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Oddi wrth:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "P_wnc:"
 
-#: ../composer/e-msg-composer-hdrs.c:645
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_At:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Rhowch dderbynwyr y neges"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Copi i:"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Rhowch y cyfeiriadau fydd yn derbyn copi carbon o'r neges"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "Copi _dall i:"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10261,15 +10262,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Postio at:"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Cliciwch yma i ddewis plygellau i bostio atynt"
 
-#: ../composer/e-msg-composer-hdrs.c:672
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Postio At:"
 
@@ -10493,7 +10494,7 @@ msgstr "C_adw'r Neges"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10990,7 +10991,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Rheolaeth dewisiadau Ebost Evolution"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11562,13 +11563,13 @@ msgstr "_Taflu'r Sbwriel"
 msgid "Copying `%s' to `%s'"
 msgstr "Copïo `%s' i `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Dewis plygell"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opïo"
 
@@ -11590,170 +11591,170 @@ msgstr "Creu plygell"
 msgid "Specify where to create the folder:"
 msgstr "Penodwch ble i greu'r blygell:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Ateb i'r Danfonwr"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Golygu fel Neges Newydd..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Dad-ddileu"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Symud i Blygell..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copïo i Blygell..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Marcio Wedi Darllen"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcio _heb ei ddarllen"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcio'n _Bwysig"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Marcio _Ddim yn Bwysig"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcio'n _Sothach"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcio _Ddim yn Sothach"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcio ar gyfer _Dilyniant..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Label"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Dim"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Gosod _Baner 'Wedi Cwblhau'"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Clirio Baner"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Creu _Rheol o'r Neges"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Plygell Chwilio ar y _Pwnc"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Plygell Chwilio ar y _Danfonwr"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Plygell Chwilio ar y _Derbynwyr"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Plygell Chwilio ar y _Rhestr E-bostio"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Hidlo ar _Bwnc"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Hidlo ar _Ddanfonwr"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Hidlo ar _Dderbynyddion"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Hidlydd ar y _Rhestr E-bostio"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Rhagosodiad"
 
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Argraffu'r Neges"
 
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Methu nôl y neges"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Copïo Lleoliad y Cyswllt"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Creu _Plygell Chwilio"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_O'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_I'r cyfeiriad hwn"
 
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliciwch i e-bostio %s"
 
 # TRWSIO: dylai ddefnyddio ngettext?
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Cydweddiadau: %d"
 
-#: ../mail/em-format-html-display.c:759 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Di-lofnod"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Nid yw'r neges wedi ei llofnodi. Does dim gwarant fod y neges hon yn ddilys."
 
-#: ../mail/em-format-html-display.c:760 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Llofnod dilys"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11761,11 +11762,11 @@ msgstr ""
 "Mae'r neges hon wedi ei llofnodi ac yn ddilys, sy'n golygu ei bod hi'n "
 "ddigon tebyg fod y neges yn un dilys."
 
-#: ../mail/em-format-html-display.c:761 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Llofnod annilys"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11773,11 +11774,11 @@ msgstr ""
 "Methu dilysu llofnod y neges hon: fe all fod wedi ei newid yn ystod ei "
 "thaith."
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Llofnod dilys, methu dilysu'r anfonwr"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11785,11 +11786,11 @@ msgstr ""
 "Mae'r neges wedi ei llofnodi â llofnod dilys, ond methwyd dilysu anfonwr y "
 "neges."
 
-#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Heb amgryptio"
 
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11797,11 +11798,11 @@ msgstr ""
 "Nid yw'r neges hon wedi ei hamgryptio. Gellir darllen ei chynnwys wrth iddi "
 "deithio ar draws y Rhyngrwyd."
 
-#: ../mail/em-format-html-display.c:769 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Wedi amgryptio, yn wan"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11811,11 +11812,11 @@ msgstr ""
 "fyddai hi'n anodd, ond nid yn amhosib, i rywun o'r tu allan weld cynnwys y "
 "neges hon ymhen cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:770 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Wedi amgryptio"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11823,11 +11824,11 @@ msgstr ""
 "Mae'r neges hon wedi ei hamgryptio.  Fe fyddai hi'n anodd i rywun o'r tu "
 "allan weld cynnwys y neges hon."
 
-#: ../mail/em-format-html-display.c:771 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Wedi amgryptio, yn gryf"
 
-#: ../mail/em-format-html-display.c:771
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11837,57 +11838,57 @@ msgstr ""
 "fyddai hi'n anodd iawn i rywun o'r tu allan weld cynnwys y neges hon mewn "
 "cyfnod ymarferol o amser."
 
-#: ../mail/em-format-html-display.c:872 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Gweld Tystysgrif"
 
-#: ../mail/em-format-html-display.c:887
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Ni ellir gweld y dystysgrif"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Wedi cwblhau ar %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1185
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Hwyr:"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "gan %B %d, %Y %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1248
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Gweld yn Fewnol"
 
-#: ../mail/em-format-html-display.c:1249
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Cuddio"
 
-#: ../mail/em-format-html-display.c:1250
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Ffitio i'r Lled"
 
-#: ../mail/em-format-html-display.c:1251
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Dangos y _Maint Gwreiddiol"
 
-#: ../mail/em-format-html-display.c:1670 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Atodiad"
 
-#: ../mail/em-format-html-display.c:1877
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Dewis plygell i gadw pob atodiad..."
 
-#: ../mail/em-format-html-display.c:1924
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Cadw'r rhai wedi dewis..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1991
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
@@ -11895,15 +11896,15 @@ msgstr[0] "%d at_odiad"
 msgstr[1] "%d at_odiad"
 msgstr[2] "%d at_odiad"
 
-#: ../mail/em-format-html-display.c:1998 ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Cadw"
 
-#: ../mail/em-format-html-display.c:2009
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Cadw _Pob Un"
 
-#: ../mail/em-format-html-display.c:2070
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Dim Atodiad"
 
@@ -13888,27 +13889,17 @@ msgstr "Aros..."
 msgid "Checking for new mail"
 msgstr "Chwilio am Ebost Newydd"
 
-#: ../mail/mail-session.c:205
-#, fuzzy, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Rhowch Gyfrinair am %s"
-
-#: ../mail/mail-session.c:207
-#, fuzzy
-msgid "Enter Passphrase"
-msgstr "Rhowch Gyfrinair"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Rhowch Gyfrinair am %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Rhowch Gyfrinair"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Defnyddiwr wedi canslo'r weithred."
 
@@ -15061,19 +15052,19 @@ msgstr "Maint Ffolderi"
 msgid "Exchange Settings"
 msgstr "Gosodiadau Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "LAU _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "D_ilysu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Math Dilysiant"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "_Gwirio am Fathau wedi Cynnal"
 
@@ -15947,7 +15938,7 @@ msgid "_Import"
 msgstr "_Mewnforio"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Ffurf iCalendr (.ics)"
 
@@ -16526,10 +16517,9 @@ msgid "Itip Formatter"
 msgstr "Fformatydd Itip"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; wedi dirprwyo'r cyfarfod. Ydych chi am ychwanegu'r dirprwy "
 "&quot;{1}&quot; ?"
@@ -17043,7 +17033,7 @@ msgid "MIME Type"
 msgstr "Math MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Cadw"
 
@@ -17269,45 +17259,44 @@ msgid "Default window height"
 msgstr "Uchder rhagosodedig ffenest"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Cyflwr rhagosodedig y ffenestr"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Lled rhagosodedig ffenest"
 
-#: ../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 "ID neu ffugenw'r gydran i'w ddangos yn ragosodedig wrth gychwyn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Fersiwn cyfluniad a ddiweddarwyd diwethaf"
 
-#: ../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 ""
 "Rhestr o lwybrau'r plygellau i'w cysoni at ddisg er mwyn eu defnyddio all-"
 "lein"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Gosodiad Argraffydd"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Bar ochr yn weladwy"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Hepgor deialog rhybudd datblygiad"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Dechreuwch ym modd all-lein"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Statusbar is visible"
-msgstr "Bar ochr yn weladwy"
-
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
@@ -17355,13 +17344,12 @@ msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "A fydd Evolution yn cychwyn yn y modd all-lein yn lle'r modd ar-lein."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether the sidebar should be visible."
-msgstr "A ddylai'r bar ochr fod yn weladwy."
+msgid "Whether or not the window should be maximized."
+msgstr "A ddylid mwyhau'r ffenestr ai peidio."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
-#, fuzzy
-msgid "Whether the status bar should be visible."
-msgstr "A ddylai'r bar offer fod yn weladwy."
+msgid "Whether the sidebar should be visible."
+msgstr "A ddylai'r bar ochr fod yn weladwy."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
@@ -17522,21 +17510,21 @@ msgstr "_Gweithio All-lein"
 msgid "Work Offline"
 msgstr "Gweithio All-lein"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Mae Evolution ar-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio all-lein."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Mae Evolution yn y broses o fynd all-lein."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Mae Evolution all-lein ar hyn o bryd. Cliciwch y botwm hwn i weithio ar-lein."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Newid i %s"
@@ -17621,7 +17609,7 @@ msgstr ""
 "fewnforio ffeiliau allanol i mewn i Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17656,7 +17644,7 @@ msgstr ""
 "Gobeithiwn y byddwch yn mwynhau ffrwyth ein llafur caled, ac edrychwn\n"
 "ymlaen yn eiddgar at dderbyn eich cyfraniadau!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17664,40 +17652,35 @@ msgstr ""
 "Diolch\n"
 "Y Tîm Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Peidiwch â dweud wrthyf eto"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Dechrau Evolution gan ymgychwyn y gydran benodol"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Dechreuwch ym modd ar-lein"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Gorfodi pob cydran Evolution i gau i lawr"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gorfodi ail-fudo o Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Anfon allbwn datnamu bob cydran at ffeil."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Analluogi llwytho unrhyw ategyn."
 
-#: ../shell/main.c:515
-#, fuzzy
-msgid "- The Evolution PIM and Email Client"
-msgstr "Evolution, Cleient Ebost a Threfnydd Gwybodaeth Personol"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18461,7 +18444,7 @@ msgid "Select All"
 msgstr "Dewis Popeth"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Dewis _Popeth"
@@ -18688,11 +18671,11 @@ msgstr "Torri'r hyn a ddewiswyd i'r clipfwrdd"
 msgid "Paste from clipboard"
 msgstr "Gludo o'r clipfwrdd"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Gludo'r testun sydd ar y clipfwrdd"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Dewis y holl destun"
 
@@ -18727,31 +18710,30 @@ msgstr "Cliciwch yma i weld yr help sydd ar gael"
 msgid "Close"
 msgstr "Cau"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Mewnosod"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Atodiad..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Cau"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Ffeil"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Cymorth"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Mewnosod"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opsiynau"
@@ -19607,6 +19589,11 @@ msgstr "Cael hysbysiad pan fo'ch neges yn cael ei darllen"
 msgid "HT_ML"
 msgstr "_HTML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Mewnosod"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Agor ffeil"
@@ -20245,10 +20232,6 @@ msgstr "Math o olwg"
 msgid "Type of view:"
 msgstr "Math o olwg:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Awgrymu dangos atodiadau'n awtomatig"
-
 #. 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:416
@@ -20256,7 +20239,7 @@ msgid "MTWTFSS"
 msgstr "LMMIGSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1112
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21371,9 +21354,6 @@ msgstr "Deliwr Naidlen"
 #~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 #~ msgstr "Cafodd eich neges â'r pwnc &quot;{0}&quot; mo'i ddosbarthu."
 
-#~ msgid "_Insert"
-#~ msgstr "_Mewnosod"
-
 #~ msgid "Message _List As"
 #~ msgstr "Rhestr Negeseuon _Fel"
 
diff --git a/po/de.po b/po/de.po
index 101cfa0fd1..b479c50dc6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-10 08:42+0100\n"
-"PO-Revision-Date: 2006-03-10 08:34+0100\n"
-"Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n"
+"POT-Creation-Date: 2006-05-01 18:03+0200\n"
+"PO-Revision-Date: 2006-05-01 18:11+0200\n"
+"Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,32 +66,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "Evolution-Minicard"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Es enthält Alarme."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Es enthält Wiederholungen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Es ist eine Besprechung."
 
-#: ../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 "Kalender-Ereignis: Die Zusammenfassung lautet %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalender-Ereignis: Keine Zusammenfassung verfügbar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Kalenderansicht Ereignis"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Erhält Fokus"
 
@@ -120,14 +120,14 @@ msgstr "Gehe zu Datum"
 msgid "a table to view and select the current time range"
 msgstr "Eine Tabelle zur Ansicht und Auswahl der momentanen Zeitspanne"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Sie enthält %d Ereignis."
 msgstr[1] "Sie enthält %d Ereignisse."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Sie enthält keine Ereignisse."
 
@@ -221,21 +221,21 @@ msgstr "Sprungknopf"
 msgid "Click here, you can find more events."
 msgstr "Klicken Sie hier, um weitere Ereignisse zu sehen."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Monatsansicht: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Wochenansicht: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "Kalenderansicht für einen Monat"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
@@ -559,9 +559,9 @@ msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -833,7 +833,7 @@ msgstr "Als VCard speichern..."
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktquellenauswahl"
 
@@ -842,12 +842,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Der Zugriff auf den LDAP-Server erfolgt anonym"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Geben Sie das Passwort für %s ein (Benutzer %s)"
@@ -2543,15 +2543,15 @@ msgstr "Geändert"
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie ein Bild für diesen Kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2559,7 +2559,7 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
@@ -2587,7 +2587,7 @@ msgstr "Adressbuch aus_wählen"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontaktliste löschen wollen (%s)?"
@@ -2604,7 +2604,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diesen Kontakt löschen wollen (%s)?"
@@ -2716,8 +2716,8 @@ msgstr "_IM-Dienst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Ort:"
 
@@ -3786,7 +3786,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Kopfzeile"
@@ -3891,8 +3891,8 @@ msgstr "Schattierung"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Größe:"
 
@@ -4405,7 +4405,7 @@ msgid "_Save Changes"
 msgstr "Änderungen _speichern"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "Ab_schicken"
 
@@ -4525,9 +4525,9 @@ msgstr "Notizen"
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Aufgaben"
@@ -5147,10 +5147,10 @@ msgstr "Drucken"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5529,7 +5529,7 @@ msgid "Display"
 msgstr "Anzeigen"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Verfügbarkeit"
@@ -5915,7 +5915,7 @@ msgstr "Anla_genleiste anzeigen"
 #: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5988,8 +5988,8 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2654
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "Anlage"
 
@@ -6108,7 +6108,7 @@ msgstr "_Kalender:"
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisator:"
 
@@ -6129,7 +6129,7 @@ msgid "Event with no end date"
 msgstr "Ereignis ohne Enddatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -6147,25 +6147,25 @@ msgstr "Die Endzeit ist falsch"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Dem gewählten Organisator ist kein Konto mehr zugeordnet."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Hinzufügen"
 
@@ -6377,7 +6377,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Notizen in »%s« konnten nicht geöffnet werden."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Gruppe:"
@@ -6638,7 +6638,7 @@ msgstr "<b>Status</b>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -6714,11 +6714,11 @@ msgstr "_Aufgabe"
 msgid "Task Details"
 msgstr "Aufgabendetails"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -6863,7 +6863,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicken Sie hier, um %s zu öffnen"
@@ -6962,15 +6962,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nein"
@@ -6981,8 +6981,8 @@ msgstr "Nein"
 #: ../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:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7444,7 +7444,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7457,7 +7457,7 @@ msgstr "Vorläufig angenommen"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7793,63 +7793,63 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Vorläufig"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7860,14 +7860,14 @@ msgstr "Delegiert"
 msgid "Attendee                          "
 msgstr "Teilnehmer"
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "In Bearbeitung"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%a, %d. %B %Y"
 
@@ -7876,7 +7876,7 @@ msgstr "%a, %d. %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
@@ -10401,7 +10401,7 @@ msgstr ""
 "Grund: »{0}«. Möglicherweise müssen Sie Ihre E-Mail-Einstellungen ändern."
 
 #: ../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 "Grund: »{1}«."
 
@@ -10524,11 +10524,11 @@ msgstr "Nachricht _speichern"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Groupware-Suite"
 
@@ -10701,7 +10701,7 @@ msgstr "Soll sie überschrieben werden?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Die Datei »{0}« existiert bereits."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
@@ -10870,7 +10870,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -11162,14 +11162,14 @@ msgstr "Signatur(en)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11494,7 +11494,7 @@ msgstr "Entwürfe"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Eingang"
 
@@ -11581,7 +11581,7 @@ msgstr "Ordner a_nlegen..."
 msgid "_Rename..."
 msgstr "_Umbenennen..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
@@ -11724,37 +11724,37 @@ msgid "Filter on _Mailing List"
 msgstr "Filter über Ma_ilingliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nachricht konnte nicht abgerufen werden"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Von dieser Adresse"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Zu dieser Adresse"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
@@ -12043,7 +12043,7 @@ msgstr "Newsgroups"
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 ""
 "Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
@@ -12063,11 +12063,11 @@ msgstr "Nicht unterstützter Verschlüsselungstyp für multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Nicht unterstütztes Signaturformat"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Fehler beim Verifizieren der Signatur"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
 
@@ -12199,20 +12199,20 @@ msgstr "Diese Meldung nicht mehr anzeigen."
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "Nachricht"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Nachricht speichern..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -14018,14 +14018,14 @@ 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 ""
 "Es existiert bereits ein nicht leerer Ordner unter »{1}«.\n"
 "\n"
 "Sie können diesen Ordner ignorieren, überschreiben, seinen Inhalt anhängen "
-"oder abbrechen.\n"
+"oder abbrechen."
 
-#: ../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}?"
@@ -14033,7 +14033,7 @@ msgstr ""
 "Eine Lesebestätigung wurde für »{1}« angefordert. Soll die Bestätigung an "
 "{0} geschickt werden?"
 
-#: ../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."
@@ -14041,7 +14041,7 @@ msgstr ""
 "Es existiert bereits eine Signatur namens »{0}«. Bitte verwenden Sie einen "
 "anderen Namen."
 
-#: ../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."
@@ -14049,28 +14049,28 @@ msgstr ""
 "Das Hinzufügen einer aussagekräftigen Betreffzeile zu Ihren Nachrichten "
 "verschafft den Empfängern eine Vorstellung, wovon Ihre E-Mail handelt."
 
-#: ../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 ""
 "Sind Sie sicher, dass Sie dieses Konto und alle seine Vertretungen löschen "
 "wollen?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
 
-#: ../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 ""
 "Sind Sie sicher, dass Sie dieses Konto deaktivieren und alle seine "
 "Vertretungen löschen wollen?"
 
-#: ../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 "Sind Sie sicher, dass Sie {0} Nachrichten auf einmal öffnen wollen?"
 
-#: ../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?"
@@ -14078,7 +14078,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie endgültig alle gelöschten Nachrichten aus allen "
 "Ordnern entfernen wollen?"
 
-#: ../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;?"
@@ -14086,83 +14086,83 @@ msgstr ""
 "Sind Sie sicher, dass Sie alle gelöschten Nachrichten endgültig aus dem "
 "Ordner »{0}« entfernen wollen?"
 
-#: ../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 "Sind Sie sicher, dass Sie eine HTML-Nachricht verschicken wollen?"
 
-#: ../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 ""
 "Sind Sie sicher, dass Sie eine Nachricht verschicken wollen, die nur an "
 "Blindkopie-Empfänger gerichtet ist?"
 
-#: ../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 ""
 "Sind Sie sicher, dass Sie eine Nachricht ohne Betreff verschicken wollen?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Grund: »{0}«."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Grund: »{2}«."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Leere Signatur"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Suchordner »{0}« konnte nicht hinzugefügt werden."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« kopiert werden."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Ordner »{0}« konnte nicht angelegt werden."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Temporäres Speicherverzeichnis konnte nicht angelegt werden."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Das Speicherverzeichnis konnte nicht angelegt werden. Grund: »{1}«."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Ordner »{0}« konnte nicht gelöscht werden."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Systemordner »{0}« konnte nicht gelöscht werden."
 
-#: ../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 ""
 "Suchordner »{0}« konnte nicht bearbeitet werden, da er nicht vorhanden ist."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ordner »{0}« konnte nicht nach »{1}« verschoben werden."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Quelle »{1}« konnte nicht geöffnet werden"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Quelle »{2}« konnte nicht geöffnet werden."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Ziel »{2}« konnte nicht geöffnet werden."
 
-#: ../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 "
@@ -14172,31 +14172,31 @@ msgstr ""
 "werden. Die Nutzung dieses Providers ist nicht möglich, solange Sie dessen "
 "Lizenz nicht akzeptiert haben."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "»{0}« konnte nicht in »{1}« umbenannt werden."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Systemordner »{0}« konnte nicht umbenannt oder verschoben werden."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Änderungen am Konto konnten nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Speichern in das Verzeichnis »{0}« fehlgeschlagen."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Speichern in die Datei »{0}« fehlgeschlagen."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signaturskript »{0}« konnte nicht festgelegt werden."
 
-#: ../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."
@@ -14205,73 +14205,73 @@ msgstr ""
 "Erinnerung: Bei Passwörtern wird zwischen Groß- und Kleinschreibung "
 "unterschieden. Möglicherweise ist Ihre Dauerumschalttaste aktiv."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Signaturdatei konnte nicht gespeichert werden."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "»{0}« löschen?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Konto löschen?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Änderungen verwerfen?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Nicht löschen"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Nicht deaktivieren"
 
-#: ../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 "Soll diese Aktion in den Unterordnern ausgeführt werden?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Sollen alle Nachrichten als gelesen markiert werden?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Sollen die vorgenommenen Änderungen gespeichert werden?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Passwort eingeben."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Fehler beim Laden der Filterdefinitionen."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Fehler beim Ausführen eines Vorgangs."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Fehler bei {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Die Datei existiert, das Überschreiben ist jedoch nicht möglich."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Die Datei existiert, ist jedoch keine regülare Datei"
 
-#: ../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 ""
 "Falls Sie fortfahren, können Sie diese Nachrichten nicht mehr "
 "wiederherstellen."
 
-#: ../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."
@@ -14279,12 +14279,12 @@ msgstr ""
 "Falls Sie einen Ordner löschen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht."
 
-#: ../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."
@@ -14292,12 +14292,12 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Falls Sie fortfahren, werden die Konteninformationen dauerhaft gelöscht."
 
-#: ../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."
@@ -14305,19 +14305,19 @@ msgstr ""
 "Falls Sie Evolution beenden, werden diese Nachrichten nicht verschickt, "
 "solange Evolution nicht neu gestartet wurde."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Legitimation ungültig"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../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 "
@@ -14330,40 +14330,40 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Alle Nachrichten als gelesen markieren"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Alle Nachrichten im gewählten Ordner als gelesen markieren"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Keine Quellen gewählt."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr ""
 "Zu viele Nachrichten auf einmal zu öffnen, könnte eine längere Zeit in "
 "Anspruch nehmen."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr ""
 "Bitte überprüfen Sie ihre Kontoeinstellungen und versuchen Sie es erneut."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Aktivieren Sie bitte das Konto oder verwenden Sie ein anderes Konto zum "
 "Senden."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14372,7 +14372,7 @@ msgstr ""
 "E-Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld "
 "anklicken."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14384,49 +14384,49 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Geben Sie bitte einen eindeutigen Namen für diese Signatur ein."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Abfrage des Servers"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Abfrage des Servers nach einer Liste der unterstützten "
 "Legitimationsmechanismen."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Bestätigung senden"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14434,7 +14434,7 @@ msgstr ""
 "Ximian Evolution benötigt Systemordner, um korrekt zu funktionieren und "
 "können weder umbenannt, noch verschoben oder gelöscht werden."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14452,7 +14452,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14466,7 +14466,7 @@ msgstr ""
 "    »{1}«\n"
 "und wurde(n) aktualisiert."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14480,24 +14480,11 @@ msgstr ""
 "    »{1}«\n"
 "und wurde(n) aktualisiert."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Diese Nachricht wurde mit Hilfe der externen Anwendung »sendmail« "
-"verschickt. Sendmail lieferte folgenden Fehler: Status 67: E-Mail nicht "
-"verschickt.\n"
-"Die Nachricht befindet sich im Ausgangsordner. Überprüfen Sie die Nachricht "
-"auf Fehler und verschicken Sie sie erneut."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausführbar sein."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14505,7 +14492,7 @@ msgstr ""
 "Möglicherweise wurde dieser Ordner implizit hinzugefügt. Falls erforderlich, "
 "können Sie zum Editor für Suchordner gehen, um ihn explizit hinzuzufügen."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14513,14 +14500,14 @@ msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewählte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da Sie keine Empfänger "
 "angegeben haben"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14528,11 +14515,11 @@ msgstr ""
 "Dieser Server unterstützt diese Art der Legitimation nicht. Möglicherweise "
 "unterstützt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Diese Signatur wurde geändert, aber nicht gespeichert"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14540,11 +14527,11 @@ msgstr ""
 "Dies wird alle Nachrichten im gewählten Ordner und seinen Unterordnern als "
 "gelesen markieren."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14552,42 +14539,42 @@ msgstr ""
 "Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch "
 "beenden?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit dem selben Namen anlegen."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Sie müssen einen Namen für diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14597,27 +14584,23 @@ msgstr ""
 "Dies geschieht entweder durch individuelle Auswahl der Ordner und/oder durch "
 "das Wählen aller lokalen bzw. aller entfernten Ordner oder beider."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Das Anmelden am Server »{0}« als »{0}« ist gescheitert."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Ihre Nachricht mit dem Betreff »{0}« wurde nicht zugestellt."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "An_hängen"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Säubern"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
@@ -14688,7 +14671,7 @@ msgstr "%b %d %Y"
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
@@ -15157,8 +15140,8 @@ msgstr "Legitimationsart"
 msgid "Ch_eck for Supported Types"
 msgstr "_Prüfen, welche Arten unterstützt werden"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15341,14 +15324,14 @@ msgstr "Exchange-Ordnerbaum"
 msgid "Unsubscribe Folder..."
 msgstr "Ordner abbestellen..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Den Ordner »%s« wirklich abbestellen?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Abbestellen von »%s«"
@@ -15802,7 +15785,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Ordner abbestellen"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Checkliste"
 
@@ -16628,7 +16611,7 @@ msgstr "Itip-Formatierung"
 #: ../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 ""
 "»{0}« hat die Besprechung delegiert. Möchten Sie den Delegaten »{1}« "
 "hinzufügen?"
@@ -17382,43 +17365,47 @@ msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Voreingestellter Fensterzustand"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
-#: ../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 ""
 "Kennung oder Alias der Komponente, die per Vorgabe beim Start angezeigt "
 "werden soll."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../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 ""
 "Liste der Pfade für Ordner, die für eine Offline-Benutzung auf der Platte "
 "synchronisiert werden sollen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Druckereinstellungen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17426,19 +17413,19 @@ msgstr ""
 "Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
 "Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Die Vorgabehöhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Die Vorgabebreite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die Vorgabebreite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17446,7 +17433,7 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17456,37 +17443,41 @@ msgstr ""
 "»both« und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der "
 "GNOME-Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Soll Evolution im Offline- statt im Online-Modus gestartet werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Soll das Fenster maximiert angezeigt werden?"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Soll der Warndialog in Evolution-Entwicklerversionen nicht angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
@@ -17609,45 +17600,45 @@ msgstr "Bug-Buddy konnte nicht gestartet werden."
 #. The translator-credits string is for translators to list
 #. * per language credits for translation, displayed in the
 #. * about box
-#: ../shell/e-shell-window-commands.c:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Kai Lahmann <kl@linuxfaqs.de>\n"
 "Matthias Warkus <mawa@iname.com>\n"
 "Christian Neumair <chris@gnome-de.org>\n"
 "Manuel Borchers <webmaster@matronix.de>\n"
-"Hendrik Richter <hendi@gnome-de.org>\n"
+"Hendrik Richter <hendrikr@gnome.org>\n"
 "Frank Arnold <frank@scirocco-5v-turbo.de>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um offline "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution geht gerade offline."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um online "
 "zu arbeiten."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Zu %s wechseln"
@@ -17734,7 +17725,7 @@ msgstr ""
 "Dateien in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17773,7 +17764,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unserer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17781,35 +17772,35 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Remigrierung von Evolution 1.4 erzwingen"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20304,7 +20295,7 @@ msgid "_Edit..."
 msgstr "_Bearbeiten..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20752,12 +20743,12 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "_Jetzt suchen"
 
-#: ../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 "Cursor-Zeile"
 
-#: ../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 "Cursor-Spalte"
@@ -21088,14 +21079,14 @@ msgstr "Diese Felder der Reihe nach an_zeigen:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Ziehen und Ablegen-Code"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Alle Kopfzeilen"
 
@@ -21261,17 +21252,17 @@ msgstr "Spalten formatieren..."
 msgid "Customize Current View..."
 msgstr "Aktuelle Ansicht anpassen..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Schriftsatz"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sortierinfos"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21452,6 +21443,21 @@ msgstr "EM-Kontext"
 msgid "Handle Popup"
 msgstr "Handle-Popup"
 
+#~ 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 ""
+#~ "Diese Nachricht wurde mit Hilfe der externen Anwendung »sendmail« "
+#~ "verschickt. Sendmail lieferte folgenden Fehler: Status 67: E-Mail nicht "
+#~ "verschickt.\n"
+#~ "Die Nachricht befindet sich im Ausgangsordner. Überprüfen Sie die "
+#~ "Nachricht auf Fehler und verschicken Sie sie erneut."
+
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Ihre Nachricht mit dem Betreff »{0}« wurde nicht zugestellt."
+
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld Sekunden)"
 
diff --git a/po/dz.po b/po/dz.po
index 8090e3fb8e..152ba3afcf 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,13 +1,13 @@
 # Dzongkha translation of evolution
-# Copyright @ 2006 Free Software Foundation. Inc.
+# Copyright @ 2006 Free Software Foundation, Inc.
 # Mindu Dorji
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.dz\n"
+"Project-Id-Version: evolution 2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-03 21:52+0200\n"
-"PO-Revision-Date: 2006-05-08 15:48+0530\n"
+"POT-Creation-Date: 2006-05-24 04:40+0200\n"
+"PO-Revision-Date: 2006-05-24 14:30+0530\n"
 "Last-Translator: Mindu Dorji\n"
 "Language-Team: DZONGKHA <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ།"
 
@@ -34,12 +34,12 @@ msgstr "འབྲེལ་ས་གསརཔ།"
 msgid "New Contact List"
 msgstr "འབྲེལ་ས་གསར་པའི་ཐོ་ཡིག"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་སྣོད་འཛིན་%sལུ་ ཤོག་བྱང་ %d འདུག"
-msgstr[1] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་%sལུ་ ཤོག་བྱང་ %d འདུག"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་ལུ་ ཤོག་བྱང་ %d འདུག"
+msgstr[1] "ད་ལྟོའི་ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་ལུ་ ཤོག་བྱང་ %d འདུག"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -58,32 +58,32 @@ msgstr "འབྲེལ་ས:"
 msgid "evolution minicard"
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ ཤོག་བྱང་ཆུང་བ།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "འདི་ལུ་འཇིགས་བརྡ་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "འདི་ལུ་སླར་འབྱུང་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "འདི་འཛོམས་འདུ་ཅིག་ཨིན་པས།"
 
-#: ../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 "ཟླ་ཐོའི་བྱུང་ལས་: བཅུད་དོན་%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 "ཟླ་ཐོའི་བྱུང་ལས་: འདི་ལུ་བཅུད་དོན་མིན་འདུག"
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "ཟླ་ཐོའི་མཐོང་སྣང་བྱུང་ལས།"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ཆེད་དམིགས་བཟུང་།"
 
@@ -156,9 +156,9 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:801
-#: ../calendar/gui/e-day-view.c:1517
-#: ../calendar/gui/e-week-view-main-item.c:333
+#: ../calendar/gui/e-day-view-top-item.c:711
+#: ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -189,9 +189,9 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:805
-#: ../calendar/gui/e-day-view.c:1533
-#: ../calendar/gui/e-week-view-main-item.c:347
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -351,7 +351,7 @@ 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 "ད་ལྟོ་ཁྱོད་ཀྱིས་ཇི་ནོམ་ནང་ལས་ སྡེ་རིམ་རིམ་ལུགས་ཁ་བྱང་ཀི་དེབ་རྐྱངམ་གཅིག་ལུ་ འཛུལ་སྤྱོད་འབད་ཚུགས། ཁྱོད་རའི་སྡེ་རིམ་གྱི་འཕྲལ་འཕྲལ་འབྱུང་མི་འབྲེལ་ས་དང་ སྡེ་རིམ་གྱི་རང་དོན་འབྲལ་སའི་སྣོད་འཛིན་ཚུ་འཐོབ་ནིའི་དོན་ལུ་ ཐེངས་གཅིག་སྡེ་རིམ་ཡིག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་གཞན་ཅིག་ ལག་ལེན་འཐབ་གནང་།"
+msgstr "ད་ལྟོ་ཁྱོད་ཀྱིས་ ཨི་བོ་ལུ་ཤཱན་ནང་ལས་ སྡེ་རིམ་རིམ་ལུགས་ཁ་བྱང་ཀི་དེབ་རྐྱངམ་གཅིག་ལུ་ འཛུལ་སྤྱོད་འབད་ཚུགས། ཁྱོད་རའི་སྡེ་རིམ་གྱི་འབྱུང་ཐེངས་འབྲེལ་ས་དང་ སྡེ་རིམ་གྱི་རང་དོན་འབྲེལ་སའི་སྣོད་འཛིན་ཚུ་ལེན་ནིའི་དོན་ལུ་ ཁྱོད་ཀྱིས་ཐེངས་གཅིག་ སྡེ་རིམ་ཡིག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི་གཞན་ཅིག་ ལག་ལེན་འཐབ་གནང་།"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -502,7 +502,7 @@ msgstr "ནཱ་ལུ་ རང་བཞིན་མཇུག་སྡུད�
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
@@ -573,7 +573,7 @@ msgstr "གློག་རིག་འདི་གུ།"
 #: ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1054
 #: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "རང་དོན།"
@@ -615,7 +615,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ་ཅིག་ ག�
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་གཞི་སྒྲིག་གམ་ སྣོད་འཛིན་ཚུ་ ཡར་སྐྱེད་འབད་མ་ཚུགས།"
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་སྒྲིག་སྟངས་ ཡང་ན་ སྣོད་འཛིན་ཚུ་ ཡར་སྐྱེད་འབད་མ་ཚུགས།"
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
@@ -625,7 +625,7 @@ msgstr "གཞི་རྟེན།"
 #: ../calendar/gui/dialogs/calendar-setup.c:192
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
-msgstr "དབྱེ་བ་: (_T)"
+msgstr "དབྱེ་བ: (_T)"
 
 #: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
@@ -634,9 +634,9 @@ msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱ�
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222
 #: ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
@@ -680,13 +680,13 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དང
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "གཞིས་སྤོ་དོ་..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s':གཞིས་སྤོ་དོ།"
@@ -757,41 +757,43 @@ msgstr "སྣོད་འཛིན་གྱི་མིང་ཚུ་ནང་
 
 #: ../addressbook/gui/component/addressbook-view.c:445
 msgid "A Folder with this name already exists"
-msgstr "མིང་འདི་ཡོད་མི་ སྣོད་འཛིན་ཅིག་ཧེ་མ་ལས་རང་འདུག"
+msgstr "མིང་འདི་འབད་མི་ སྣོད་འཛིན་ཅིག་ ཧེ་མ་ལས་རང་འདུག"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "ཁ་བྱང་ཀི་དེབ་གསརཔ།(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617
 #: ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/memos-component.c:452
 #: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1096
+#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091
 #: ../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 "བཏོན་གཏང་། (_D)"
+msgstr "བཏོན་བཏང་། (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
-msgstr "ཝི་ཤོག་བྱང་སྦེ་སྲུངས་..."
+msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་སྲུངས་..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/memos-component.c:453
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "རྒྱུ་དངོས་ཚུ་...(_P)"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "འབྲེལ་སའི་འབྱུང་ཁུངས་སེལ་བྱེད།"
 
@@ -800,7 +802,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "མིང་མེད་ཐོག་ལས་ ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་ འཛུལ་སྤྱོད་འབད་དོ།"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "བདེན་བཤད་འབད་མ་ཚུགས།\n"
 
@@ -843,7 +845,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:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གྱི་གནས་ས།"
 
@@ -931,7 +933,7 @@ msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ གཞི་ར�
 
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
-msgstr "ནང་བཀོད་འབད་: (_g)"
+msgstr "ནང་བཀོད་འབད: (_g)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:776
@@ -943,7 +945,7 @@ msgstr "ནམ་ཡང་།"
 #: ../addressbook/gui/component/ldap-config.glade.h:25
 #: ../mail/em-account-editor.c:304
 msgid "No encryption"
-msgstr "གསང་བཟོ་འབད་ནི་མེད།"
+msgstr "གསང་བཟོ་མིན་འདུག།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
@@ -959,11 +961,11 @@ msgstr "ཨེསི་ཨེསི་ཨེལ་གསང་བཟོ།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
-msgstr "འཚོལ་ཞིབ་ཚགས་མ།"
+msgstr "ཚགས་མའཚོལ་ཞིབ་འབད།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
-msgstr "འཚོལ་ཞིབ་གཞི་རྟེན་: (_b)"
+msgstr "འཚོལ་ཞིབ་གཞི་རྟེན: (_b)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
@@ -975,7 +977,7 @@ 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 "འཚོལ་ཞིབ་ཚགས་མ་དེ་ འཚོལ་ཞིབ་འབད་བའི་སྐབས་འཚོལ་མི་ དངོས་པའི་དབྱེ་བ་དེ་ཨིན།  འདི་ལེགས་བཅོས་མ་འབད་བ་ཅིན་ སྔོན་སྒྲིག་ཐོག་ལས་ དངོས་པོའི་དབྱེ་བ་\"person\" ལུ་ འཚོལ་ཞིབ་འབད་འོང་།"
+msgstr "འཚོལ་ཞིབ་ཚགས་མ་དེ་ འཚོལ་ཞིབ་འབད་བའི་སྐབས་ དངོས་པོའི་དབྱེ་བ་འཚོལ་མི་དེ་ཨིན། འདི་ལེགས་བཅོས་མ་འབད་བ་ཅིན་ སྔོན་སྒྲིག་ཐོག་ལས་ འཚོལ་ཞིབ་དེ་གིས་ དབྱེ་བའི་དངོས་པོ་དབྱེ་རིམ་ \"person\" གུ་ འཚོལ་ཞིབ་འབད་འོང་།"
 
 #: ../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."
@@ -983,11 +985,11 @@ msgstr "གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་�
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
+msgstr "གདམ་ཁ་འདི་ སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་གྱིས་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་ཡོད་པ་ཅིན་ ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་རའི་ཨེལ་ཌི་ཨེ་པི་ སར་བར་ལུ་རྐྱངམ་གཅིག་མཐུད་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."
-msgstr "གདམ་ཁ་འདི་སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ ཡང་ན་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་མི་འབད། འདི་གིས་སྦེ་ ཁྱོད་ཀྱི་མཐུད་ལམ་ལུ་ མཐའ་བཙན་མེདཔ་ལས་ གནོད་ཉེན་ཡོད།"
+msgstr "གདམ་ཁ་འདི་སེལ་འཐུ་འབདཝ་ད་ ཁྱོད་ཀྱི་སར་བར་གྱིས་ ཨེསི་ཨེསི་ཨེལ་ ཡང་ན་ ཊི་ཨེལ་ཨེསི་ལུ་ རྒྱབ་སྐྱོར་མི་འབད། འདི་གིས་འབད་ ཁྱོད་ཀྱི་མཐུད་ལམ་ལུ་ མཐའ་བཙན་མེདཔ་ལས་ གནོད་ཉེན་ཡོད།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1007,7 +1009,7 @@ msgstr "ཊི་ཨེལ་ཨེསི་གསང་བཟོ།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 msgid "The search base is the distinguished name (DN) of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
-msgstr "འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འདི་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ འགོ་བཙུགས་སའི་ ཐོ་བཀོད་ཀྱི་ཁྱད་འཕགས་མིང་(ཌི་ཨེན)དེ་ཨིན། ཁྱོད་ཀྱིས་འདི་སྟོངམ་སྦེ་བཞག་པ་ཅིན་ འཚོལ་ཞིབ་དེ་ སྣོད་ཐོ་རྩ་འབྲེལ་གྱི་རྩ་བ་ལས་ འགོ་བཙུགས་འོང་།"
+msgstr "འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འདི་ ཁྱོད་ཀྱི་འཚོལ་ཞིབ་ འགོ་བཙུགས་སའི་ ཐོ་བཀོད་ཁྱད་འཕགས་ཀྱི་མིང་(ཌི་ཨེན)དེ་ཨིན། ཁྱོད་ཀྱིས་འདི་ སྟོངམ་སྦེ་བཞག་པ་ཅིན་ འཚོལ་ཞིབ་དེ་ སྣོད་ཐོ་རྩ་འབྲེལ་གྱི་ རྩ་བ་ལས་ འགོ་བཙུགས་འོང་།"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
@@ -1047,19 +1049,19 @@ msgstr "ནམ་འབད་ཚུགསཔ་ཅིག"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཁ་སྐོང་རྐྱབས། (_A)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ ཁ་སྐོང་རྐྱབས། (_A)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
-msgstr "ཕབ་ལེན་གྱི་བཅད་ཚད་:(_D)"
+msgstr "ཕབ་ལེན་གྱི་བཅད་ཚད:(_D)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
-msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ཀྱི་གཞི་རྟེན་འཚོལ། (_F)"
+msgstr "སྲིད་པའི་འཚོལ་ཞིབ་ཀྱི་ གཞི་རྟེན་འཚོལ། (_F)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
-msgstr "ནང་བསྐྱོད་ཐབས་ཤེས་: (_L)"
+msgstr "ནང་བསྐྱོད་ཐབས་ཤེས: (_L)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
@@ -1071,17 +1073,17 @@ msgstr "མིང་: (_N)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
-msgstr "འདྲེན་ལམ་: (_P):"
+msgstr "འདྲེན་ལམ། (_P):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
-msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་སྐབས་: (_S)"
+msgstr "འཚོལ་ཞིབ་ཀྱི་འོས་སྐབས: (_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
-msgstr "སར་བར་:(_S)"
+msgstr "སར་བར:(_S)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
@@ -1089,7 +1091,7 @@ msgstr "ངལ་མཚམས་: (_T)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
-msgstr "མཐའ་བཙན་ལྡན་པའི་ མཐུད་ལམ་ལག་ལེན་འཐབ་: (_U)"
+msgstr "མཐའ་བཙན་ལྡན་པའི་ མཐུད་ལམ་ལག་ལེན་འཐབ: (_U)"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
@@ -1117,6 +1119,7 @@ msgstr "སྐར་མ།"
 #: ../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
@@ -1166,7 +1169,7 @@ msgstr "<b>ལཱ་གཡོག་</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "ཨེ་ཨའི་ཨེམ།"
 
@@ -1187,7 +1190,7 @@ msgstr "འབྲེལ་སའི་ཞུན་དགཔ།"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
-msgstr "མིང་ཆ་ཚང་...(_N)"
+msgstr "མིང་ཆ་ཚང་།...(_N)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
@@ -1204,7 +1207,7 @@ msgstr "ཡིག་གཏོང་ཁ་བྱང་།"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Ni_ckname:"
-msgstr "སྐྱོན་མིང་...(_c)"
+msgstr "སྐྱོན་མིང་། (_c)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
@@ -1224,7 +1227,7 @@ msgstr "བརྒྱུད་འཕྲིན།"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "ལཱ་གཡོག"
@@ -1232,11 +1235,11 @@ msgstr "ལཱ་གཡོག"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_Address:"
-msgstr "ཁ་བྱང་...(_A)"
+msgstr "ཁ་བྱང་། (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
-msgstr "ལོ་བསྟར་དུས་དྲན་: (_A)"
+msgstr "ལོ་བསྟར་དུས་དྲན: (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
@@ -1244,12 +1247,12 @@ msgstr "ལས་རོགས་: (_A)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
-msgstr "སྐྱེ་བའི་ཉིནམ་: (_B)"
+msgstr "སྐྱེས་ཚེས: (_B)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
-msgstr "ཟླ་ཐོ་: (_C)"
+msgstr "ཟླ་ཐོ: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: ../ui/evolution-event-editor.xml.h:27
@@ -1268,15 +1271,15 @@ msgstr "ཚོང་སྡེ་: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Country:"
-msgstr "རྒྱལ་ཁབ་: (_C)"
+msgstr "རྒྱལ་ཁབ: (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Department:"
-msgstr "ལས་ཁུངས་: (_D)"
+msgstr "ལས་ཁུངས: (_D)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_File under:"
-msgstr "འོག་ལུ་ཡིག་སྣོད་རྐྱབས་: (_F)"
+msgstr "ཡིག་སྣོད་འོག་ལུ་: (_F)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Free/Busy:"
@@ -1327,7 +1330,7 @@ msgstr "གློག་ཐོག་ཁ་སླབ་: (_V)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Wants to receive HTML mail"
-msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འཐོབ་དགོ་མནོ་ཡི། (_W)"
+msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ ཡིག་འཕྲིན་འཐོབ་དགོ་མནོཝ་ཨིན། (_W)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Web Log:"
@@ -1343,8 +1346,8 @@ msgid "_Zip/Postal Code:"
 msgstr "གནས་ཡུལ་/འགྲེམ་ཨང་: (_Z)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "ཁ་བྱང་།"
 
@@ -2340,7 +2343,7 @@ msgstr "ཛིམ་བབ་ཝི།"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "མིང་།"
@@ -2351,7 +2354,7 @@ msgstr "ཨེ་ཨོ་ཨེལ་ འཕྲལ་མྱུར་ མེ་�
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "ཇེབ་བར།"
 
@@ -2361,7 +2364,7 @@ msgstr "ཡ་ཧུ་ མེ་སེན་ཇར།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ཨའི་སི་ཀིའུ།"
 
@@ -2391,17 +2394,17 @@ msgid "Other"
 msgstr "གཞན།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "ཡ་ཧུ།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "ཨེམ་ཨེསི་ཨེན།"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "སྡེ་རིམ།"
 
@@ -2435,15 +2438,15 @@ msgstr "བསྒྱུར་བཅོས་འབད་ཡོདཔ།"
 msgid "Contact Editor - %s"
 msgstr "འབྲེལ་སའི་ཞུན་དགཔ་ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "འབྲེལ་ས་འདི་གི་དོན་ལུ་ གཟུགས་བརྙན་ཅིག་ སེལ་འཐུ་འབད།"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "གཟུགས་བརྙན་མིན་འདུག"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2451,7 +2454,23 @@ msgstr ""
 "འབྲེལ་སའི་གནད་སྡུད་དེ་ ནུས་མེད་ཨིན་པས།:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s'%s'ལུ་ནུས་མེད་རྩ་སྒྲིག་ཅིག་འདུག"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s'%s'སྟོངམ་ཨིན་པས།"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "ནུས་མེད་འབྲེལ་ས།"
 
@@ -2461,15 +2480,15 @@ msgstr "ཀུ་ཡིག་-ཨེཌི་ལུ་འབྲེལ་བ་�
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
-msgstr "ཆ་ཚང་ཞུན་དག (_E)"
+msgstr "ཆ་ཚང་ཞུན་དག་རྐྱབས། (_E)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
-msgstr "མིང་ཆ་ཚང་། (_F)"
+msgstr "མིང་ཆ་ཚང་།(_F)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
-msgstr "གློག་འཕྲིན།  (_m)"
+msgstr "གློག་འཕྲིན། (_m)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
@@ -2479,7 +2498,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་སེལ་འཐུ་འབད
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "ཁྱོད་ཀྱིས་འབྲེལ་སའི་ཐོ་ཡིག་(%s)\n"
 "ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
@@ -2496,7 +2515,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "ཁྱོད་ཀྱིས་འབྲེལ་ས་(%s)\n"
 "ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
@@ -2511,7 +2530,7 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
-msgstr "ཁ་བྱང་༢ པ་:  (_༢)"
+msgstr "ཁ་བྱང་༢ པ།  (_༢)"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Ci_ty:"
@@ -2580,19 +2599,19 @@ msgstr "རྒན་ཤོས"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
-msgstr "དང་པ་:(_F)"
+msgstr "དང་པ: (_F)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
-msgstr "མཇུག་མ་: (_L)"
+msgstr "མཐའ་མཇུགམ་: (_L)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
-msgstr "བར་མ་: (_M)"
+msgstr "བར་མ: (_M)"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
-msgstr "རྗེས་ཚིག་: (_S)"
+msgstr "རྗེས་ཚིག: (_S)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:2
 msgid "Add IM Account"
@@ -2604,14 +2623,14 @@ msgstr "རྩིས་ཐོའི་མིང་: (_A)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:4
 msgid "_IM Service:"
-msgstr "ཨའི་ཨེམ་ཞབས་ཏོག་: (_I)"
+msgstr "ཨའི་ཨེམ་ཞབས་ཏོག: (_I)"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
-msgstr "གནས་ཁོངས:་ (_L)"
+msgstr "གནས་ཁོངས་: (_L)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "\n"
@@ -2632,7 +2651,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ལས་ གློག�
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
-msgstr "འཐུས་མི་ཚུ།"
+msgstr "ཚོགས་འཐུས་ཚུ།"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "Remove an email address from the List"
@@ -2652,7 +2671,7 @@ msgstr "སེལ་འཐུ་འབད། (_S)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "འོག་གི་ཐོ་ཡིག་ནང་ལུ་ གློག་འཕྲིན་ཁ་བྱང་ཅིག་ ཡིག་དཔར་རྐྱབས་ ཡང་ཅིན་ འབྲེལ་ས་ཅིག་ འདྲུད་དེ་སྐྱེལ། (_T)"
+msgstr "འོག་གི་ཐོ་ཡིག་ནང་ལུ་ གློག་འཕྲིན་ཁ་བྱང་ཅིག་ ཡིག་དཔར་རྐྱབས་ ཡང་ཅིན་ འབྲེལ་ས་ཅིག་ འདྲུད་དེ་སྐྱེལ།(_T)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2669,11 +2688,11 @@ msgstr "ཐོ་ཡིག་གསརཔ་ཨིན།"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
-msgstr "འཐུས་མི་ཚུ། (_M)"
+msgstr "ཚོགས་འཐུས་ཚུ། (_M)"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
-msgstr "འབྲེལ་སའི་ཐོ་ཡིག་འཐུས་མི།"
+msgstr "འབྲེལ་སའི་ཐོ་ཡིག་ཚོགས་འཐུས།"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2795,8 +2814,8 @@ msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུ�
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595
 #: ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
@@ -2812,7 +2831,7 @@ msgstr "འབྲེལ་སའི་ཐོ་ཡིག་གསརཔ་…(_L
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
-msgstr "ཝི་ཤོག་བྱང་བཟུམ་སྦེ་ སྲུང་བཞག་འབད་...(_S)"
+msgstr "ཝི་ཤོག་བྱང་སྦེ་སྲུངས་...(_S)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
@@ -2824,15 +2843,15 @@ msgstr "འབྲེལ་ས་ཚུ་གདོང་བསྐྱོད་འ
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
-msgstr "འབྲེལ་ས་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་འབྲེལ་ས་ལུ་གཏང་།(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
-msgstr "ཐོ་ཡིག་ལུ་འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ལུ་གཏང་།(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
-msgstr "འབྲེལ་ས་ཚུ་ལུ་ འཕྲིན་དོན་གཏང་།(_M)"
+msgstr "འཕྲིན་དོན་འབྲེལ་ས་ཚུ་ལུ་གཏང་།(_M)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
@@ -2850,23 +2869,24 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ནང་ སྤོ་བཤུ�
 #: ../ui/evolution-composer-entries.xml.h:4
 #: ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
-msgstr "བཏོག (_t)"
+msgstr "བཏོག (_C)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602
 #: ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/memos-component.c:451
 #: ../calendar/gui/tasks-component.c:442
 #: ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1082
-#: ../mail/message-list.c:1742
+#: ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724
 #: ../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-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
@@ -2929,7 +2949,7 @@ msgid "Company Phone"
 msgstr "ཚོང་སྡེའི་བརྒྱུད་འཕྲིན།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "གློག་འཕྲིན།"
@@ -2979,7 +2999,7 @@ msgid "Manager"
 msgstr "འཛིན་སྐྱོང་པ།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "འགྲུལ་འཕྲིན།"
 
@@ -2988,7 +3008,7 @@ msgid "Nickname"
 msgstr "སྐྱོན་མིང་།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "དྲན་འཛིན།"
 
@@ -2997,7 +3017,7 @@ msgid "Office"
 msgstr "ཡིག་ཚང་།"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "ལས་སྡེ།"
 
@@ -3183,84 +3203,65 @@ msgstr "སེལ་འཐུ་འབད་ཡོད་པའི།"
 msgid "Has Cursor"
 msgstr "འོད་རྟགས་འདུག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163
-#: ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "བརའུ་ཟར་ནང་ལུ་ འབྲེལ་ལམ་ཁ་ཕྱེ། (_O)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2464
-msgid "_Copy Link Location"
-msgstr "འབྲེལ་ལམ་གནས་ཁོངས་ འདྲ་བཤུས་རྐྱབས། (_C)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "འཕྲིན་དོན་གསརཔགཏང་ཡུལ་... (_S)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "གློག་འཕྲིན་ཁ་བྱང་ཚུ་འདྲ་བཤུས་རྐྱབས།(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(ས་ཁྲ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "ས་ཁྲ།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
-msgstr "འཐུས་མི་ཚུ་ཐོ་བཀོད་འབད།"
+msgstr "ཚོགས་འཐུས་ཚུ་ཐོ་བཀོད་འབད།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "གློག་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "གནས་ས།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "གློག་ཐོག་ཞལ་འཛོམས"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "བརྒྱུད་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "དཔར་འཕྲིན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "ལཱ་གཡོག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "ཌབ་ལུ་ཌབ་ལུ་ཌབ་ལུ།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "བོལོག"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "རང་དོན།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "ལས་གཡོག་གི་མགོ་མིང་།"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "ཁྱིམ་གྱི་ཤོག་ལེབ།"
 
@@ -3533,7 +3534,7 @@ msgstr "འབྲེལ་སའི་བརྡ་དོན།"
 #: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
-msgstr "%sགི་དོན་ལུ་འབྲེལ་སའི་བརྡ་དོན།"
+msgstr "%s གི་དོན་ལུ་ འབྲེལ་སའི་བརྡ་དོན།"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
@@ -3575,27 +3576,27 @@ msgstr "ནང་འདྲེན་འབད་དོ་..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "ཕྱི་སྣང་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "ཕྱི་སྣང་གི་སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
-msgstr "ཕྱི་སྣང་གི་ སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "ཕྱི་སྣང་སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "མོ་ཛིལ་ལ་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "མོ་ཛི་ལ་གི་ སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
-msgstr "མོ་ཛིལ་ལི་གི་སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "མོ་ཛི་ལ་སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ སི་ཨེསི་ཝི་ ཡང་ན་ ཨེབ་ལྡེ།(.སི་ཨེསི་ཝི་ .ཨེབ་ལྡེ་)"
+msgstr "ཨི་བུ་ཤཱན་གྱི་ སི་ཨེསི་ཝི་ ཡང་ན་ མཆོང་ལྡེ།(.སི་ཨེསི་ཝི་ .མཆོང་ལྡེ)"
 
 #: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ སི་ཨེསི་ཝི་དང་ ཨེབ་ལྡེ་ནང་འདྲེན་པ།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ སི་ཨེསི་ཝི་དང་ མཆོང་ལྡེའི་ནང་འདྲེན་པ།"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
@@ -3626,12 +3627,12 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཝི་ཤོག་བྱང�
 msgid "Print envelope"
 msgstr "ཡིག་ཤུབས་དཔར་བསྐྲུན་འབད།"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "འབྲེལ་ས་ཚུ་དཔར་བསྐྲུན་འབད།"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "འབྲེལ་ས་དཔར་བསྐྲུན་འབད།"
 
@@ -3661,7 +3662,7 @@ msgstr "མཚོན་གྲངས།"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
 msgid "F_ont..."
-msgstr "ཡིག་གཟུགས།...(_o)"
+msgstr "ཡིག་གཟུགས།...(_F)"
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
@@ -3784,7 +3785,7 @@ msgstr "ནག་གྲིབ་བཟོ་བ།"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -3813,7 +3814,7 @@ msgstr "རྒྱ་ཚད:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
-msgstr "ཡིག་གཟུགས་...(_F)"
+msgstr "ཡིག་གཟུགས།...(_F)"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
@@ -3983,17 +3984,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "ཁྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../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:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "ཁྱོད་ཀྱིས་ འཛོམས་འདུ་་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཏོན་གཏང་ནི་ ངེས་ཏིག་ཨིན་ན?"
 
@@ -4007,7 +4005,7 @@ msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅུད�
 
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
-msgstr "ལས་ཀ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+msgstr "འབྱུང་ལས་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད་མི་ཚུགས།།"
 
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
@@ -4015,7 +4013,7 @@ msgstr "ཟླ་ཐོ་[༠]བཏོན་གཏང་ནི་ཨིན་�
 
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
-msgstr "ལས་ཀའི་ཐོ་ཡིག་'{0}'བཏོན་གཏང་ནི་ཨིན་ན?"
+msgstr "བརྗེད་ཐོ་'{0}'བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
@@ -4023,7 +4021,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་[༠]བཏོན་གཏང�
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Do _not Send"
-msgstr "མ་བཏང་།(_n)"
+msgstr "མ་གཏང་།(_n)"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
@@ -4043,7 +4041,7 @@ msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་ཐོག་ལས་ མགྲོན་བརྡ་གཏང་ཞིནམ་ལས་ ངོས་ལེན་འབད་བཅུག"
+msgstr "བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ གློག་འཕྲིན་མགྲོན་བརྡ་གཏང་ནི་ཨིནམ་ལས་ ཁོང་ལུ་ལན་གསལ་གཏང་བཅུག"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4051,7 +4049,7 @@ msgstr "ཟླ་ཐོ་མངོན་གསལ་འབད་ནི་ལུ
 
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་ མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།"
+msgstr "བརྗེད་ཐོ་མངོན་གསལ་འབད་ནི་ལུ་འཛོལ་བ།"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
@@ -4059,11 +4057,11 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་ མངོན་གསལ་�
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
-msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ ཇོར་ནཱལ་དེ་ བཏོན་བཏང་ཡོདཔ་མི་ཤེས།"
+msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་ གཞན་ཚུ་གིས་གསར་དེབ་དེ་ བཏོན་བཏང་ཡོདཔ་མི་ཤེས།"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "ཁྱོད་ཀྱིས་ ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ འཛོམས་འདུ་ཆ་མེད་བཏང་ཡོདཔ་མི་ཤེས།"
+msgstr "ཁྱོད་ཀྱིས་ཆ་མེད་བརྡ་བསྐུལ་མ་བཏང་པ་ཅིན་ བཅའ་མར་གཏོགས་མི་གཞན་ཚུ་གིས་ འཛོམས་འདུ་དེ་ཆ་མེད་བཏང་ཡོདཔ་མི་ཤེས།"
 
 #: ../calendar/calendar.error.xml.h:38
 msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
@@ -4079,11 +4077,11 @@ msgstr "དུས་མཐུན་གྱི་ བརྡ་དོན་གཏ�
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ངོ་འཕྲད་དེ་སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་དེ་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་།"
+msgstr "མཉམ་སྦྲགས་ལ་ལོ་ཅིག་ ཕབ་ལེན་འབད་དོ། ངོ་འཕྲད་དེ་སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་འདི་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་།"
 
 #: ../calendar/calendar.error.xml.h:42
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ལས་ཀ་དེ་ སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་ཚུ་དེ་ཚུ་ བརླག་སྟོར་ཞུགས་འོང་།"
+msgstr "མཉམ་སྦྲགས་དག་པ་ཅིག་ ཕབ་ལེན་འབད་དོ། ལས་ཀ་དེ་ སྲུང་བཞག་འབདཝ་ད་ མཉམ་སྦྲགས་འདི་ཚུ་བརླག་སྟོར་ཞུགས་འོང་།"
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
@@ -4099,19 +4097,19 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ལས་ཀ་དེ་ རེ�
 
 #: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
-msgstr "ཟླ་ཐོ་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ་བས།"
+msgstr "ཟླ་ཐོ་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:47
 msgid "The calendar you have selected is read-only"
-msgstr "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ཟླ་ཐོ་དེ་ ལྷག་ནི་ཙམ་ཨིན་པས།"
+msgstr "ཁྱོད་ཀྱིས་སེལ་འཐུ་འབད་མི་ཟླ་ཐོ་དེ་ལྷག་ནི་ཙམ་ཨིན་པས།"
 
 #: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
-msgstr "བྲརྗེད་ཐོའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
+msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage."
-msgstr "ལས་ཀ་འདི་ ཨོཕ་ལ་ཡིན ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
+msgstr "ལས་ཀའི་ཐོ་ཡིག་དེ་ ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལས་ རྟགས་མ་བཀལ་བས།"
 
 #: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
@@ -4131,7 +4129,7 @@ msgstr "ཁྱོད་ཀྱིས་ ངོ་འཕྲད་འདི་ལ�
 
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
-msgstr "ཁྱོད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་ བརྗེད་ཐོ་འདི་ནང་ བསྲུང་ནི་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བརྗེད་ཐོ་འདི་ལུ་བསྲུང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
@@ -4143,7 +4141,7 @@ msgstr "ཁྱོད་ཀྱིས་གསར་དེབ་ཐོ་བཀོ
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "ཁྱོད་ཀྱིས་ ཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་ གཏང་ནི་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་བཅའ་མར་གཏོགས་མི་ཆ་མཉམ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་ གཏང་ནི་ཨིན་ན?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4163,19 +4161,19 @@ msgstr "ཁྱོད་ཀྱིས་ ལས་ཀ་འདི་ བཅའ་�
 
 #: ../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 "ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་ མཐུད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་ལུ་ ཡར་སྐྱེད་འབད་དགོ"
+msgstr "ཁྱོད་ཀྱིས་རྒྱབ་སྐྱོར་མེད་པའི་ སྡེ་རིམ་སར་བར་ཅིག་ལུ་མཐུད་དོ་ཡོདཔ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ལག་ལེན་འཐབ་ནི་ལུ་ དཀའ་ངལ་འབྱུང་འོང་། གྲུབ་འབྲས་ཡང་དག་འབྱུང་ཐབས་ལུ་ སར་བར་དེ་ རྒྱབ་སྐྱོར་ཡོད་པའི་ཐོན་རིམ་ཅིག་ལུ་ ཡར་བསྐྱེད་འབད་དགོ"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "ཁྱོད་ཀྱིས་ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་ངོ་འཕྲད་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this task, but not yet saved it."
-msgstr "ཁྱོད་ཀྱིས་ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་ལས་ཀ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "ཁྱོད་ཀྱིས་བརྗེད་ཐོ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་མ་བསྲུངས་པས།"
+msgstr "ཁྱོད་ཀྱིས་བརྗེད་ཐོ་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་ནུག་ འདི་འབདཝ་ད་ ད་ཚུན་སྲུང་བཞག་མ་འབད་བས།"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -4188,7 +4186,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ལོག་འགོ་མ་�
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
-msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག (_D)"
+msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག (_D)"
 
 #: ../calendar/calendar.error.xml.h:69
 #: ../ui/evolution-editor.xml.h:23
@@ -4241,12 +4239,12 @@ msgstr "པའི་ལོཊི་གི་ ཟླ་ཐོའི་གློ�
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ ལྷག་མ་ཚུགས།"
+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 "པའི་ལོཊི་གི་ བརྗེད་ཐོ་འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
+msgstr "པའི་ལོཊི་གི་ བརྗེད་ཐོ་གློག་རིམ་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
 
 #: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
@@ -4260,7 +4258,7 @@ 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 "པའི་ལོཊི་གི་ ཊུ་ཌུ འཇུག་སྤྱོད་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
+msgstr "པའི་ལོཊི་གི་ ཊུ་ཌུ གློག་རིམ་སྡེབ་ཚན་ འབྲི་མ་ཚུགས།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:1969
@@ -4268,7 +4266,7 @@ msgid "Calendar and Tasks"
 msgstr "ཟླ་ཐོ་དང་ ལས་ཀ་ཚུ།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "ཟླ་ཐོ་ཚུ།"
 
@@ -4298,7 +4296,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོའི་ཆ་�
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
-msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ བརྗེད་ཐོའི་ཆ་ཤས།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་བརྗེད་ཐོའི་ཆ་ཤས།"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
@@ -4323,7 +4321,7 @@ msgstr "བརྗེད་ཐོ་ཚུ།"
 #: ../calendar/gui/print.c:1828
 #: ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4362,7 +4360,7 @@ msgstr[1] "སྐར་མ་ཚུ།"
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgid_plural "hours"
-msgstr[0] "ཆུ་ཚོད་ཚུ།"
+msgstr[0] "ཆུ་ཚོད།"
 msgstr[1] "ཆུ་ཚོད་ཚུ།"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
@@ -4376,8 +4374,8 @@ msgstr "ངོ་འཕྲད་ཚུ།"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4396,7 +4394,7 @@ msgstr "ཉིན་གཉིད་ཀྱི་དུས་ཚོད་: (_t)"
 #: ../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-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
@@ -4409,37 +4407,38 @@ msgstr "ཞུན་དག (_E)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
-msgstr "ཉིན་གཉིད་ཁུག་ནི། (_S)"
+msgstr "སི་ནུཛི། (_S)"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "ངོ་འཕྲད་ཀྱི་གནས་ཁོངས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "བཅུད་དོན་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "འགྲེལ་བཤད་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "གནས་ཁོངས་ཀྱི་བརྡ་དོན་མི་འཐོབ་པས།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
-msgstr "འདི་ལུ་འཇིགས་བརྡ་%dའདུག"
+msgstr "ཁྱོད་ལུ་འཇིགས་བརྡ་%dའདུག"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "ཉེན་བརྡ།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4451,7 +4450,7 @@ msgstr ""
 "གཏང་ནིའི་དོན་ལུ་ རིམ་སྒྲིག་འབད་ནུག དེ་གི་ཚབ་ལུ་ ཨི་བོ་ལུ་ཤཱན་ \n"
 "དུས་རྒྱུན་གྱི་ ཌའི་ལོག་སྒྲོམ་ཅིག་ བཀྲམ་སྟོན་འབད་འོང་།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -4466,7 +4465,7 @@ msgstr ""
 "\n"
 "ཁྱོད་ཀྱིས་ ལས་རིམ་འདི་ གཡོག་བཀོལ་ནི་ ངེས་ཏིག་ཨིན་ན།"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "ང་ལུ་ ལས་རིམ་འདི་གི་སྐོར་ལས་ ལོག་སྟེ་མ་འདྲི།"
 
@@ -4567,297 +4566,289 @@ msgid "Default reminder value"
 msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་གྱི་བེ་ལུ།"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Transparency"
-msgstr "འབྱུང་ལས་ཀྱི་དྭངས་གསལ།"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy server URLs"
-msgstr "སར་བར་ཡུ་ཨར་ཨེལ་ དལཝ/ཁོམ་མེད།"
+msgstr "སར་བར་ ཡུ་ཨར་ཨེལ་ཨེསི་ དལཝ/ཁོམ་མེད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "ཊེམ་པེལེཊི་ ཡུ་ཨར་ཨེལ་ དལཝ/ཁོམ་མེད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "མཇུག་བསྡུ་ཚར་མི་ལས་ཀ་ཚུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "ལས་ཀའི་ཆ་ཕྲན་ཚུ་སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "ལས་ཀའི་བེ་ལུ་ སྦ་བཞག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "ཐད་སྙོམས་པེན་གྱི་གནས་ས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends 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:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་རྩ་སྒྲིག་ནང་ ༠ ལས་ ༢༣ སྦེ་བཟོ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "བར་མཚམས་ཚུ་ ཉིན་མའི་གྲངས་ནང་སྟོན་ཡོདཔ་དང་ ལཱ་གི་བདུན་ཕྲག་མཐོང་སྣང་ནང་ སྐར་མའི་གྲངས་ནང་སྟོན་ཡོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "འཇིགས་བརྡའི་ཆུ་ཚོད་མཇུག་མམ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
-msgstr "དལཝ་/ཁོམ་མེད་དཔེ་བསྐྲུན་གྱི་དོན་ལུ་ སར་བར་ཡུ་ཨར་ཨེལ་གྱི་ཐོ་ཡིག"
+msgstr "དཔེ་བསྐྲུན་དལཝ་/ཁོམ་མེད་ཀྱི་དོན་ལུ་ སར་བར་ ཡུ་ཨར་ཨེལ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "མར་ཀཱསི་བཱེནསི་ཐིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "མར་ཀཱསི་བཱེནསི་ ཐིག་གི་ཚོས་གཞི་ - ཉིན་མའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "མར་ཀཱསི་བཱེནསི་ ཐིག་གི་ཚོས་གཞི་ - ཆུ་ཚོད་ཕྲ་རིང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ཉིན་ལཱ་མཇུག་བསྡུ་བའི་སྐར་མ་ ༠ ལས་ ༥༩།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ཉིན་ལཱ་འགོ་བཙུགས་ཀྱི་སྐར་མ་ ༠ ལས་ ༥༩།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "ཐད་སྙོམས་པེན་གནས་སའི་ ཟླ་བའི་མཐོང་སྣང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "ཀེར་ཕྲང་པེན་གནས་སའི་ ཟླ་བའི་མཐོང་སྣང་།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
-msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་ཅིག་ ཐག་བཅད་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
+msgstr "སྔོན་སྒྲིག་གི་དྲན་བསྐུལ་ཅིག་ཐག་གཅད་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "ལས་ཀ་ཚུ་ ནམ་སྦ་བཞག་དགོཔ་ཨིན་ན་ བརྡ་སྟོན་ནིའི་དོན་ལུ་ ཆ་ཕྲན་གྱི་གྱངས་ཁ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "ཧེ་མ་ལས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 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:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 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:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 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:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 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:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "འཇིགས་བརྡ་གིས་ གཡོག་བཀོལ་ཆོག་པའི་ ལས་རིམ་ཚུ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ངོས་ལེན་གྱི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ངོས་ལན་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ཚུ་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཚུ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ལས་འགན་གྱི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/འཛོམས་འདུ/ལས་ཀའི་ཞུན་དགཔ་ནང་ དབྱེ་རིམ་གྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "བརྡ་བསྐུལ་ནང་ བཀྲམ་སྟོན་འཇིགས་བརྡ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ གནས་ཚད་ཀྱི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Preview\" གི་པེན་དེ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་སྟོན།"
+msgstr "འབྱུང་ལས་/་འདུའི་ཞུན་དགཔ་ནང་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་ཚུ་སྟོན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "ད་རིས་རན་པའི་ ལས་ཀའི་ཚོས་གཞི།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "ལས་ཀའི་ཀེར་ཕྲང་ པེན་གྱི་གནས་ས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "དལཝ་དང་ཁོམ་མེད་ གནད་སྡུད་ཀྱི་ གློ་བུར་རྒྱབ་ཐག་སྦེ་ ལག་ལེན་འཐབ་ནིའི་ ཡུ་ཨར་ཨེལ་ཊེམ་པེལེཊི། %uགི་ཚབ་ལུ་ ཡིག་འཕྲིན་ཁ་བྱང་ ལག་ལེན་པའི་ཡན་ལག་བཙུགས་ནི་དང་ %dགི་ཚབ་ལུ་ ཌོ་མེན་བཙུགས་ནི་ཨིན།"
+msgstr "དལཝ་/ཁོམ་མེད་ གནད་སྡུད་ཀྱི་ གློ་བུར་རྒྱབ་ཐག་སྦེ་ ལག་ལེན་འཐབ་ནིའི་ ཡུ་ཨར་ཨེལ་ཊེམ་པེལེཊི། %uགི་ཚབ་ལུ་ ཡིག་འཕྲིན་ཁ་བྱང་གི་ ལག་ལེན་པའི་ཡན་ལག་བཙུགས་ནི་དང་ %dགི་ཚབ་ལུ་ ཌོ་མེན་བཙུགས་ནི་ཨིན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "ཟླ་ཐོའི་ནང་ ཨཱོལ་སེན་ ཆུ་ཚོད་གླིང་སྡེའི་ གནད་སྡུད་གཞི་རྟེན་གནས་ཁོངས་ དཔེར་ན་ \"America/New York\" བཟུམ་སྦེ་ སྐད་བསྒྱུར་མ་འབད་བར་ ཟླ་ཐོའི་ནང་ ཚེས་གྲངས་དང་ ཆུ་ཚོད་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་ནིའི་ སྔོན་སྒྲིག་ཆུ་ཚོད་ཀྱི་གླིང་སྡེ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "ཆུ་ཚོད་བགོ་བཀྲམ། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "མཐའ་མཇུག་འཇིགས་བརྡ་བྱིན་པའི་ཆུ་ཚོད་ ཆུ་ཚོད་ཊི་ནང་། (_t)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "ཆུ་ཚོད་གླིང་སྡེ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
-msgid "Transparency of the events in calendar views (A value between 0 and 10, opaque by default)."
-msgstr "ཟླ་ཐོའི་མཐོང་སྣང་ཚུ་ནང་ འབྱུང་ལས་ཚུ་གི་དྭངས་གསལ། (༠ དང་ ༡༠ གི་བར་ན་འབད་མི་བེ་ལུ་ཅིག སྔོན་སྒྲིག་ཐོག་ལས་དྭངས་སྒྲིབ་ཅན)"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "ཆུ་ཚོད་ཁལ་གཅིག་བཞི་གི་ དུས་ཚོད་རྩ་་སྒྲིག"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "སྔོན་སྒྲིག་དྲན་བསྐུལ་པ་ཅིག་གི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་ \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ལས་ཀ་སྦ་བཞག་ནིའི་ བརྡ་སྟོན་གྱི་དོན་ལུ་ ཆ་ཕྲན་ཚུ་  \"minutes\", \"hours\" ཡང་ན་ \"days\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "བདུན་ཕྲག་འགོ་བཙུགས་ཀྱི་ཉིནམ་ གཟའ་ཟླཝ་(༠)ལས་ གཟའ་ཉིམ་(༦)།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "འཇིགས་བསྐུལ་བཀྲམ་སྟོན་གྱི་དོན་ལུ་ བརྡ་བསྐུལ་སྣོད་ ལག་ལེན་འཐབ་ནི་ཨིན་ན་མེན། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཅིག་ བཏོན་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན། "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "ངོ་འཕྲད་དམ་ ལས་ཀ་ཚུ་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་ འདྲི་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 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:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 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:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 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:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་ ལས་ཀའི་མཐོང་སྣང་ནང་ སྦ་བཞག་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "ངོ་འཕྲད་ཚུ་གི་དོན་ལས་ སྔོན་སྒྲིག་བརྡ་བསྐུལ་པ་ཅིག་ གཞི་སྒྲིག་འབད་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ངོས་ལེན་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ངོས་ལན་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་ཁག་ཚུ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ དབྱེ་ཁག་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ལས་འགན་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ལས་འགན་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ གནས་ཚད་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ གནས་ཚད་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 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:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "འབྱུང་ལས་/འཛོམས་འདུ་ན་དག་པའི་ནང་ ཆུ་ཚོད་གླིང་སྡེ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ ཆུ་ཚོད་གླིང་སྡེའི་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུ་ན་དག་པའི་ནང་ དབྱེ་བའི་ས་སྒོ་སྟོན་དགོཔ་ཨིན་ན།"
+msgstr "འབྱུང་ལས་/ལས་ཀ་/འཛོམས་འདུའི་ཞུན་དགཔ་ནང་ལུ་ དབྱེ་བའི་ས་སྒོ་ སྟོན་ནི་ཨིན་ན་མེན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "ཚེས་གྲངས་འགྲུལ་བསྐྱོད་ནང་ བདུན་ཕྲག་གི་ཨང་གྲངས་ཚུ་ སྟོན་དགོཔ་ཨིན་ན།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "ལཱ་གི་ཉིནམ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་ཆུ་ཚོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "ལཱ་གི་ཉིནམ་ མཇུག་བསྡུ་བའི་སྐར་མ།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་ཆུ་ཚོད།"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "ལཱ་གི་ཉིནམ་ འགོ་བཙུགས་ཀྱི་སྐར་མ།"
 
@@ -4893,7 +4884,7 @@ msgstr "དཔར་བསྐྲུན།"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -4960,59 +4951,59 @@ msgstr "ཟླ་ཐོ་ཚུ་ དུས་མཐུན་བཟོ་མ�
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་དོན་ལུ་ ཟླ་ཐོ་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "ཟླ་ཐོའི་འབྱུང་ཁུངས་སེལ་བྱེད།"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "ངོ་འཕྲད་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "ངོ་འཕྲད། (_A)"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "འཛོམས་འདུ་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
-msgstr "འཛོམས་འདུ་། (_e)"
+msgstr "འཛོམས་འདུ། (_e)"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "འཛོམས་འདུ་གསར་པའི་ཞུ་བ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད་ གསརཔ་བཟོ།"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "ཉིནམ་གང་གི་ངོ་འཕྲད། (_p)"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "ཉིནམ་གང་གི་ ངོ་འཕྲད་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "ཟླ་ཐོ་གསརཔ།"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "ཟླ་ཐོ། (_n)"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "ཟླ་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
@@ -5079,7 +5070,7 @@ msgstr "སྲོལ་སྒྲིག་འཇིགས་བརྡའི་ས
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
-msgstr "འཕྲིན་དོན་: (_s)"
+msgstr "འཕྲིན་དོན: (_s)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:446
@@ -5111,7 +5102,7 @@ msgstr "སྒྲུབ་རྟགས་ཚུ: (_A)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Program:"
-msgstr "ལས་རིམ: (_P)"
+msgstr "ལས་རིམ་: (_P)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Repeat the alarm"
@@ -5174,18 +5165,19 @@ 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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "མཉམ་སྦྲགས་རང་བཞིན་བཀྲམ་སྟོན་གྱི་ བསམ་འཆར་བཀོད།(_S)"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "མཉམ་སྦྲགས་རང་བཞིན་གྱིས་ བཀྲམ་སྟོན་འབད་ནིའི་ བསམ་འཆར་བཀོད།"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "ཡིག་སྣོད་(ཚུ)མཉམ་སྦྲགས་འབད།"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་ཚུ།"
@@ -5194,20 +5186,20 @@ msgstr "མཉམ་སྦྲགས་ཀྱི་རྒྱུ་དངོས་
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../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:3
+#: ../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:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "མ་ཡིམ་གྱི་དབྱེ་བ:"
@@ -5242,7 +5234,7 @@ msgstr "<span weight=\"bold\"> དྲན་བརྡ་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་སར་བར་དལཝ་/ཁོམ་མེད་</span>"
+msgstr "<span weight=\"bold\">སྔོན་སྒྲིག་དལཝ་/ཁོམ་མེད་སར་བར་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
@@ -5260,18 +5252,18 @@ msgstr "<span weight=\"bold\"> ཆུ་ཚོད་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">ལཱ་གི་བདུན་ཕྲག</span>"
+msgstr "<span weight=\"bold\">ལཱ་གཡོག་བདུན་ཕྲག་</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
-msgstr "ཉིནམ་རྫོགས་པ: (_e)"
+msgstr "ཉིནམ་རྫོགསཔ་ཨིན་: (_e)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Display"
 msgstr "བཀྲམ་སྟོན།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "དལཝ/ཁོམ་མེད།"
@@ -5290,7 +5282,7 @@ msgid ""
 msgstr ""
 "སྐར་མ།\n"
 "ཆུ་ཚོད།\n"
-"ཉིནམ།"
+"ཉིན་གྲངས།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: ../calendar/gui/dialogs/recurrence-page.c:1080
@@ -5312,7 +5304,9 @@ msgstr ""
 "ལྷག་པ།\n"
 "ཕུར་བུ།\n"
 "པ་སངས།\n"
-"སྤེན་པ།"
+"སྤེན་པ།\n"
+"ཉི་མ།\n"
+"ཟླ་བ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
@@ -5322,7 +5316,7 @@ msgstr "ཚོས་གཞི་ཅིག་འཐུ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
-msgstr "ཟླ་བ། (_u)"
+msgstr "ཉི་མ། (_u)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
@@ -5332,7 +5326,7 @@ msgstr "ཉི་མ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Select the calendars for alarm notification"
-msgstr "འཇིགས་བརྡའི་བརྡ་བསྐུལ་དོན་ལུ་ ཟླ་ཐོ་ཚུ་སེལ་འཐུ་འབད།"
+msgstr "འཇིགས་བརྡའི་བརྡ་བསྐུལ་དོན་ལུ་ ཟླ་ཐོ་དེ་ཚུ་སེལ་འཐུ་འབད།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
@@ -5350,7 +5344,7 @@ msgstr "ཟླ་བ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "T_asks due today:"
-msgstr "ད་རིས་རན་པའི་ལས་ཀ(_a)"
+msgstr "ད་རིས་རན་པའི་ལས་ཀ།"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "T_hu"
@@ -5390,7 +5384,7 @@ msgstr "ཕུར་བུ།"
 #. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Wee_k starts on:"
-msgstr "བདུན་ཕྲག་འགོ་བཙུགས་ཚེས་:(_k)"
+msgstr "བདུན་ཕྲག་འགོ་བཙུགསཔ་ཨིན་:(_k)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
@@ -5402,7 +5396,7 @@ msgstr "ཆུ་ཚོད་༡༢ (སྔ་ཆ་/ཕྱི་ཆ)། (_12)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
-msgstr "ཆུ་ཚོད་ ༢༤། (_2)"
+msgstr "ཆུ་ཚོད་ ༢༤། (_12)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
@@ -5422,7 +5416,7 @@ msgstr "སྤེན། (_F)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
-msgstr "འདི་གི་ཤུལ་ལས་ མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་ སྦ་བཞག (_H)"
+msgstr "འདི་གི་ཤུལ་ལས་ མཇུག་བསྡུ་བའི་ལས་ཀ་ཚུ་སྦ་བཞག (_H)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
@@ -5430,7 +5424,7 @@ msgstr "མིག (_M)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
-msgstr "ཧེ་མ་ལས་རན་པའི་ལས་ཀ་: (_O)"
+msgstr "ཧེ་མ་ལས་རན་པའི་ལས་ཀ་ཚུ་: (_O)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
@@ -5438,11 +5432,11 @@ msgstr "ཉི། (_S)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
-msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ཆུ་ཚོད་ཚུ་སྟོན། (_S)"
+msgstr "བདུན་ཕྲག་དང་ ཟླ་བའི་མཐོང་སྣང་ནང་ ངོ་འཕྲད་མཇུག་བསྡུ་བའི་ ཆུ་ཚོད་ཚུ་སྟོན། (_S)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
-msgstr "ཆུ་ཚོད་ཀྱི་སྡེ་ཚན། (_T)"
+msgstr "ཆུ་ཚོད་ཀྱི་སྡེ་ཚན་: (_T)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
@@ -5457,46 +5451,46 @@ msgid "before every appointment"
 msgstr "ངོ་འཕྲད་ཡོད་ཚད་གཅིག་གི་ཧེ་མར།"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཟླ་ཐོའི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་འདྲ་བཤུས་རྐྱབས།(_y)"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ཟླ་ཐོའི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།(_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ ལས་ཀའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ བརྗེད་ཐོའི་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།(_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ཨོཕ་ལ་ཡིན་ བཀོལ་སྤྱོད་ཀྱི་དོན་ལས་ བརྗེད་ཐོའི་་ཐོ་ཡིག་གི་ནང་དོན་ཚུ་ ཉེ་གནས་ལུ་ འདྲ་བཤུས་རྐྱབས།།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
-msgstr "ཚོས་གཞི: (_o)"
+msgstr "ཚོས་གཞི་: (_o)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "ལས་ཀའི་ཐོ་ཡིག"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "བརྗེད་ཐོའི་་ཐོ་ཡིག"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "ཟླ་ཐོའི་རྒྱུ་དངོས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "ཟླ་ཐོ་གསརཔ།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "ལས་ཀའི་ཐོ་ཡིག་གི་རྒྱུ་དངོས།"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
-msgstr "བརྗེད་ཐོའི་ཐོ་ཡིག་གསརཔ།"
+msgstr "བརྗེད་ཐོ་ཐོ་ཡིག་གསརཔ།"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
@@ -5518,13 +5512,13 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་ཁ་སྐོང་རྐྱ
 #: ../plugins/calendar-http/calendar-http.c:271
 #: ../plugins/calendar-weather/calendar-weather.c:548
 msgid "_Refresh:"
-msgstr "ཡང་སེལ་འཐུ་འབད: (_R)"
+msgstr "ཡང་སེལ་འབད: (_R)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:11
 #: ../plugins/caldav/caldav-source.c:247
 #: ../plugins/calendar-http/calendar-http.c:133
 msgid "_URL:"
-msgstr "ཡུ་ཨར་ཨེལ: (_U)"
+msgstr "ཡུ་ཨར་ཨེལ་: (_U)"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
 #: ../filter/filter.glade.h:21
@@ -5626,19 +5620,19 @@ msgstr[1] "མཉམ་སྦྲགས་འཕྲིན་དོན་%d།"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446
 #: ../composer/e-msg-composer.c:3121
-#: ../mail/em-folder-tree.c:987
+#: ../mail/em-folder-tree.c:980
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978
-#: ../mail/message-list.c:1743
+#: ../mail/em-folder-view.c:973
+#: ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "སྤོ་བཤུད་འབད། (_M)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448
 #: ../composer/e-msg-composer.c:3123
-#: ../mail/em-folder-tree.c:989
-#: ../mail/message-list.c:1745
+#: ../mail/em-folder-tree.c:982
+#: ../mail/message-list.c:1727
 msgid "Cancel _Drag"
-msgstr "འདྲུད་ནི་ཆ་མེད་གཏང་། (_D)"
+msgstr "འཐེན་འདྲུད་ཆ་མེད་གཏང་། (_D)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
@@ -5654,10 +5648,10 @@ msgstr[1] "མཉམ་སྦྲགས་<b>%d</b>"
 
 #: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_B)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ།(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_B)"
 
@@ -5676,7 +5670,7 @@ msgstr "རྩ་བསྐྲད་གཏང་། (_R)"
 #: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620
-#: ../mail/em-folder-tree.c:2065
+#: ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
@@ -5688,70 +5682,70 @@ msgstr "རྒྱུ་དངོས་ཚུ།(_P)"
 msgid "_Add attachment..."
 msgstr "མཉམ་སྦྲགས་ཁ་སྐོང་རྐྱབས་...(_A)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
-#: ../mail/em-format-html-display.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "མཉམ་སྦྲགས་ཚུ་སྟོན།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་ སོར་སྟོན་འབད་ནིའི་དོན་ལུ་ བར་སྟོང་ལྡེ་མིག་ཨེབ།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2077
-#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "ངོ་འཕྲད་ཞུན་དག་རྐྱབས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "འཛོམས་འདུ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "ངོ་འཕྲད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2089
-#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "འགན་སྤྲོད་ལས་ཀ་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "ལས་ཀ་- %s\""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "གསར་དེབ་ཐོ་བཀོད་- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2147
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "བཅུད་དོན་མིན་འདུག"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2655
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307
 #: ../mail/em-utils.c:498
 #: ../mail/em-utils.c:535
-#: ../widgets/misc/e-attachment-bar.c:399
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2744
-#: ../calendar/gui/dialogs/comp-editor.c:2798
-#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "དུས་མཐུན་ཅིག་བྱུང་པ་ཅིན་ རྣམ་གྲངས་འདི་ལུ་ བསྒྱུར་བཅོས་འབད་མི་ཚུ་ བཏོན་བཀོག་འོང་།"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "ད་ལྟོའི་ཐོན་རིམ་དེ་ ལག་ལེན་འཐབ་མི་ཚུགས་པས།"
 
@@ -5767,10 +5761,6 @@ 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 "ལེན་མཁན་གཞན་ཆ་མཉམ་གྱི་ ཡིག་སྒྲོམ་ནང་ལས་ རྣམ་གྲངས་འདི་ཚུ་བཏོན་གཏང་།(_D)"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "ཀོར་བའི་འཛོལ་བ་ཅིག་ལུ་བརྟེན་ཏེ་ བྱུང་ལས་འདི་ བཏོན་བཏང་མ་ཚུགས།"
@@ -5832,11 +5822,11 @@ msgstr "བགོ་སྤེལ་འབད་ས་:"
 msgid "Enter Delegate"
 msgstr "བགོ་སྤེལ་བཙུགས།"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "ངོ་འཕྲད།(_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "སླར་འབྱུང་།"
@@ -5849,7 +5839,7 @@ msgstr "འབྱུང་ལས་འདི་ལུ་འཇིགས་བར
 #: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
-msgstr "ཟླ་ཐོ་: (_n)"
+msgstr "ཟླ་ཐོ: (_n)"
 
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
@@ -5993,7 +5983,7 @@ msgstr "ངོ་འཛོམས་པ་ཚུ་...(_n)"
 #: ../calendar/gui/dialogs/event-page.glade.h:6
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
-msgstr "དབྱེ་རིམ་ཚུ་...(_t)"
+msgstr "དབྱེ་རིམ་ཚུ།...(_t)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
@@ -6010,12 +6000,12 @@ msgstr "བྱུང་ལས་ཀྱི་འགྲེལ་བཤད།"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
-msgstr "གནས་ཁོངས་: (_i)"
+msgstr "གནས་ཁོངས: (_i)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr "བཅུད་དོན་: (_m)"
+msgstr "བཅུད་དོན: (_m)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
@@ -6041,11 +6031,11 @@ msgstr "ཚུན་ཚོད།"
 
 #: ../calendar/gui/dialogs/meeting-page.c:307
 msgid "Dele_gatees"
-msgstr "བགོ་སྤེལ་བྱ་ཡུལ་ཚུ།(_g)"
+msgstr "བགོ་སྤེལ་བྱ་ཡུལ།(_g)"
 
 #: ../calendar/gui/dialogs/meeting-page.c:313
 msgid "From:"
-msgstr "ལས་:"
+msgstr "ལས:"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6080,7 +6070,7 @@ msgstr "སྐད་ཡིག"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:7
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
-msgstr "འཐུས་མི།"
+msgstr "ཚོགས་འཐུས།"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
@@ -6094,7 +6084,7 @@ msgstr "ལན་གསལ་གནང་ས།"
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "གནས་ཚད།"
 
@@ -6127,7 +6117,7 @@ msgstr "བརྗེད་ཐོ།"
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "'%s'ནང་ལུ་ བརྗེད་ཐོ་ཚུ་ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "'%s'ནང་ལུ་ བརྗེད་ཐོ་ཚུ་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
@@ -6177,19 +6167,19 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་མིང་།"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ བྱུང་ལས་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་བྱུང་ལས་ཅིག་ བགོ་སྤེལ་འབད་དོ་ ག་ཅི་བགོ་སྤེལ་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ བྱུང་ལས་ཅིག་ བགོ་སྤེལ་འབད་དོ་ ག་ཅི་བགོ་སྤེལ་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་ལས་ཀ་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ ལས་ཀ་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
 msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གསར་དེབ་ཐོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་ནི་སྨོ?"
+msgstr "ཁྱོད་ཀྱིས་སླར་འབྱུང་གི་ གསར་དེབ་ཐོ་བཀོད་ཅིག་ ལེགས་བཅོས་འབད་དོ་ ག་ཅི་ལེགས་བཅོས་འབད་དགོ་མནོཝ་སྨོ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6274,7 +6264,7 @@ msgstr "ཚེས་གྲངས་གཞན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "1st to 10th"
-msgstr "དང་པ་ལས་ ༡༠ པ་ཚུན།"
+msgstr "༡ པ་ ལས་ ༡༠ པ།"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6282,7 +6272,7 @@ msgstr "དང་པ་ལས་ ༡༠ པ་ཚུན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "11th to 20th"
-msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན།"
+msgstr "༡༡ པ་ ལས་ ༢༠ པ།"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
@@ -6290,7 +6280,7 @@ msgstr "༡༡ པ་ལས་ ༢༠ པ་ཚུན།"
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1059
 msgid "21st to 31st"
-msgstr "༢༡ པ་ལས་ ༣༡ པ་ཚུན།"
+msgstr "༢༡ པ་ ལས་ ༣༡ པ།"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
@@ -6334,7 +6324,7 @@ msgstr "རེར།"
 #. '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 "ངོ་འཕྲད་འདི་ སླར་འབྱུངམ་ཨིན།(_u)"
+msgstr "ངོ་འཕྲད་འདི་ སླར་འབྱུངམ་ཨིན།"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
@@ -6383,8 +6373,8 @@ msgstr "<span weight=\"bold\">གནས་ཚད་</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6393,7 +6383,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:386
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1012
 msgid "High"
 msgstr "མཐོ།"
 
@@ -6410,15 +6400,15 @@ msgstr "ཡར་འཕེལ་འགྱོ་བའི་བསྒང་།"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1010
 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:919
+#: ../calendar/gui/e-cal-model.c:918
 #: ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "སྤྱིར་བཏང་།"
 
@@ -6437,7 +6427,7 @@ msgstr "བརྒྱ་ཆ་མཇུག་བསྡུ་: (_e)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
-msgstr "གནས་ཚད་:(_u)"
+msgstr "གནས་ཚད:(_u)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:389
@@ -6446,7 +6436,7 @@ msgstr "ངེས་འཛིན་མ་འབདཝ།"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
-msgstr "ཚེས་གྲངས་མཇུག་བསྡུ་ཡོདཔ: (_D)"
+msgstr "ཚེས་གྲངས་མཇུག་བསྡུ་ཡོདཔ་: (_D)"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
 #: ../widgets/misc/e-send-options.glade.h:31
@@ -6460,7 +6450,7 @@ msgstr "ཝེབ་ཤོག་ལེབ: (_W)"
 #: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
-msgstr "ལས་ཀ། (_T)"
+msgstr "ལས་ཀ (_T)"
 
 #: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
@@ -6505,7 +6495,7 @@ msgstr "<b>དཔེ་བསྐྲུན་གྱི་འབྱུང་ཐེ
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
-msgstr "<b>དཔེ་བསྐྲུན་གྱི་གནས་ཁོངས་</b> (_L)"
+msgstr "<b>དཔེ་བསྐྲུན་གནས་ཁོངས་</b> (_L)"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
@@ -6616,7 +6606,7 @@ msgstr "མ་ཤེས་པའི་རྒྱུ་རྐྱེན་ཅིག
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2827
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ཁ་ཕྱེ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
@@ -6705,7 +6695,7 @@ msgstr "དལཝ།"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "ཁོམ་མེད།"
 
@@ -6720,19 +6710,19 @@ msgstr ""
 "༤༥.༤༣༦༨༤༥,༡༢༥.༨༦༢༥༠༡"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ཨིན།"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "མེན།"
@@ -6746,23 +6736,23 @@ msgstr "མེན།"
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
 #: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "མ་ཤེསཔ།"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "སླར་འབྱུང་།"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "འགན་སྤྲོད་།"
 
@@ -6772,7 +6762,7 @@ msgid "Save As..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:1916
+#: ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "སེལ་འཐུ་འབད་མི་ མཉམ་སྦྲགས་ཚུ་ བསྲུང་ནི་འི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
@@ -6783,10 +6773,10 @@ msgid "untitled_image.%s"
 msgstr "མགོ་མིང་མ་བཏགས་པའི་གཟུགས་བརྙན་%s། (_i)"
 
 #: ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596
 #: ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092
+#: ../mail/em-folder-view.c:1087
 #: ../mail/em-popup.c:554
 #: ../mail/em-popup.c:565
 msgid "_Save As..."
@@ -6858,29 +6848,29 @@ msgstr "%༡༠༠"
 msgid "Deleting selected objects"
 msgstr "སེལ་འཐུ་འབད་མི་དངོས་པོ་ བཏོན་བཏང་དོ།"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803
 #: ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "དངོས་པོ་དུས་མཐུན་བཟོ་དོ།"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138
 #: ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "དེ་སྦེ་སྲུངས་..."
 
-#: ../calendar/gui/e-calendar-table.c:1249
+#: ../calendar/gui/e-calendar-table.c:1175
 #: ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "ཝེབ་ཤོག་ལེབ་ཁ་ཕྱེ། (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597
 #: ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:44
@@ -6890,8 +6880,8 @@ msgstr "ཝེབ་ཤོག་ལེབ་ཁ་ཕྱེ། (_W)"
 msgid "_Print..."
 msgstr "དཔར་བསྐྲུན་...(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601
 #: ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
@@ -6900,9 +6890,9 @@ msgstr "དཔར་བསྐྲུན་...(_P)"
 msgid "C_ut"
 msgstr "བཏོག (_C)"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603
 #: ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
@@ -6913,30 +6903,30 @@ msgstr "བཏོག (_C)"
 msgid "_Paste"
 msgstr "སྦྱར། (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1261
+#: ../calendar/gui/e-calendar-table.c:1187
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "ལས་ཀ་འགན་སྤྲོད་འབད། (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1262
+#: ../calendar/gui/e-calendar-table.c:1188
 #: ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr "ཨའི་ཟླ་ཐོ་བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད། (_F)"
+msgstr "ཨའི་ཟླ་ཐོ་སྦེ་ གདོང་བསྐྱོད་འབད། (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
-msgstr "མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
+msgstr "མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
-msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_M)"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་བཏོན་གཏང་། (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "ལས་ཀ་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
@@ -6972,109 +6962,109 @@ msgstr "འགོ་བཙུགས་ཚེས་གྲངས།"
 msgid "Task sort"
 msgstr "ལས་ཀའི་དབྱེ་སེལ།"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "འགུལ་བསྐྱོད་འབད་མི་རྣམ་གྲངས།"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "རྣམ་གྲངས་ཚུ་ འདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "ངོ་འཕྲད་གསརཔ་...(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
-msgstr "ཉིནམ་གང་གི་ བྱུང་ལས་གསརཔ།(_E)"
+msgstr "ཉིནམ་གང་གི་བྱུང་ལས་གསརཔ།(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "འཛོམས་འདུ་གསརཔ།(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "ལས་ཀ་གསརཔ།(_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "ད་ལྟོའི་མཐོང་སྣང་། (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
-msgstr "ད་རིས་ སེལ་འཐུ་འབད། (_o)"
+msgstr "ད་རིས་སེལ་འཐུ་འབད། (_o)"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "ཚེས་གྲངས་སེལ་འཐུ་འབད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "ཟླ་ཐོ་ལུ་འདྲ་བཤུས་རྐྱབས་...(_y)"
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "ཟླ་ཐོ་ལུ་སྤོ་བཤུད་འབད་... (_v)"
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "འཛོམས་འདུ་བགོ་སྤེལ་འབད་...(_D)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "འཛོམས་འདུའི་འཆར་རིམ་བཀོད་...(_S)"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "ཨའི་ཟླ་ཐོ་བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད་...(_F)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "ལན་གསལ།(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1724
-#: ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613
+#: ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559
 #: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "ཆ་མཉམ་ལུ་ལན་གསལ་གཏང་། (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "འབྱུང་བ་འདི་ སྤོ་བཤུད་འབད་བཏུབ་བཟོ། (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1730
+#: ../calendar/gui/e-calendar-view.c:1619
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
-msgstr "འབྱུང་བ་འདི་ བཏོན་གཏང་། (_O)"
+msgstr "འབྱུང་བ་འདི་བཏོན་གཏང་། (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "འབྱུང་བ་ཆ་མཉམ་བཏོན་གཏང་། (_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "འགོ་འདྲེན་པ་:%s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2183
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "འགོ་འདྲེན་པ་:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2199
+#: ../calendar/gui/e-calendar-view.c:2053
 #: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "གནས་ཁོངས་:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2230
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "ཆུ་ཚོད་:%s %s"
@@ -7104,7 +7094,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:586
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i སྐར་མའི་སྡེ་ཚན།"
@@ -7115,22 +7105,22 @@ 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:797
-#: ../calendar/gui/e-day-view.c:1500
-#: ../calendar/gui/e-week-view-main-item.c:324
+#: ../calendar/gui/e-day-view-top-item.c:707
+#: ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312
 #: ../calendar/gui/print.c:1525
 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:745
+#: ../calendar/gui/e-day-view.c:744
 #: ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "སྔ་ཆ།"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-day-view.c:747
 #: ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
@@ -7241,8 +7231,8 @@ msgstr "<br> འོག་གི་བརྡ་དོན་ཚུ་ བསྐྱ
 
 #: ../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/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7256,8 +7246,8 @@ msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད་�
 
 #: ../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/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675
 #: ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
@@ -7586,74 +7576,74 @@ msgid "Resources"
 msgstr "ཐོན་ཁུངས་ཚུ།"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "ངོ་རྐྱང་།"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "ཐོན་ཁུངས།"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ཁང་མིག"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "རྐང་ཁྲི།"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "དགོ་པའི་བཅའ་མར་གཏོགས་མི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "གདམ་ཁ་ཅན་གྱི་ བཅའ་མར་གཏོགས་མི།"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "བཅའ་མར་མ་གཏོགས་མི།"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "བྱ་བ་དགོཔ།"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 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/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7662,17 +7652,17 @@ msgstr "བགོ་སྤེལ་འབད་ཡོདཔ།"
 #. The extra space is just a hack to occupy more space for Attendee
 #: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
-msgstr "ངོ་འཛོམས་པ།"
+msgstr "འཛོམས་མི།"
 
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7680,79 +7670,79 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:412
 #: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ཡིག་ཚང་གི་ཕྱི་ཁར།"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "བརྡ་དོན་མིན་འདུག"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "ངོ་འཛོམས་པ་ཚུ་...(_t)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "གདམ་ཁ་ཚུ། (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
-msgstr "ལཱ་འབད་ནིའི་ཆུ་ཚོད་རྐྱངམ་གཅིག་སྟོན། (_o)"
+msgstr "ལཱ་འབད་ནིའི་་ཆུ་ཚོད་རྐྱངམ་གཅིག་སྟོན། (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
-msgstr "ནང་ཟུམ་འབད་ཡོདཔ་སྟོན། (_z)"
+msgstr "ནང་ཟུམ་སྟོན། (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "དལཝ/ཁོམ་མེད་ དུས་མཐུན་བཟོ། (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
-msgstr "_<< (_<)"
+msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "རང་བཞིན་འཐུ་བ། (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
-msgstr ">_>  (_>)"
+msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "མི་མང་དང་ཐོན་ཁུངས་ཆ་མཉམ། (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
-msgstr "མི་མང་ཆ་མཉམ་དང་ ཐོན་ཁུངས་གཅིག (_p)"
+msgstr "མི་་མང་ཆ་མཉམ་དང་ ཐོན་ཁུངས་གཅིག (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "དགོ་པའི་མི་མང་། (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "དགོ་པའི་མི་མང་དང་ ཐོན་ཁུངས་གཅིག (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "འགོ་བཙུགས་ཆུ་ཚོད་: (_S)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "མཇུག་བསྡུ་བའི་ཆུ་ཚོད་: (_E)"
 
@@ -7763,11 +7753,11 @@ msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་
 #: ../calendar/gui/e-memo-table.c:993
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "བརྗེད་ཐོ་ཅིག་ ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "བརྗེད་ཐོ་ཅིག་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་ ཨེབ་གཏང་འབད།"
 
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
-msgstr "བརྗེད་ཐོ་དབྱེ་སེལ།"
+msgstr "བརྗེད་ཐོའི་དབྱེ་སེལ།"
 
 #: ../calendar/gui/e-memos.c:724
 #: ../calendar/gui/e-tasks.c:836
@@ -7782,12 +7772,12 @@ msgstr ""
 
 #: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
-msgstr "བརྗེད་ཐོ་ཚུ་མངོན་གསལ་འབད་དོ།"
+msgstr "བརྗེད་ཐོ་ཚུ་ མངོན་གསལ་འབད་དོ།"
 
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
-msgstr "%sལུ་ བརྗེད་ཐོ་ཚུ་ཁ་ཕྱེ་དོ།"
+msgstr "%sལུ་ བརྗེད་ཐོ་ཚུ་ ཁ་ཕྱེ་དོ།"
 
 #: ../calendar/gui/e-memos.c:1026
 #: ../calendar/gui/e-tasks.c:1239
@@ -7823,7 +7813,7 @@ 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:341
+#: ../calendar/gui/e-week-view-main-item.c:329
 #: ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
@@ -7917,7 +7907,7 @@ msgstr "སྤྱི་ཟླ་དགུ་པ།"
 
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
-msgstr "ད་རིས་ སེལ་འཐུ་འབད། (_S)"
+msgstr "ད་རིས་སེལ་འཐུ་འབད། (_S)"
 
 #: ../calendar/gui/itip-utils.c:412
 #: ../calendar/gui/itip-utils.c:461
@@ -7978,34 +7968,12 @@ msgstr "ཁྱོད་ བྱུང་ལས་དེ་གི་ ངོ་འ�
 msgid "You must be an attendee of the event."
 msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན།"
 
-#: ../calendar/gui/memos-component.c:451
-#: ../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 "འདྲ་བཤུས།"
-
-#: ../calendar/gui/memos-component.c:452
-#: ../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 "བཏོན་གཏང་།"
-
-#: ../calendar/gui/memos-component.c:453
-msgid "Properties..."
-msgstr "རྒྱུ་དངོས་ཚུ་..."
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "བརྗེད་ཐོ་%d"
-msgstr[1] "བརྗེད་ཐོ་%d"
+msgstr[0] "བརྗེད་ཐོ་%d།"
+msgstr[1] "བརྗེད་ཐོ་%d།"
 
 #: ../calendar/gui/memos-component.c:528
 #: ../calendar/gui/tasks-component.c:519
@@ -8023,11 +7991,11 @@ msgstr "བརྗེད་ཐོ་ཚུ་ ཡར་བསྐྱེད་འ�
 #: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་གྱི་དོན་ལུ་ བརྗེད་ཐོའི་་ཐོ་ཡིག་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "བྱུང་ལས་དང་ འཛོམས་འདུ་ཚུ་ གསར་བསྐྲུན་འབད་ནིའི་དོན་ལུ་ བརྗེད་ཐོ་ཐོ་ཡིག་'%s' ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
-msgstr "བརྗེད་ཐོ་ཚུ་ གསར་བསྐྲུན་གྱི་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
+msgstr "བརྗེད་ཐོ་ཚུ་ གསར་བསྐྲུན་འབད་ནིའི་དོན་ལུ་ ཟླ་ཐོ་འཐོབ་མི་ཚུགས་པས།"
 
 #: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
@@ -8043,7 +8011,7 @@ msgstr "བརྗེད་ཐོ།(_M)"
 
 #: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
-msgstr "བརྗེད་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
+msgstr "བརྗེད་ཐོ་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད།"
 
 #: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
@@ -8400,7 +8368,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག  (_i)"
 msgid "Create a new task list"
 msgstr "ལས་ཀ་གསར་པའི་ཐོ་ཡིག་ཅིག་ གསར་བསྐྲུན་འབད།"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
 "\n"
@@ -8410,11 +8378,11 @@ msgstr ""
 "\n"
 "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་པ་ཅིན་ ལས་ཀ་འདི་ཚུ་ སོར་ཆུད་འབད་མི་ཚུགས། ལས་ཀ་འདི་ཚུ་ ཐད་རི་འབད་རི་ ཀྲེག་གཏང་ནི་ཨིན་ན?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "ང་ལུ་ ལོག་སྟེ་མ་འདྲི།"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "ལས་ཀ་ཚུ་ དཔར་བསྐྲུན་འབད།"
 
@@ -8475,7 +8443,7 @@ msgstr "ཨཕ་རི་ཀ/ཨེཀ་ར།"
 
 #: ../calendar/zones.h:9
 msgid "Africa/Addis_Ababa"
-msgstr "ཨཕ་རི་ཀ/ཨ་ཌིསི་ ཨ་བ་བ།  (_A)"
+msgstr "ཨཕ་རི་ཀ/ཨ་ཌིསི་_ཨ་བ་བ།  (_A)"
 
 #: ../calendar/zones.h:10
 msgid "Africa/Algiers"
@@ -8535,7 +8503,7 @@ msgstr "ཨཕ་རི་ཀ/ཌ་ཀར།"
 
 #: ../calendar/zones.h:24
 msgid "Africa/Dar_es_Salaam"
-msgstr "ཨཕ་རི་ཀ/ད་རེསི་ས་ལམ། "
+msgstr "ཨཕ་རི་ཀ/ད་རེསི་ ས་ལམ། "
 
 #: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
@@ -8547,7 +8515,7 @@ msgstr "ཨཕ་རི་ཀ/དོ་ཝ་ལ།"
 
 #: ../calendar/zones.h:27
 msgid "Africa/El_Aaiun"
-msgstr "ཨཕ་རི་ཀ/ཨིལ་ཨ་ཡུན། (_A)"
+msgstr "ཨཕ་རི་ཀ/ཨེལ་ ཨའི་ཡུན། (_A)"
 
 #: ../calendar/zones.h:28
 msgid "Africa/Freetown"
@@ -8731,7 +8699,7 @@ msgstr "ཨ་མི་རི་ཀ/བུས་ནོསི་ཨེ་རེ�
 
 #: ../calendar/zones.h:73
 msgid "America/Cambridge_Bay"
-msgstr "ཨ་མི་རི་ཀ/ཀེམ་བིརིཇི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/ཀེམ་བིརིཇི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:74
 msgid "America/Cancun"
@@ -8811,7 +8779,7 @@ msgstr "ཨ་མི་རི་ཀ/ཨི་རུ་ནེ་པི།"
 
 #: ../calendar/zones.h:93
 msgid "America/El_Salvador"
-msgstr "ཨ་མི་རི་ཀ/ཨེལ་ སེལ་བེ་ཌོར།(_S)"
+msgstr "ཨ་མི་རི་ཀ/ཨེལ་སེལ་བེ་ཌོར།(_S)"
 
 #: ../calendar/zones.h:94
 msgid "America/Fortaleza"
@@ -8819,7 +8787,7 @@ msgstr "ཨ་མི་རི་ཀ/ཕོར་ཊ་ལི་ཛ།"
 
 #: ../calendar/zones.h:95
 msgid "America/Glace_Bay"
-msgstr "ཨ་མི་རི་ཀ/གེལེསི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/གེལེསི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:96
 msgid "America/Godthab"
@@ -8827,11 +8795,11 @@ msgstr "ཨ་མི་རི་ཀ/གོཌི་ཐབ།"
 
 #: ../calendar/zones.h:97
 msgid "America/Goose_Bay"
-msgstr "ཨ་མི་རི་ཀ/གུསི་ བཱེ།(_B)"
+msgstr "ཨ་མི་རི་ཀ/གུསི་བཱེ།(_B)"
 
 #: ../calendar/zones.h:98
 msgid "America/Grand_Turk"
-msgstr "ཨ་མི་རི་ཀ/གེརེནཌི་ ཊརཀ(_T)"
+msgstr "ཨ་མི་རི་ཀ/གེརེནཌི་ཊརཀ(_T)"
 
 #: ../calendar/zones.h:99
 msgid "America/Grenada"
@@ -8915,7 +8883,7 @@ msgstr "ཨ་མི་རི་ཀ/ཀེན་ཊ་ཀི/མཱོན་ཊ�
 
 #: ../calendar/zones.h:119
 msgid "America/La_Paz"
-msgstr "ཨ་མི་རི་ཀ/ལཱ་ པཱཛ། (_P)"
+msgstr "ཨ་མི་རི་ཀ/ལཱ་པཱཛ། (_P)"
 
 #: ../calendar/zones.h:120
 msgid "America/Lima"
@@ -8992,7 +8960,7 @@ msgstr "ཨ་མི་རི་ཀ/ན་སའོ།"
 #: ../calendar/zones.h:138
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "America/New_York"
-msgstr "ཨ་མི་རི་ཀ/ནིའུ་ཡོརཀ། (_Y)"
+msgstr "ཨ་མི་རི་ཀ/ནིའུ་ཡོརོཀ(_Y)"
 
 #: ../calendar/zones.h:139
 msgid "America/Nipigon"
@@ -9040,7 +9008,7 @@ msgstr "ཨ་མི་རི་ཀ/པོར་ཊོ་བེ་ལྷོ།(_
 
 #: ../calendar/zones.h:150
 msgid "America/Puerto_Rico"
-msgstr "ཨ་མི་རི་ཀ/པུར་ཊོ་རི་ཀོ(_R)"
+msgstr "ཨ་མི་རི་ཀ/པུར་ཊོ་རི་ཀོ།(_R)"
 
 #: ../calendar/zones.h:151
 msgid "America/Rainy_River"
@@ -9092,7 +9060,7 @@ msgstr "ཨ་མི་རི་ཀ/སེནཊི་ཇཱོནསི།(_J)"
 
 #: ../calendar/zones.h:163
 msgid "America/St_Kitts"
-msgstr "ཨ་མི་རི་ཀ/སེན་ཊི་ཀིཊིསི།(_K)"
+msgstr "ཨ་མི་རི་ཀ/སེནཊི་ཀིཊིསི།(_K)"
 
 #: ../calendar/zones.h:164
 msgid "America/St_Lucia"
@@ -9536,11 +9504,11 @@ msgstr "ཨེཊི་ལེན་ཊིཀ་/རེག་ཇ་བིཀ།"
 
 #: ../calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/སའུཐ་ཇོར་ཇི་ཡ།(_G)"
+msgstr "ཨེཊི་ལེན་ཊིཀ་/སའུཐ་-ཇོར་ཇི་ཡ།(_G)"
 
 #: ../calendar/zones.h:275
 msgid "Atlantic/St_Helena"
-msgstr "ཨེཊི་ལེན་ཊིཀ་/ཨེནཊི་ཧེ་ལི་ན།(_H)"
+msgstr "ཨེཊི་ལེན་ཊིཀ་/སེནཊི་ཧེ་ལི་ན།(_H)"
 
 #: ../calendar/zones.h:276
 msgid "Atlantic/Stanley"
@@ -10009,7 +9977,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་།"
 
@@ -10033,15 +10001,15 @@ msgstr "ཡིག་སྣོད་%s: %sམཉམ་སྦྲགས་འབད
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ཡིག་སྣོད་%s: མཉམ་སྦྲགས་འབད་མི་ཚུགས་པས། དུས་རྒྱུན་གྱི་ཡིག་སྣོད་ཅིག་མེན་པས།"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "གནས་བསྐྱོད་འགྲོ་ཡུལ།"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "འཕྲིན་དོན་གནས་བསྐྱོད་ཀྱི་དོན་ལས་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
@@ -10052,60 +10020,60 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་དོན་ལས་
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "ལན་གསལ་གཏང་ཡུལ་:(_R)"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
-msgstr "ལས་:(_o)"
+msgstr "ལས:(_o)"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "དོན་ཚན་:(_u)"
 
-#: ../composer/e-msg-composer-hdrs.c:645
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
-msgstr "ལུ་: (_T)"
+msgstr "ལུ: (_T)"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "འཕྲིན་དོན་ལེན་མཁན་བཙུགས།"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
-msgstr "སི་སི་: (_C)"
+msgstr "ཤོག་གནག་འདྲ་བཤུས་: (_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "འཕྲིན་དོན་གྱི་ཤོག་གནག་འདྲ་བཤུས་ཅིག་འཐོབ་ནིའི་ ཁ་བྱང་ཚུ་བཙུགས།"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
-msgstr "བི་སི་སི་: (_C)"
+msgstr "མ་མཐོང་བའི་ཤོག་གནག་འདྲ་བཤུས་: (_C)"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
 msgstr "འཕྲིད་དོན་ལེན་མཁན་གྱི་ ཐོ་ཡིག་ནང་མ་ཐོན་པར་ འཕྲིན་དོན་གྱི་ ཤོག་གནག་འདྲ་བཤུས་ཅིག་འཐོབ་ནིའི་ ཁ་བྱང་ཚུ་བཙུགས།"
 
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
-msgstr "གནས་བསྐྱོད་ཡུལ་: (_P)"
+msgstr "གནས་བསྐྱོད་ཡུལ། (_P)"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "གནས་བསྐྱོད་འབད་ནིའི་ ཡིག་སྣོད་ཚུ་སེལ་འཐུ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
-#: ../composer/e-msg-composer-hdrs.c:672
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "གནས་བསྐྱོད་ཡུལ:"
 
@@ -10115,7 +10083,7 @@ msgstr "མཉམ་སྦྲགས་འབད།(_t)"
 
 #: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
-msgstr "མཉམ་སྦྲགསབཙུགས།"
+msgstr "མཉམ་སྦྲགས་བཙུགས།"
 
 #: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
@@ -10128,13 +10096,13 @@ msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ གསང་�
 #: ../composer/e-msg-composer.c:1295
 #: ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ་བཞག(_A)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྦ།(_A)"
 
 #: ../composer/e-msg-composer.c:1298
 #: ../composer/e-msg-composer.c:2511
 #: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
-msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན།(_A)"
+msgstr "མཉམ་སྦྲགས་ཕྲ་རིང་སྟོན་།(_A)"
 
 #: ../composer/e-msg-composer.c:1330
 #: ../composer/e-msg-composer.c:1364
@@ -10174,7 +10142,7 @@ msgstr "མིང་རྟགས:(_g)"
 #: ../composer/e-msg-composer.c:3747
 #: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
-msgstr "འཕྲིན་དོན་བརྩམས།"
+msgstr "འཕྲིན་དོན་བརྩམ།"
 
 #: ../composer/e-msg-composer.c:4974
 msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
@@ -10286,7 +10254,7 @@ msgstr "ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་མ་བ�
 
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
-msgstr "སླར་སོར་མ་འབད།(_D)"
+msgstr "སླར་གསོ་མ་འབད།(_D)"
 
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
@@ -10298,7 +10266,7 @@ msgstr "འཕྲིན་དོན་སྲུངས། (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ཨི་བོ་ལུ་ཤཱན།"
 
@@ -10309,7 +10277,7 @@ msgstr "གུ་རུབ་ཝེར་ སུཊི།"
 
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ ཡིག་འཕྲིན་ཞབས་ཏོ་སྤྱོད་མི།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ པི་ཨའི་ཨེམ་དང་ གློག་འཕྲིན་ཞབས་ཏོག་སྤྱོད་མི།"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10355,7 +10323,7 @@ msgstr "ད་ལྟོ་ང་ ཡིག་ཚང་གི་ཕྱི་ཁ�
 
 #: ../designs/OOA/ooa.glade.h:10
 msgid "No, Do not Change Status"
-msgstr "མེན། གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད།"
+msgstr "མི་བཏུབ་ གནས་ཚད་བསྒྱུར་བཅོས་མ་འབད།"
 
 #: ../designs/OOA/ooa.glade.h:12
 msgid "Out of Office Assistant"
@@ -10448,7 +10416,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་འདྲི་དཔ
 #: ../e-util/e-error.c:443
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
-msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ་ མ་ཤེས་པའི་འཛོལ་བ་ '%s' ཞུ་བ་འབད་ཡོདཔ།"
+msgstr "ནང་འཁོད་ཀྱི་འཛོལ་བ། མ་ཤེས་པའི་འཛོལ་བ་ '%s' གི་ཞུ་བ་འབད་ནུག"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10542,28 +10510,27 @@ 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:289
 msgid "Choose a file"
 msgstr "ཡིག་སྣོད་ཅིག་ གདམ་ཁ་རྐྱབས།"
 
 #: ../filter/filter-label.c:121
 #: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
+#: ../mail/em-migrate.c:1052
 #: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "གལ་ཅན།"
 
 #. forest green
 #: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "ཊུ་ཌུ"
 
 #. blue
 #: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "ཤུལ་ལས།"
@@ -10579,7 +10546,7 @@ msgstr "མིང་འཚོལ་ཞིབ་འབད་: (_S)"
 
 #: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
-msgstr "འོག་གི་ཁྱད་ཚད་ཚང་མི་ རྣམ་གྲངས་ཚུ་འཚོལ།"
+msgstr "འོག་གི་ཁྱད་ཚད་ཚང་མི་རྣམ་གྲངས་ཚུ་འཚོལ།"
 
 #: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
@@ -10587,7 +10554,7 @@ msgstr "ཁྱད་ཚད་ཆ་མཉམ་ཚང་པ་ཅིན།"
 
 #: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
-msgstr "ཁྱད་ཚད་གང་རུང་ཚང་པ་ཅིན།"
+msgstr "ཁྱད་ཚད་གང་རུང་ཅིག་ཚང་པ་ཅིན།"
 
 #: ../filter/filter-rule.c:868
 msgid "Find items:"
@@ -10607,7 +10574,7 @@ msgstr "ལན་གསལ་ཚུ་དང་ རྩ་ལག་ཚུ།"
 
 #: ../filter/filter-rule.c:889
 msgid "No reply or parent"
-msgstr "ལན་གསལ་ ཡང་ན་ མ་ལག་མིན་འདུག"
+msgstr "ལན་གསལ་ ཡང་ན་ རྩ་ལག་མིན་འདུག"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
@@ -10787,7 +10754,7 @@ msgid "Evolution Mail preferences control"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཡིག་འཕྲིན་གྱི་ དགའ་གདམ་ཚད་འཛིན།"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:518
+#: ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387
@@ -10961,7 +10928,7 @@ msgstr "$ལུ་ (ཨེབ་བིརིབ་ ཝིཀ་ཌེ་ ནེ�
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
-msgstr "བཙག་ནིའི་ལམ་ལུགས། (_F)"
+msgstr "ཚགས་མའི་ལམ་ལུགས། (_F)"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11000,6 +10967,15 @@ 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 "བཏོན་བཏང་ཡོད།"
@@ -11099,7 +11075,7 @@ msgid "Junk Test"
 msgstr "མཁོ་མེད་བརྟག་ཞིབ།"
 
 #: ../mail/em-filter-i18n.h:37
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ཁ་ཡིག"
 
@@ -11178,7 +11154,6 @@ msgid "Score"
 msgstr "སྐུགས་གྲངས།"
 
 #: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:11
 msgid "Sender"
 msgstr "གཏང་མི།"
 
@@ -11215,7 +11190,7 @@ msgstr "ལས་སྦྱོར་བཀག"
 #: ../mail/em-format-quote.c:313
 #: ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11247,7 +11222,7 @@ msgstr[1] "འཕྲིན་དོན་བསྡོམས་: "
 #: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ་:"
+msgstr[0] "མ་ལྷག་པའི་འཕྲིན་དོན་:"
 msgstr[1] "མ་ལྷག་པའི་འཕྲིན་དོན་ཚུ་:"
 
 #: ../mail/em-folder-properties.c:316
@@ -11307,53 +11282,53 @@ msgstr "བཏང་ཡོད།"
 msgid "Loading..."
 msgstr "མངོན་གསལ་འབད་དོ་...།"
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "ཡིག་འཕྲིན་སྣོད་འཛིན་གྱི་རྩ་འབྲེལ།"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "འགུལ་བསྐྱོད་འབད་མི་སྣོད་འཛིན་%s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "སྣོད་འཛིན་%sའདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../mail/em-folder-tree.c:870
-#: ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863
+#: ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ སྤོ་བཤུད་འབད་དོ།"
 
-#: ../mail/em-folder-tree.c:872
-#: ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865
+#: ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་%sནང་ལུ་ འདྲ་བཤུས་རྐྱབ་དོ།"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "འཕྲིན་དོན་(ཚུ)ཆེ་རིམ་མཛོད་ཁང་ནང་ བཀོག་བཞག་མི་ཚུགས་པས།"
 
-#: ../mail/em-folder-tree.c:984
+#: ../mail/em-folder-tree.c:977
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་རྐྱབས། (_C)"
 
-#: ../mail/em-folder-tree.c:985
+#: ../mail/em-folder-tree.c:978
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "སྣོད་འཛིན་ལུ་ སྤོ་བཤུད་འབད། (_M)"
 
-#: ../mail/em-folder-tree.c:1690
+#: ../mail/em-folder-tree.c:1683
 #: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "སྣོད་འཛིན་ཚུ་\"%s\"ནང་ལུ་ ཞིབ་ལྟ་འབད་དོ།"
 
-#: ../mail/em-folder-tree.c:2049
+#: ../mail/em-folder-tree.c:2042
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24
 #: ../ui/evolution-mail-global.xml.h:24
@@ -11364,29 +11339,29 @@ msgstr "སྣོད་འཛིན་ཚུ་\"%s\"ནང་ལུ་ ཞི�
 msgid "_View"
 msgstr "མཐོང་སྣང་། (_V)"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
-msgstr "ཝིན་ཌོ་གསར་པའི་ནང་ཁ་ཕྱེ། (_N)"
+msgstr "སྒོ་སྒྲིག་གསར་པའི་ནང་ཁ་ཕྱེ། (_N)"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "འདྲ་བཤུས་...(_C)"
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
-msgstr "སྤོ་བཤུད་འབད་...(_M)"
+msgstr "སྤོ་བཤུད་...(_M)"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "སྣོད་འཛིན་གསརཔ་...(_N)"
 
-#: ../mail/em-folder-tree.c:2062
+#: ../mail/em-folder-tree.c:2055
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "བསྐྱར་མིང་བཏགས་...(_R)"
 
-#: ../mail/em-folder-tree.c:2067
+#: ../mail/em-folder-tree.c:2060
 #: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_ཕྱགས་ཧོད་སྟོངམ་བཏོན། (_E)"
@@ -11397,15 +11372,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "`%s'ལས་`%s'ལུ་ འདྲ་བཤུས་རྐྱབ་དོ"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993
+#: ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988
 #: ../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:993
+#: ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "འདྲ་བཤུས། (_o)"
 
@@ -11427,294 +11402,298 @@ msgstr "སྣོད་འཛིན་གསར་བསྐྲུན་འབད
 msgid "Specify where to create the folder:"
 msgstr "སྣོད་འཛིན་ག་ཏེ་ལུ་ གསར་བསྐྲུན་འབད་ནི་ཨིན་ན་ གསལ་བཀོད་འབད།"
 
-#: ../mail/em-folder-view.c:1086
+#: ../mail/em-folder-view.c:1081
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "གཏང་མི་ལུ་ལན་གསལ་གཏང་། (_R)"
 
-#: ../mail/em-folder-view.c:1088
+#: ../mail/em-folder-view.c:1083
 #: ../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:1091
+#: ../mail/em-folder-view.c:1086
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
-msgstr "འཕྲིན་དོན་གསརཔ་སྦེ་ ཞུན་དག་རྐྱབས། (_E)"
+msgstr "འཕྲིན་དོན་གསརཔ་སྦེ་ ཞུན་དག་རྐྱབས་...(_E)"
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "བཏོན་བཤོལ། (_n)"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
-msgstr "སྣོད་འཛིན་ལུ་སྤོ་བཤུད་འབད་...(_M)"
+msgstr "སྣོད་འཛིན་ལུ་སྤོ་བཤུད་...(_M)"
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
-msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་རྐྱབས་...(_C)"
+msgstr "སྣོད་འཛིན་ལུ་འདྲ་བཤུས་རྐྱབས་...(_C)"
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
-msgstr "ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ། (_k)"
+msgstr "ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_k)"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
-msgstr "མ་ལྷགཔ་སྦེ་ རྟགས་བཀལ། (_U)"
+msgstr "མ་ལྷགཔ་སྦེ་རྟགས་བཀལ། (_U)"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
-msgstr "གལ་ཅན་སྦེ་ རྟགས་བཀལ། (_I)"
+msgstr "གལ་ཅན་སྦེ་རྟགས་བཀལ། (_I)"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
-msgstr "གལ་ཅན་མེནམ་སྦེ་ བཏགས་བཀལ། (_M)"
+msgstr "གལ་ཅན་མེནམ་སྦེ་རྟགས་བཀལ། (_M)"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
-msgstr "མཁོ་མེད་སྦེ་ རྟགས་བཀལ། (_J)"
+msgstr "མཁོ་མེད་སྦེ་རྟགས་བཀལ། (_J)"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
-msgstr "མཁོ་མེད་མེནམ་སྦེ་ རྟགས་བཀལ། (_N)"
+msgstr "མཁོ་མེད་མེནམ་སྦེ་རྟགས་བཀལ། (_N)"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
-msgstr "ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ རྟགས་བཀལ་...(_w)"
+msgstr "ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་རྟགས་བཀལ་...(_w)"
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "ཁ་ཡིག(_L)"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "ཅི་མེད།(_N)"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "ཟུར་རྟགས་མཇུག་བསྡུ་ཡོད། (_g)"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "ཟུར་རྟགས་བསལ། (_e)"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "འཕྲིན་དོན་ནང་ལས་ ལམ་ལུགས་གསར་བསྐྲུན་འབད། (_t)"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "དོན་ཚན་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_S)"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "གཏང་མི་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_n)"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "ལེན་མཁན་ཚུ་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_R)"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "འཕྲིན་གཏང་ཐོ་ཡིག་ནང་ལས་ སྣོད་འཛིན་འཚོལ་ཞིབ་འབད། (_L) "
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "དོན་ཚན་ལུ་བཙགས། (_j)"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "གཏང་མི་ལུ་བཙགས། (_d)"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "ལེན་མཁན་ཚུ་ལུ་བཙགས། (_c)"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "འཕྲིན་གཏང་ཐོ་ཡིག་ལུ་བཙགས། (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972
-#: ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "སྔོན་སྒྲིག་འབད།"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../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:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "འཕྲིན་དོན་སླར་འདྲེན་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "འབྲེལ་ལམ་གནས་ཁོངས་ འདྲ་བཤུས་རྐྱབས། (_C)"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "འཚོལ་ཞིབ་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད།(_S)"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "ཁ་བྱང་འདི་ནང་ལས། (_F)"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "ཁ་བྱང་འདི་ནང་ལུ། (_T)"
 
-#: ../mail/em-folder-view.c:2822
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "ཡིག་འཕྲིན་%sལུ་ ཨེབ་གཏང་འབད།"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "%d མཐུན་པས།"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 #: ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "མིང་རྟགས་མ་བཀོདཔ།"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 msgid "This message is not signed. There is no guarantee that this message is authentic."
 msgstr "འཕྲིན་དོན་འདི་ལུ་ མིང་རྟགས་མ་བཀོདཔ་ལས་ འཕྲིན་དོན་འདི་ བདེན་པ་ཨིན་པའི་ ཉེན་ལེན་འབད་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 #: ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "ནུས་ཅན་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 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:761
+#: ../mail/em-format-html-display.c:758
 #: ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "ནུས་མེད་མིང་རྟགས།"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:758
 msgid "The signature of this message cannot be verified, it may have been altered in transit."
 msgstr "འཕྲིན་དོན་འདི་གི་ མིང་རྟགས་འདི་ བདེན་སྦྱོར་འབད་མི་ཚུགས་པས། གཏོང་ལེན་ནང་ལུ་ མེདཔ་བཏང་གདའཔ་འོང་ནི་མས།"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "མིང་རྟགས་ནུས་ཅན་ཨིན་པས། དེ་འབདཝ་ད་ གཏང་མི་བདེན་སྦྱོར་འབད་མི་ཚུགས་པས།"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 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:768
+#: ../mail/em-format-html-display.c:765
 #: ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "གསང་བ་མ་བཟོཝ།"
 
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:765
 msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོཝ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ གཏོང་ལེན་འབད་བའི་སྐབས་མཐོང་འོང་།"
+msgstr "འཕྲིན་དོན་འདི་ གསང་བ་མ་བཟོཝ་ལས་ འདི་གི་ནང་དོན་ཚུ་ ཨིན་ཊར་ནེཊི་བརྒྱུད་དེ་ གཏོང་ལེན་འབད་བའི་སྐབས་མཐོང་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 #: ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "གསང་བཟོ་ལེགས་ཤོམ་མ་འགྱོ་བས།"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོའི་ཨཱལ་གོ་རི་དམ་ ཤུགས་མེད་ཅིག་གི་ཐོག་ལས་གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་མཚམས་ཅིག་ཡོད་རུང་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ མཐོང་མ་ཚུགསཔ་མེད།"
+msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོ་བའི་ ཨཱལ་གོ་རི་དམ་ ཤུགས་མེད་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་མཚམས་ཅིག་ཡོད་རུང་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ མཐོང་མ་ཚུགསཔ་མེད།"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 #: ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 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:771
+#: ../mail/em-format-html-display.c:768
 #: ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "སྒྲིང་སྒྲིང་སྦེ་ གསང་བ་བཟོ་ནུག"
 
-#: ../mail/em-format-html-display.c:771
+#: ../mail/em-format-html-display.c:768
 msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོའི་ཨཱལ་གོ་རི་དམ་ སྒྲིང་སྒྲིང་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག  ཕྱི་མི་ཅིག་གིས་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ལཱ་ཁག་ཡོད།"
+msgstr "འཕྲིན་དོན་འདི་ གསང་བཟོ་བའི་ ཨཱལ་གོ་རི་དམ་ སྒྲིང་སྒྲིང་ཅིག་གི་ཐོག་ལས་ གསང་བ་བཟོ་ནུག ཕྱི་མི་ཅིག་གིས་ དུས་ཡུན་རན་ཏོག་ཏོ་ཅིག་ནང་ འཕྲིན་དོན་འདི་གི་ནང་དོན་ཚུ་ མཐོང་ཚུགས་པར་ ལཱ་ཁག་ཨིན།"
 
-#: ../mail/em-format-html-display.c:872
+#: ../mail/em-format-html-display.c:869
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
-msgstr "ལག་ཁྱེར་ལུ་སྟོན། (_V)"
+msgstr "ལག་ཁྱེར་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:887
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "ལག་ཁྱེར་འདི་ མཐོང་མི་ཚུགས།"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ལུ་མཇུག་བསྡུ་ཡོད།"
 
-#: ../mail/em-format-html-display.c:1185
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ཧེ་མ་ལས་རན་ཡོདཔ།"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %pལས།"
 
-#: ../mail/em-format-html-display.c:1248
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
-msgstr "ཨིན་ལའིན་ལུ་སྟོན། (_V)"
+msgstr "ཨིན་ལའིན་སྟོན། (_V)"
 
-#: ../mail/em-format-html-display.c:1249
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "སྦ་བཞག (_H)"
 
-#: ../mail/em-format-html-display.c:1250
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "རྒྱ་ཚད་ལུ་ཚུད་སྒྲིག་འབད།(_F)"
 
-#: ../mail/em-format-html-display.c:1251
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
-msgstr "ཐོག་མའི་་ཚད་སྟོན། (_O)"
+msgstr "ཐོག་མའི་ཚད་སྟོན། (_O)"
 
-#: ../mail/em-format-html-display.c:1670
+#: ../mail/em-format-html-display.c:1667
 #: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "མཉམ་སྦྲགས།"
 
-#: ../mail/em-format-html-display.c:1877
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་བསྲུང་ནིའི་དོན་ལུ་ སྣོད་འཛིན་སེལ་འཐུ་འབད།"
 
-#: ../mail/em-format-html-display.c:1924
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
-msgstr "སེལ་འཐུ་འབད་མི་་སྲུངས་...(_S)"
+msgstr "སེལ་འཐུ་འབད་མི་སྲུངས་...(_S)"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1991
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
-msgstr[0] "མཉམ་སྦྲགས་%d། (_n)"
-msgstr[1] "མཉམ་སྦྲགས་%d།(-nt)"
+msgstr[0] "མཉམ་སྦྲགས་%d།(_n)"
+msgstr[1] "མཉམ་སྦྲགས་%d།(_n)"
 
-#: ../mail/em-format-html-display.c:1998
-#: ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:1995
+#: ../mail/em-format-html-display.c:2071
 msgid "S_ave"
-msgstr "སྲུངས། (_a)"
+msgstr "སྲུངས།(_a)"
 
-#: ../mail/em-format-html-display.c:2009
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "ཆ་མཉམ་སྲུངས།(_a)"
 
-#: ../mail/em-format-html-display.c:2070
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "མཉམ་སྦྲགས་མིན་འདུག"
 
@@ -11786,7 +11765,7 @@ msgstr "ལན་གསལ་གཏང་ཡུལ།"
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "ལུ།"
 
@@ -11807,7 +11786,7 @@ msgstr "བི་སི་སི"
 #. pseudo-header
 #: ../mail/em-format-html.c:1588
 #: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:999
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "སྦྲག་སྣོད"
 
@@ -11887,7 +11866,7 @@ msgstr "བདུན་ཕྲག་རེ་ཚར་རེ།"
 msgid "Once per month"
 msgstr "ཟླཝ་རེ་ཚར་རེ།"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
 "\n"
@@ -11897,48 +11876,48 @@ msgstr ""
 "\n"
 "ཨི་བོ་ལུ་ཤཱན་གྱིས་ ཁྱོད་ཀྱི་སྣོད་འཛིན་ཚུ་ གཞིས་སྤོ་འབད་བའི་རིང་ བཟོད་པ་བསྒོམ་གནང་།"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "སྣོད་འཛིན་གསརཔ་`%s': %sབཟོ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "སྣོད་འཛིན་`%s' ལས་`%s': %sལུ་ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s': %sལུ་ ཡོད་བཞིན་པའི་ འཕྲིན་སྒྲོམ་ཚུ་གི་དོན་ལས་ ཞིབ་ལྟ་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr " སར་བར་གནད་སྡུད་%s': %s གུ་བཞག་མི་ པོཔ་་རྙིངམ་ཁ་ཕྱེ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "སར་བར་གནད་སྡུད་སྣོད་ཐོ་ `%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "སར་བར་གནད་སྡུད་`%s': %s གུ་བཞག་མི་ པོཔ་༣ འདྲ་བཤུས་བརྐྱབ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2578
-#: ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577
+#: ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "ཉེ་གནས་ཀྱི་ཡིག་འཕྲིན་ བསག་མཛོད་`%s': %sབཟོ་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s': %sལུ་ ཉེ་གནས་ཀྱི་ ཡིག་འཕྲིན་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
 msgstr "ཧེ་མའི་ ཨི་བོ་ལུ་ཤཱན་ གཞི་བཙུགས་འབད་མི་དེ་ནང་ལས་ གཞི་སྒྲིག་ཚུ་ ལྷག་མ་ཚུགས། `evolution/config.xmldb' མེདཔ་འོང་ནི་དང་ ཡང་ཅིན་ ངན་ཅན་ལུ་ གྱུར་སོངཔ་འོང་ནི་མས།"
 
@@ -11953,9 +11932,13 @@ msgstr "གཏང་མི་ལུ་ ལན་གསལ་གཏང་། (_R)
 msgid "Reply to _List"
 msgstr "ཐོ་ཡིག་ལུ་ ལན་གསལ་གཏང་། (_L)"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "བརའུ་ཟར་ནང་ལུ་ འབྲེལ་ལམ་ཁ་ཕྱེ། (_O)"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
-msgstr "འཕྲིན་དོན་གསརཔ་....ལུ་གཏང་། (_S)"
+msgstr "འཕྲིན་དོན་གསརཔ་གཏང་ཡུལ་... (_S)"
 
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
@@ -11988,7 +11971,7 @@ msgstr "འཕྲིན་དོན་འདི་ ལོག་སྟེ་མ�
 
 #: ../mail/em-utils.c:319
 msgid "Message Filters"
-msgstr "འཕྲིན་དོན་ཚགས་མ་ཚུ།"
+msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།"
 
 #: ../mail/em-utils.c:496
 #: ../mail/em-utils.c:533
@@ -12110,342 +12093,334 @@ msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "ཀེ་རེཊི་ཐབས་ལམ་ ལྕོགས་ཅན་བཟོ། དེ་ལས་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་ལྷག་པའི་སྐབས་ འོད་རྟགས་ཅིག་མཐོང་ཚུགས།"
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Enable or disable type ahead search feature"
-msgstr "ཁྱད་རྣམ་འཚོལ་ཞིབ་མ་འབད་བའི་གོང་ལུ་ དབྱེ་བ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ ལྕོགས་མིན་བཟོ།"
-
-#: ../mail/evolution-mail.schemas.in.in.h:25
-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:26
 msgid "Enable/disable caret mode"
 msgstr "ཀེ་རེཊི་ཐབས་ལམ་ ལྕོགས་ཅན་བཟོ/ལྕོགས་མིན་བཟོ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་པེན་གྱི་ མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:27
 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:30
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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:31
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "མཐའ་མཇུག་ཕྱགས་ཧོད་སྟོངམ་ བཏོན་པའི་དུས་ཚོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "ཁ་ཡིག་ཚུ་གི་ཐོ་ཡིག་དང་ དེ་ཚུ་དང་འབྲེལ་བའི་ཚོས་གཞི་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "དང་ལེན་འབད་མི་ ཆོག་ཐམ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "རྩིས་ཐོ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:33
 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:36
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "སྲོལ་སྒྲིག་མགོ་ཡིག་གི་ ཐོ་ཡིག་དང་ དེ་ཚུ་ལྕོགས་ཅན་ཨིནམ་མེནམ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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:38
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "བོ་ནོ་བོ་གི་ཆ་ཤས་ མཐོང་བྱེད་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་ནིའི་ མ་ཡིམ་གྱི་ དབྱེ་བ་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "ཆོག་ཐམ་དང་ལེན་འབད་ཡོད་པའི་ གནད་སྤེལ་ལམ་ལུགས་ཀྱི་ མིང་ཚུ་གི་ཐོ་ཡིག"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "ཨེཆ་ཊི་ཊི་པི་གུ་ལུ་ ཨེཆ་ཊི་ཨེམ་ཨེལ་གྱི་དོན་ལུ་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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:42
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "གསལ་བཀོད་འབད་མི་ དྲན་དེབ་སྣོད་འཛིན་ལུ་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ །"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "དྲན་དེབ་སྣོད་འཛིན་ལས་ དྲན་དེབ་ཚགས་ནིའི་བྱ་བ་ཚུ་ལུ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "གསལ་བཀོད་འབད་མི་ ངལ་མཚམས་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "འཕྲིན་དོན་གྱི་ \"Preview\" ནང་ལུ་ འདྲེན་ཚིག་ཚུ་ལུ་ རྟགས་བཀལ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་མཐོ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "འཕྲིན་དོན་སྒོ་སྒྲིག་གི་ སྔོན་སྒྲིག་རྒྱ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "འཕྲིན་དོན་བཀྲམ་སྟོན་གྱི་བཟོ་རྣམ།(\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྟོངམ་བཏོན་པའི་ བར་ན་གི་ ཉིན་གྲངས་ཉུང་མཐའ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "ཕྱིར་ཐོན་སྐབས་ ཕྱགས་ཧོད་སྟོངམ་བཏོན་པའི་ བར་ན་གི་ དུས་ཚོད་ཉུང་མཐའ་ ཉིན་གྲངས་ནང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བསྐུལ་གྱི་སྒྲ་སྐད་ཡིག་སྣོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "ཡིག་འཕྲིན་གསར་པའི་ བརྡ་བསྐུལ་གྱི་དབྱེ་བ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "དོན་ཚན་སྟོངམ་ལུ་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "ལག་ལེན་པ་ ཁོའམ་མོ་གིས་ སྣོད་འཛིན་ཅིག་ རྩ་མེད་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "ལག་ལེན་པ་ ཁོའམ་མོ་གིས་ དོན་ཚན་མེད་པའི་ འཕྲིན་དོན་ཅིག་ གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "ལག་ལེན་པ་གིས་ ཕྱིར་བསྐྲད་འབདཝ་ད་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "ལག་ལེན་པ་གིས་ མ་མཐོང་བའི་ཤོག་ནག་འདྲ་བཤུས་ རྐྱངམ་གཅིག་བཀང་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "ལག་ལེན་པ་གིས་ དུས་གཅིག་ལུ་ འཕྲིན་དོན་ ༡༠ པའམ་ དེ་ལས་མངམ་ ཁ་ཕྱེ་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:61
 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:64
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ལག་ལེན་པ་ཅིག་གིས་ ལེན་མཁན་ག་ལུའམ་ འདྲ་དེ་ལུ་ཟེརཝ་མེད་པའི་ འཕྲིན་དོན་གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "ལག་ལེན་པ་གིས་ མ་དགོ་པའི་ ཨེཆ་ཊི་ཨེམ་ཨེལ་ གཏང་ནིའི་འབད་རྩོལ་བསྐྱེད་པའི་སྐབས་ ནུས་སྤེལ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "ཚིག་ཡིག་ཚུ་ནང་ འབྲེལ་ལམ་ངོས་འཛིན་འབད་དེ་ ཚབ་མ་བཙུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "ཚིག་ཡིག་ནང་ སིམའི་ལིསི་ ངོས་འཛིན་འབད་དེ་ དེ་ཚུ་གི་ཚབ་ལུ་ གཟུགས་བརྙན་བཙུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "ནང་འབྱོར་ཡིག་འཕྲིན་ཚུ་ལུ་ མཁོ་མེད་ཀྱི་བརྟག་ཞིབ་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་ཐོག་ལས་གཏང་། "
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ སྔོན་སྒྲིག་ཐོག་ལས་གཏང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "བསྒུལ་པར་སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "བསྒུལ་པར་གཟུགས་བརྙན་ཚུ་ བསྒུལ་པར་བཟུམ་སྦེ་སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "བཏོན་གཏང་མི་ འཕྲིན་དོན་ཚུ་ འཕྲིན་དོན་ཐོ་ཡིག་ནང་ (སྦུག་འབྲེག་དང་བཅསཔ་སྦེ)སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "བཏོན་གཏང་མི་འཕྲིན་དོན་ཚུ་ འཕྲིན་དོན་ཐོ་ཡིག་ནང་སྟོན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "ཡིག་འཕྲིན་གསརཔ་ལྷོདཔ་ད་ གཏང་ནིའི་སྒྲ་སྐད་ཡིག་སྣོད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "ལག་ལེན་པ་གིས་ ལག་ལེན་འཐབ་འདོད་ཡོད་མི་ ཡིག་འཕྲིན་བརྡ་བསྐུལ་གསར་པའི་དབྱེ་བ་དེ་ གསལ་བཀོད་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "ཡིག་སྡེབ་ཞིབ་དཔྱད་ཀྱི་ ཨིན་ལའིན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་མཐོ་ཚད་ མཁོ་མངགས་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "ཌའི་ལོག་སྔོན་སྒྲིག་གི་རྒྱ་ཚད་ མཁོ་མངགས་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "ཊར་མི་ནཱལ་ ཡིག་གཟུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "གལ་ཅན་དུས་ཚོད་ལས་ཚུར་ ཕྱགས་ཧོད་སྟོངམ་སྟོན་པའི་ མཐའ་མཇུག་གི་དུས་ཚོད་ ཉིན་གྲངས་ནང་།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཊར་མི་ནཱལ་ཡིག་གཟུགས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་གྱི་དོན་ལས་ ཡིག་གཟུགས་རྒྱ་ཚད་ཀྱི་འགྱུར་བ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:84
 msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
 msgstr "ལྡེ་མིག་འདི་ནང་ ཨེགསི་ཨེམ་ཨེལ་གྱི་ གཞི་བཀོད་ཀྱི་ཐོ་ཡིག་ཅིག་ཡོད་དགོཔ་ད་ དེ་གིས་སྲོལ་སྒྲིག་མགོ་ཡིག་ཚུ་དང་ དེ་ཚུ་བཀྲམ་སྟོན་ འབད་དགོ་ག་མིན་དགོ་ཚུ་ གསལ་བཀོད་འབདཝ་ཨིན། ཨེགསི་ཨེམ་ཨེལ་ གཞི་བཀོད་ཀྱི་རྩ་སྒྲིག་དེ་ &lt;header enabled&gtཨིན། ཡིག་འཕྲིན་མཐོང་སྣང་ནང་ མགོ་ཡིག་བཀྲམ་སྟོན་ འབད་དགོ་པ་ཅིན་ ལྕོགས་ཅན་བཟོ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "དོན་ཚན་ལུ་ གཞི་བཞག་སྟེ་ འཕྲིན་དོན་ཐོ་ཡིག་ ཐེ་རེཌི་འབད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "འཕྲིན་དོན་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "འཕྲིན་དོན་མཐོང་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནིའི་དུས་ཚོད་ཀྱི་ ངལ་མཚམས།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "སྔོན་སྒྲིག་རྩིས་ཐོའི་ ཡུ་ཨའི་ཌི་ ཡིག་རྒྱུན།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ ཞབས་ཏོག་སྤྱོད་མི་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "སི་པ་མ་ས་སིན་ ཌེ་མཱོན་དང་ ཞབས་ཏོག་སྤྱོད་མི་ ལག་ལེན་འཐབ།(ཨེསི་པི་ཨེ་ཨེམ་སི/ཨེསི་པི་ཨེ་ཨེམ་ཌི)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "ཡིག་འཕྲིན་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ སྲོལ་སྒྲིག་ཡིག་གཟུགས་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་ བརྟག་ཞིབ་རྐྱངམ་གཅིག་ ལག་ལེན་འཐབ།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "ཉེ་གནས་ཀྱི་ སི་པམ་བརྟག་ཞིབ་རྐྱངམ་གཅིག་ ལག་ལེན་འཐབ། (ཌི་ཨེན་ཨེསི་ ལག་ལེན་མ་འཐབ)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "འགྱུར་བའི་ཡིག་གཟུགས་ཀྱི་རྒྱ་ཚད།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "མཐོང་སྣང་/བི་སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "མཐོང་སྣང་/བི་སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "མཐོང་སྣང་/སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "མཐོང་སྣང་/སི་སི་ དཀར་ཆག་རྣམ་གྲངས་ ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི།།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "དཀར་ཆག་རྣམ་གྲངས་ནང་ལས་ སྟོན་ནི་ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བསྐྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ གནས་བསྐྱོད་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "མཐོང་སྣང་/དཀར་ཆག་རྣམ་གྲངས་ལུ་ ལན་གསལ་འབད་ནི་ ཞིབ་དཔྱད་འབད་ཡི།"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "འཕྲིན་དོན་ཚུ་ནང་ དེ་གི་ལན་ལུ་བའམ་ འབྲེལ་གཏུགས་ཀྱི་མགོ་ཡིག་ བཀོད་བཀོདཔ་མེད་པའི་སྐབས་ དོན་ཚན་བཞིན་དུ་སྦེ་ གློ་བུར་རྒྱབ་ཐག་ལུ་ ཐེ་རེཌི་འབད་དགོཔ་ཨིན་ན་མེན།"
 
@@ -12481,7 +12456,7 @@ msgstr "བར་ཀེ་ལེ་ཡིག་སྒྲོམ་ རྩ་ས�
 
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%sནང་འདྲེན་འབད་དོ།"
@@ -12489,7 +12464,7 @@ msgstr "`%sནང་འདྲེན་འབད་དོ།"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "བསྒུག་སྡོད་གནང་།"
 
@@ -12731,7 +12706,7 @@ msgstr "    "
 
 #: ../mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
-msgstr "རྒྱབ་སྐྱོར་ཡོད་པའི་དབྱེ་བའི་དོན་ལུ་་ཞིབ་དཔྱད་འབད། (_e)"
+msgstr "རྒྱབ་སྐྱོར་ཡོད་པའི་དབྱེ་བའི་དོན་ལུ་ཞིབ་དཔྱད་འབད། (_e)"
 
 #: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
@@ -12739,7 +12714,7 @@ msgstr "<b>ཨེསི་ཨེསི་ཨེལ་དེ་ ཨི་བོ�
 
 #: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
-msgstr " <b>མིང་རྟགས་ཚུ་</b> (_n)"
+msgstr " <b>མིང་རྟགས་ཚུ་</b> "
 
 #: ../mail/mail-config.glade.h:6
 msgid "<b>_Languages</b>"
@@ -12868,11 +12843,11 @@ msgstr "གསང་བཟོས་འཕྲིན་དོན་ གཏང་�
 
 #: ../mail/mail-config.glade.h:40
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ཨ་རྟག་ར་ཤོག་གནག་འདྲ་བཤུས་གཏང་ཡུལ་:\"(_s)"
+msgstr "ཨ་རྟག་ར་ཤོག་གནག་འདྲ་བཤུས་(སི་སི)གཏང་ཡུལ་:\"(_s)"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ཨ་རྟག་ར་ མཐོང་མེད་ཤོག་གནག་འདྲ་བཤུས་གཏང་ཡུལ་: (_b)"
+msgstr "ཨ་རྟག་ར་ མཐོང་མེད་ཤོག་གནག་འདྲ་བཤུས་(བི་སི་སི)གཏང་ཡུལ་: (_b)"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always _trust keys in my keyring when encrypting"
@@ -12888,7 +12863,7 @@ msgstr "འཕྲིན་དོན་འདྲ་དང་པ་ མཉམ་�
 
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
-msgstr "རང་བཞིན་གྱིས་ སི་མའི་ལི་གཟུགས་བརྙན་ཚུ་བཙུགས། (_s)"
+msgstr "རང་བཞིན་གྱིས་ སི་མའི་ལི་གཟུགས་བརྙན་ཚུ་བཙུགསཔ་ཨིན། (_s)"
 
 #: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
@@ -12932,7 +12907,7 @@ msgstr "བསལ། (_r)"
 
 #: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
-msgstr "སྡེབ་འཛོལ་མི་ མིང་ཚིག་ཚུ་གི་དོན་ལུ་ཚོས་གཞི་: (_m)"
+msgstr "ཡིག་སྡེབ་འཛོལ་མི་ མིང་ཚིག་ཚུ་གི་དོན་ལུ་ཚོས་གཞི་: (_m)"
 
 #: ../mail/mail-config.glade.h:58
 msgid "Colors"
@@ -12940,7 +12915,7 @@ msgstr "ཚོས་གཞི་ཚུ།"
 
 #: ../mail/mail-config.glade.h:59
 msgid "Confirm _when expunging a folder"
-msgstr "སྣོད་འཛིན་ཅིག་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་གཏན་སྦེ་དྲིས། (_w)"
+msgstr "སྣོད་འཛིན་ཅིག་ རྩ་མེད་བཏང་བའི་སྐབས་ ངེས་དཔྱད་འབད། (_w)"
 
 #: ../mail/mail-config.glade.h:60
 msgid ""
@@ -13005,7 +12980,7 @@ msgstr "གསང་བཟོ་བའི་ལག་ཁྱེར་: (_p)"
 
 #: ../mail/mail-config.glade.h:79
 msgid "Encrypt out_going messages (by default)"
-msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་གསང་བ་བཟོ། (སྔོན་སྒྲིག་ཐོག་ལས) (_g)"
+msgstr "ཕྱིར་གཏང་འཕྲིན་དོན་ཚུ་ གསང་བ་བཟོ། (སྔོན་སྒྲིག་ཐོག་ལས) (_g)"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Fi_xed width Font:"
@@ -13013,7 +12988,7 @@ msgstr "རྒྱ་ཚད་གཏན་བཟོས་ཡིག་གཟུག
 
 #: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
-msgstr "གཏན་བཟོས་རྒྱ་ཚད་: (_x)"
+msgstr "གཏན་བཟོས་-རྒྱ་ཚད་: (_x)"
 
 #: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
@@ -13133,7 +13108,7 @@ msgstr "སེལ་འཐུ་འབད་...(_e)"
 
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
-msgstr "ཚད་ལྡན་ཡིག་གཟུགས་: (_t)"
+msgstr "ཚད་ལྡན་ཡིག་གཟུགས། (_t)"
 
 #: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
@@ -13157,7 +13132,7 @@ msgstr "དཔར་བསྐྲུན་གྱི་དོན་ལས་ ཨ�
 
 #: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
-msgstr "སྒྲ་སྐད་སེལ་འཐུ་འབད།"
+msgstr "སྒྲ་སྐད་ཡིག་སྣོད་སེལ་འཐུ་འབད།"
 
 #: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
@@ -13205,7 +13180,7 @@ msgstr "ཡིག་སྡེབ་ཞིབ་དཔྱད་འབད་དོ
 
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
-msgstr "དབྱེ་བ་:(_y)"
+msgstr "ཡིག་དཔར་རྐྱབས་:(_y)"
 
 #: ../mail/mail-config.glade.h:142
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
@@ -13262,15 +13237,15 @@ msgstr "འཕྲིན་དོན་གསརཔ་ལྷོདཔ་ད་ �
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "འཛོམས་འདུའི་ཞུ་བ་ལུ་ མིང་རྟགས་མ་བཀོད། (ཨའུཊི་ལུཀ་ཆ་མཐུན་གྱི་དོན་ལུ) (_D)"
+msgstr "འཛོམས་འདུའི་ཞུ་བ་ཚུ་ལུ་ མིང་རྟགས་མ་བཀོད། (ཕྱི་སྣང་ཆ་མཐུན་གྱི་དོན་ལུ) (_D)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
-msgstr "གདོང་བསྐྱོད་ཀྱི་བཟོ་རྣམ་: (_F)"
+msgstr "བཟོ་རྣམ་གདོང་བསྐྱོད་འབད་: (_F)"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Load images in mail from contacts"
-msgstr "འབྲེལ་ས་ཚུ་ནང་ལས་ ཡིག་འཕྲིན་ལུ་ གཟུགས་བརྙན་མངོན་གསལ་འབད།(_L)"
+msgstr "འབྲེལ་ས་ཚུ་ནང་ལས་ ཡིག་འཕྲིན་ནང་ལུ་ གཟུགས་བརྙན་མངོན་གསལ་འབད།(_L)"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
@@ -13278,11 +13253,11 @@ msgstr "འདི་ངེད་ཀྱི་ སྔོན་སྒྲིག་�
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
-msgstr "འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་ལས་ལྷག་ཟེར་ རྟགས་བཀལ། (_M)"
+msgstr "འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་ལས་ལྷག་ཟེར་རྟགས་བཀལ། (_M)"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
-msgstr "ནམ་ཡང་ ཨིན་ཊར་ནེཊི་ནང་ལས་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་མ་འབད། (_N)"
+msgstr "ནམ་ཡང་ཨིན་ཊར་ནེཊི་ནང་ལས་ གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་མ་འབད། (_N)"
 
 #: ../mail/mail-config.glade.h:166
 msgid "_Path:"
@@ -13311,7 +13286,7 @@ msgstr "གཟུགས་བརྙན་གྱི་བསྒུལ་པར་
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
-msgstr "མཐའ་བཙན་ཅན་གྱི་མཐུད་ལམ་ ལག་ལེན་འཐབ་: (_U)"
+msgstr "མཐའ་བཙན་གྱི་མཐུད་ལམ་ ལག་ལེན་འཐབ་: (_U)"
 
 #: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
@@ -13339,7 +13314,7 @@ msgstr "<span weight=\"bold\">གསང་བཟོ་</span>"
 
 #: ../mail/mail-dialogs.glade.h:5
 msgid "Case _sensitive"
-msgstr "ཡི་གུ་ཆུ་ཆུང་གི་ཉེན་ཁ། (_s)"
+msgstr "ཡི་གུ་ཆེ་ཆུང་གི་ཉེན་ཁ། (_s)"
 
 #: ../mail/mail-dialogs.glade.h:6
 #: ../mail/message-tags.glade.h:2
@@ -13391,12 +13366,12 @@ msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
-msgstr "ཆོག་ཐམ་དང་ལེན་འབད། (_A)"
+msgstr "ཆོག་ཐམ་ལུ་དང་ལེན་འབད། (_A)"
 
 #: ../mail/mail-dialogs.glade.h:20
 #: ../mail/message-tags.glade.h:6
 msgid "_Due By:"
-msgstr "རན་དུས་: (_D)"
+msgstr "རན་དུས་་: (_D)"
 
 #: ../mail/mail-dialogs.glade.h:21
 #: ../mail/message-tags.glade.h:7
@@ -13621,7 +13596,7 @@ msgstr "ཞབས་ཏོག་ཞིབ་དཔྱད་འབད་དོ།
 
 #: ../mail/mail-send-recv.c:158
 msgid "Canceling..."
-msgstr "ཆ་མེད་གཏང་དོ་..."
+msgstr "ཆ་མེད་བཏང་དོ་..."
 
 #: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
@@ -13629,7 +13604,7 @@ msgstr "འཕྲིན་དོན་གཏང་ནི་དང་ལེན་
 
 #: ../mail/mail-send-recv.c:336
 msgid "Cancel _All"
-msgstr "ཆ་མཉམ་ ཆ་མེད་གཏང་། (_A)"
+msgstr "ཆ་མཉམ་ཆ་མེད་གཏང་། (_A)"
 
 #: ../mail/mail-send-recv.c:425
 msgid "Updating..."
@@ -13644,26 +13619,17 @@ msgstr "བསྒུད་སྡོད་དོ་..."
 msgid "Checking for new mail"
 msgstr "ཡིག་འཕྲིན་གསརཔ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད་དོ།"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%sགི་དོན་ལུ་ ཆོག་ཚིག་བཙུགས།"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "ཆོག་ཚིག་བཙུགས།"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%sགི་དོན་ལུ་ ཆོག་ཡིག་བཙུགས།"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "ཆོག་ཡིག་བཙུགས།"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "ལག་ལེན་པ་གིས་ བཀོལ་སྤྱོད་ཆ་མེད་བཏང་ནུག"
 
@@ -13743,11 +13709,11 @@ 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 "&quot;{1}&quot གི་དོན་ལུ་ འབྱོར་རྟགས་ལྷག་ཡོད་པའི་བརྡ་བསྐུལ་གྱི་ཞུ་བ་ཅིག་འབད་ཡི། འབྱོར་རྟགས་ཀྱི་བརྡ་བསྐུལ་དེ་ {0}ལུ་ གཏང་ནི་ཨིན?"
+msgstr "&quot;{1}&quot གི་དོན་ལུ་ འབྱོར་རྟགས་ལྷག་པའི་བརྡ་བསྐུལ་གྱི་ཞུ་བ་ཅིག་འབད་ནུག འབྱོར་རྟགས་ཀྱི་བརྡ་བསྐུལ་དེ་ {0}ལུ་གཏང་ནི་ཨིན?"
 
 #: ../mail/mail.error.xml.h:6
 msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
-msgstr "སྣོད་འཛིན་མིང་&quot;{1}&quot;འབད་མི་ཅིག་ ཧེ་མ་ལས་རང་འདུག མིང་སོ་སོ་ཅིག་བཏགས་གནང་།"
+msgstr "མཚན་རྟགས་མིང་&quot;{1}&quot;འབད་མི་ཅིག་ ཧེ་མ་ལས་རང་འདུག མིང་སོ་སོ་ཅིག་གསལ་བཀོད་འབད་གནང་།"
 
 #: ../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."
@@ -13763,7 +13729,7 @@ msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་ ང�
 
 #: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་དང་ དེ་གི་པོརོ་སི་ཆ་མཉམ་ ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
+msgstr "ཁྱོད་ཀྱིས་རྩིས་ཐོ་འདི་ལྕོགས་མིན་བཟོ་སྟེ་ དེ་གི་པོ་རག་སི་ཚུ་ཆ་མཉམ་ ངེས་པར་དུ་ བཏོན་གཏང་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
@@ -13851,7 +13817,7 @@ msgstr "དམིགས་གཏད་&quot;{2}&quot;ཁ་ཕྱེ་མི་
 
 #: ../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 license."
-msgstr "གཞི་བཙུགས་ཀྱི་ དཀའ་ངལ་ཅིག་ལུ་བརྟེན་ཏེ་ ཆོག་ཐམ་ཡིག་སྣོད&quot;{0}&quot;ལྷག་མ་ཚུགས། ཁྱོད་ཀྱིས་བྱིན་མཁན་དེ་གི་ཆོག་ཐམ་དང་ལེན་མ་འབད་ཚུན་ཚོད་ བྱིན་མཁན་འདི་ལག་ལེན་འཐབ་མི་ཚུགས།"
+msgstr "གཞི་བཙུགས་ཀྱི་ དཀའ་ངལ་ཅིག་ལུ་བརྟེན་ཏེ་ ཆོག་ཐམ་ཡིག་སྣོད་&quot;{0}&quotདེ་ ལྷག་མ་ཚུགས། ཁྱོད་ཀྱིས་བྱིན་མཁན་གྱི་ཆོག་ཐམ་དེ་ དང་ལེན་མ་འབད་ཚུན་ཚོད་ བྱིན་མཁན་དེ་ ལག་ལེན་འཐབ་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13879,7 +13845,7 @@ msgstr "མིང་རྟགས་ཡིག་ཚུགས་&quot;{0}&quot; �
 
 #: ../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."
-msgstr "ཁྱོད་རའི་ཆོག་ཡིག་གི་ཡིག་སྡེབ་ འཛོལ་མ་འཛོལ་ཞིབ་དཔྱད་འབད། ཆོག་ཡིག་ཚུ་ལུ་ ཡི་ཆེ་ཆུང་གི་ཉེན་ཁ་ཡོདཔ་ཨིནམ་ སེམས་ཁར་བཞག་དགོ ཡང་ཅིན་ ཁྱོད་ཀྱི་ཚུགས་ལྡེ་དེ་ ཨེབ་སྟེ་ཡོདཔ་འོང་།"
+msgstr "ཁྱོད་རའི་ཆོག་ཡིག་གི་ཡིག་སྡེབ་ འཛོལ་མ་འཛོལ་ ཞིབ་དཔྱད་འབད། ཆོག་ཡིག་ལེ་ཤ་ཅིག་ལུ་ ཡི་གུ་ཆེ་ཆུང་གི་ཉེན་ཁ་ཡོདཔ་ སེམས་ཁར་བཞག ཁྱོད་ཀྱི་ཚུགས་ལྡེ་དེ་ ཨེབ་སྟེ་ཡོདཔ་འོང་།།"
 
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
@@ -13895,7 +13861,7 @@ msgstr "རྩིས་ཐོ་བཏོན་གཏང་ནི་ཨིན་
 
 #: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
-msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག་ནི་ཨིན་ན?"
+msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག་ནི་ཨིན་ན?"
 
 #: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
@@ -13911,7 +13877,7 @@ msgstr "ཁྱོད་ཀྱིས་བཀོལ་སྤྱོད་ཚུ་
 
 #: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
-msgstr "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན?"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་རང་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ཨིན་ན།"
 
 #: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
@@ -13951,7 +13917,7 @@ msgstr "ཁྱོད་ཀྱིས་སྣོད་འཛིན་དེ་བ
 
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་པ་ཅིན་ པོརོ་སི་རྩིས་ཐོ་ཚུ་ རྟག་བརྟན་སྦེ་བཏོན་གཏང་འོང་།"
+msgstr "ཁྱོད་ཀྱིས་འཕྲོ་མཐུད་དེ་འབད་བ་ཅིན་ པོ་རོག་སི་རྩིས་ཐོ་ཆ་མཉམ་རང་ རྟག་བརྟན་སྦེ་ བཏོན་གཏང་འོང་།"
 
 #: ../mail/mail.error.xml.h:59
 msgid ""
@@ -14011,7 +13977,7 @@ msgstr "ཁྱོད་རའི་རྩིས་ཐོའི་གཞི་ས
 
 #: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
-msgstr "རྩིས་ཐོ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ རྩིས་ཐོ་གཞན་ཅིག་ ལག་ལེན་འཐབ་སྟེ་གཏང་།"
+msgstr "རྩིས་ཐོ་ལྕོགས་ཅན་བཟོ་ ཡང་ན་ རྩིས་ཐོ་གཞན་ཅིག་ ལག་ལེན་འཐབ་སྟེ་སྐྱེལ་གཏང་།"
 
 #: ../mail/mail.error.xml.h:75
 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."
@@ -14029,7 +13995,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
-msgstr "མིང་རྟགས་འདི་ངོས་འཛིན་འབད་ནི་ལུ་ མཐུན་མོང་མ་ཡིན་པའི་མིང་ཅིག་བཏགས།"
+msgstr "མིང་རྟགས་འདི་ ངོས་འཛིན་གྱི་དོན་ལུ་ མཐུན་མིན་གྱི་མིང་ཅིག་བྱིན།"
 
 #: ../mail/mail.error.xml.h:80
 msgid "Please wait."
@@ -14065,7 +14031,7 @@ msgstr "འབྱོར་རྟགས་སྐྱེལ།"
 
 #: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
-msgstr "མིང་རྟགས་ཧེ་མ་ལས་འདུག"
+msgstr "མིང་རྟགས་ཧེ་མ་ལས་རང་འདུག"
 
 #: ../mail/mail.error.xml.h:89
 msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
@@ -14118,11 +14084,11 @@ msgstr "སྣོད་འཛིན་འདི་ བསམ་པའི་ས�
 
 #: ../mail/mail.error.xml.h:106
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
-msgstr "ཁྱོད་ཀྱིས་གདམ་ཁ་བརྐྱབས་མི་ རྩིས་ཐོ་དེ་ལྕོགས་མིན་ཨིནམ་ལས་ འཕྲིན་དོན་འདི་གཏང་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱིས་གདམ་ཁ་བརྐྱབས་མི་ རྩིས་ཐོ་དེ་ལྕོགས་ཅན་མེནམ་ལས་ འཕྲིན་དོན་འདི་གཏང་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "ཁྱོད་ཀྱིས་ལེན་མཁན་ག་ནི་ཡང་ གསལ་བཀོད་མ་འབདཝ་ལས་ འཕྲིན་དོན་འདི་གཏང་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱིས་ལེན་མཁན་ག་ནི་ཡང་ གསལ་བཀོད་མ་འབདཝ་ལས་ འཕྲིན་དོན་འདི་ གཏང་མི་ཚུགས།"
 
 #: ../mail/mail.error.xml.h:108
 msgid "This server does not support this type of authentication and may not support authentication at all."
@@ -14134,7 +14100,7 @@ msgstr "མིང་རྟགས་འདི་ བསྒྱུར་བཅོ�
 
 #: ../mail/mail.error.xml.h:110
 msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "འདི་གིས་སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དང་ དེ་གི་སྣོད་འཛིན་ཡན་ལག་ཚུ་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་འོང་། "
+msgstr "འདི་གིས་ སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དང་ སྣོད་འཛིན་ཡན་ལག་ཚུ་ནང འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་འོང་། "
 
 #: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
@@ -14142,7 +14108,7 @@ msgstr "སྡེ་རིམ་སར་བར་ལུ་མཐུད་མ་
 
 #: ../mail/mail.error.xml.h:112
 msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "རྩིས་ཐོ་འདི་གི་དོན་ལས་ ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ཁ་ཕྱེ་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ རིམ་ལུགས་ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ལག་ལེན་འཐབ་ག? "
+msgstr "རྩིས་ཐོ་འདི་གི་དོན་ལས་ ཟིན་བྲིས་སྣོད་འཛིན་ ཁ་ཕྱེ་མ་ཚུགས། དེ་གི་ཚབ་ལུ་ རིམ་ལུགས་ཟིན་བྲིས་ཀྱི་སྣོད་འཛིན་ ལག་ལེན་འཐབ། "
 
 #: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
@@ -14195,7 +14161,7 @@ msgstr "མཇུག་བསྣོན་འབད། (_A)"
 
 #: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
-msgstr "བསྒྱུར་བཅོས་ཚུ་ བཏོན་བཀོག་ད། (_D)"
+msgstr "བསྒྱུར་བཅོས་ཚུ་བཏོན་བཀོག (_D)"
 
 #: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
@@ -14205,80 +14171,80 @@ msgstr "རྩ་མེད་གཏང་། (_E)"
 msgid "_Open Messages"
 msgstr "འཕྲིན་དོན་ཚུ་ཁ་ཕྱེ། (_O)"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "མ་མཐོངམ།"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "མཐོང་མཐོངམ།"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "ལན་སླབ་ཡོདཔ།"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "མ་མཐོང་པའི་སྣ་མང་འཕྲིན་དོན།"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "སྣ་མང་འཕྲིན་དོན།"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "དམའ་ཤོས།"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "དམའ་མི།"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "མཐོ་མི།"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "མཐོ་ཤོས།"
 
-#: ../mail/message-list.c:1359
+#: ../mail/message-list.c:1341
 #: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366
+#: ../mail/message-list.c:1348
 #: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "ད་རིས་%l:%M %p"
 
-#: ../mail/message-list.c:1375
+#: ../mail/message-list.c:1357
 #: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "ཁ་རྩང་%l:%M %p"
 
-#: ../mail/message-list.c:1387
+#: ../mail/message-list.c:1369
 #: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395
+#: ../mail/message-list.c:1377
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1397
+#: ../mail/message-list.c:1379
 #: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "འཕྲིན་དོན་ཚུ།"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "འཕྲིད་དོན་ཐོ་ཡིག་ བཟོ་བསྐྲུན་འབད་དོ།"
 
@@ -14306,7 +14272,7 @@ msgstr "འགོ་ཐོག་གནས་ཁོངས།"
 msgid "Received"
 msgstr "ཐོབ་ཡོདཔ།"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "ཚད།"
@@ -14380,7 +14346,7 @@ msgstr "ཉེ་གནས་ཀྱི་ཁ་བྱང་ཀི་དེབ།
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
-msgstr "ཉེ་གནས་ཀྱི་ཟླ་ཐོ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
+msgstr "ཉེ་གནས་ཁ་བྱང་ཀི་དེབ་ཚུ་གི་དོན་ལུ་ ནང་སྙིང་ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
@@ -14456,12 +14422,12 @@ msgstr "ཡིག་འཕྲིན་ལུ་ ངོས་ལན་འབད�
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
-msgstr "འཕྲལ་མྱུར་འཕྲིན་གཏོང་གི་འབྲེལ་ས།"
+msgstr "<b>འཕྲལ་མྱུར་འཕྲིན་གཏོང་འབྲེལ་ས་</b>"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
 msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "གེམ་བ་ཌི་ཐོ་ཡིག་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་མཉམ་འབྱུང་འབདཝ་ཨིན།"
+msgstr "གཱེམ་བཱ་ཌི་ཐོ་ཡིག་མི་ནང་ལས་ འབྲེལ་སའི་བརྡ་དོན་དང་ གཟུགས་བརྙན་ཚུ་ འཕྲལ་འཕྲལ་སྦེ་ མཉམ་འབྱུང་འབདཝ་ཨིན།"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -14470,7 +14436,7 @@ 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 messages. Also fills in IM contact information from your buddy lists."
-msgstr "ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ཚུ་ལུ་ ལན་རྐྱབ་པའི་བར་ན་ རང་བཞིན་གྱིས་ ཁྱོད་ཀྱི་ཁ་བྱང་ཀི་དེབ་དེ་ནང་ མིང་གསལ་དང་ གློག་འཕྲིན་ཁ་བྱང་གིས་བཀངམ་ཨིན། ད་རུང་ ཁྱོད་ཀྱི་བཱ་ཌི་ཐོ་ཡིག་ཚུ་ནང་ལས་ ཨའི་ཨེམ་འབྲེལ་སའི་བརྡ་དོན་ཡང་བཀངམ་ཨིན།"
+msgstr "ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ཚུ་ལུ་ ལན་རྐྱབ་པའི་བར་ན་ རང་བཞིན་གྱིས་ ཁྱོད་ཀྱི་ཁ་བྱང་ཀི་དེབ་དེ་ནང་ མིང་གསལ་དང་ གློག་འཕྲིན་ཁ་བྱང་ཚུ་གིས་བཀངམ་ཨིན། ད་རུང་ ཁྱོད་ཀྱི་བཱ་ཌི་ཐོ་ཡིག་ཚུ་ནང་ལས་ ཨའི་ཨེམ་འབྲེལ་སའི་བརྡ་དོན་ཡང་བཀངམ་ཨིན།"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14479,7 +14445,7 @@ msgstr "བི་བི་ཌི་བི།"
 #: ../plugins/caldav/caldav-source.c:64
 #: ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
-msgstr "ཀཱལ་ཌེབ།"
+msgstr "ཀཱལ་ཌི་ཨེ་ཝི།"
 
 #: ../plugins/caldav/caldav-source.c:269
 msgid "Use _SSL"
@@ -14495,7 +14461,7 @@ msgstr "རང་ཡུལ་གྱི་ཟླ་ཐོ་ཚུ་གི་ད
 
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
-msgstr "མཐུད་ལམ་མཐའ་བཙན་བཟོ། (_S)"
+msgstr "མཐུད་ལམ་མཐའ་བཙན་བཟོ་: (_S)"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
@@ -14562,6 +14528,10 @@ msgstr "གནམ་གཤིས་ཀྱི་ཟླ་ཐོ་ཚུ།"
 msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
 msgstr "པོཔ་ཨཔ་དཀར་ཆག་གི་ པ་ལག་ཨིན་ཅིག་ འགྲེམ་སྟོན་འབད་དེ་ ཅ་ལ་ཚུ་འཛིན་པང་གུ་ འདྲ་བཤུས་བརྐྱབ་བཅུག་མི་ བརྟག་ཞིབ་པ་ལག་ཨིན་ཅིག"
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "གློག་འཕྲིན་ཁ་བྱང་ཚུ་འདྲ་བཤུས་རྐྱབས།(_E)"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "ལག་ཆས་འདྲ་བཤུས་རྐྱབས།"
@@ -14589,7 +14559,7 @@ msgstr "ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ད
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default folder"
-msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་རྟགས་བཀལ།(_d)"
+msgstr "སྔོན་སྒྲིག་སྣོད་འཛིན་སྦེ་ རྟགས་བཀལ།(_d)"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -14597,7 +14567,7 @@ 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 "ཟླ་ཐོ་ཅིག་ ཡང་ན་ ཁ་བྱང་ཀི་དེབ་ཅིག་ སྔོན་སྒྲིག་ཅན་སྦེ་ རྟགས་བཀལ་ནིའི་དོན་ལུ་ ལས་འགན་བྱིནམ་ཨིན།"
+msgstr "ཟླ་ཐོ་ ཡང་ན་ ཁ་བྱང་ཀི་དེབ་ཚུ་ སྔོན་སྒྲིག་སྦེ་ རྟགས་བཀལ་ནིའི་དོན་ལུ་ ལས་འགན་ཚུ་བྱིནམ་ཨིན།"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14670,7 +14640,7 @@ msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་དོ
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
-msgstr "འཐུས་མིའི་ལས་རོགས།"
+msgstr "ཚོགས་འཐུསའི་ལས་རོགས།"
 
 #. Miscelleneous settings
 #: ../plugins/exchange-operations/exchange-account-setup.c:349
@@ -14691,19 +14661,19 @@ msgstr "སྣོད་འཛིན་ཚུ་གི་ཚད།"
 msgid "Exchange Settings"
 msgstr "ཨེགསི་ཅེནཇི་ གཞི་སྒྲིག་ཚུ།"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "ཨོ་ཌབ་ལུ་ཨེ་ ཡུ་ཨར་ཨེལ་: (_O)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
-msgstr "བདེན་བཤད་འབད། (_u"
+msgstr "བདེན་བཤད་འབད། (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "བདེན་བཤད་ཀྱི་དབྱེ་བ།"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "རྒྱབ་སྐྱོར་ཅན་གྱི་ དབྱེ་བ་ཡོད་མེད་ ཞིབ་དཔྱད་འབད། (_e)"
 
@@ -14713,8 +14683,8 @@ msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
 msgstr ""
-"ཨི་བོ་ལུ་ཤཱན་དེ་ ཨོཕ་ལ་ཡིན་ཐབས་ལམ་ནང་ཨིན། ད་ལྟོ་ཁྱོད་ཀྱིས་སྣོད་འཛིན་ཚུ་ གསར་བསྐྲུན་འབད་ནི་དང་ ལེགས་བཅོས་འབད་ནི་ཚུ་མི་བཏུབ།\n"
-" དེ་བཟུམ་མའི་བཀོལ་སྤྱོད་ཀྱི་དོན་ལུ་ ཨཱོན་ལ་ཡིན་ཐབས་ལམ་གུ་ སོར་བསྒྱུར་འབད།"
+"ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལའིན་ཐབས་ལམ་ནང་འདུག ཁྱོད་ཀྱིས་ད་ལྟོ་སྣོད་འཛིན་ གསར་བསྐྲུན་འབད་ནི་ ཡང་ན་ ལེགས་བཅོས་འབད་ནི་ཚུ་མི་ཚུགས།\n"
+"དེ་བཟུམ་མའི་བཀོལ་སྤྱོད་ཀྱི་དོན་ལུ་ ཨོན་ལའིན་ཐབས་ལམ་ལུ་ སོར་བསྒྱུར་འབད་གནང་།"
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -14746,7 +14716,7 @@ msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ དུས�
 #: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
-msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིན་གྲངས་%dནང་ དུས་ཡོལ་ཐལ་འོང་།"
+msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིནམ་%d ནང་ དུས་ཡོལ་ཐལ་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
@@ -14784,25 +14754,25 @@ msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ རང་�
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ འཐུས་མི་%sའཚོལ་མ་ཐོབ།"
+msgstr "ཤུགས་ལྡན་སྣོད་ཐོ་ནང་ ཚོགས་འཐུས་%sའཚོལ་མ་ཐོབ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
-msgstr "འཐུས་མི་%s རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་%s རྩ་བསྐྲད་བཏང་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
-msgstr "འཐུས་མིའི་ཐོ་ཡིག་དུས་མཐུན་བཟོ་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུསའི་ཐོ་ཡིག་དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
-msgstr "འཐུས་མི་%s ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་%s ཁ་སྐོང་རྐྱབས་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
-msgstr "འཐུས་མིའི་ཐོ་ཡིག་ལྷག་ནི་ལུ་འཛོལ་བ།"
+msgstr "ཚོགས་འཐུསའི་ཐོ་ཡིག་ལྷག་ནི་ལུ་འཛོལ་བ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
 msgid "Author (read, create)"
@@ -14820,7 +14790,7 @@ msgstr "འབྲེལ་ས་ཚུ་:(_n)"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:7
 msgid "Delegates"
-msgstr "འཐུས་མི་ཚུ།"
+msgstr "ཚོགས་འཐུས་ཚུ།"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 msgid "Editor (read, create, edit)"
@@ -14844,7 +14814,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
 msgid "_Delegate can see private items"
-msgstr "འཐུས་མི་གིས་ སྒེར་གྱི་རྣམ་གྲངས་ཚུ་མཐོང་ཚུགས།(_D)"
+msgstr "ཚོགས་འཐུས་གིས་ སྒེར་གྱི་རྣམ་གྲངས་ཚུ་མཐོང་ཚུགས།(_D)"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -14898,11 +14868,11 @@ msgstr "\"%s\"ནང་ལས་ མངགས་བཤོལ་འབད།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
-msgstr "ཆོག་ཡིག་དུས་ཡོལ་གྱི་ཉེན་བརྡ་..."
+msgstr "ཆོག་ཡིག་དུས་ཡོལ་གྱི་ཉེན་བརྡ།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
 msgid "Your password will expire in 7 days..."
-msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ཉིནམ་ ༧ གྱི་ནང་ དུས་ཡོལ་ཐལ་འོང་།"
+msgstr "ཁྱོད་ཀྱི་ཆོག་ཡིག་དེ་ ད་ལས་ཕར་ཉིནམ་ ༧ ནང་ དུས་ཡོལ་ཐལ་འོང་།"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
@@ -14998,11 +14968,11 @@ 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 "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་ དམིགས་བསལ་བཀོལ་སྤྱོད་དང་ ཁྱད་རྣམ་ཚུ་གི་བསྡུ་གསོག་ ལེགས་སྐྱོང་འཐབ་མི་ པ་ལག་ཨིན་ཅིག"
+msgstr "ཨེགསི་ཅེནཇི་རྩིས་ཐོའི་བཀོལ་སྤྱོད་དང་ཁྱད་རྣམ་ཚུ་གི་ བསྡུ་གསོག་ཅིག་ལེགས་འཐབ་ནིའི་དོན་ལུ་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
-msgstr "ཨེགསི་ཅེནཇི་གི་བཀོལ་སྤྱོད་ཚུ།"
+msgstr "ཨེགསི་ཅེནཇི་བཀོལ་སྤྱོད་ཚུ།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15033,7 +15003,7 @@ msgstr "མ་ཤེས་པའི་འཛོལ་བ་ཅིག་བྱུ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
 msgid "Could not connect to Exchange server."
-msgstr "ཨེགསི་ཅེནཇི་སར་བར་ལུ་མཐུད་མ་ཚུགས།"
+msgstr "ཨེགསི་ཅེནཇི་སར་བར་ལུ་ མཐུད་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
@@ -15041,7 +15011,7 @@ msgstr "སར་བར་{0}ལུ་ མཐུད་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
 msgid "Could not determine folder permissions for delegates."
-msgstr "འཐུས་མི་ཚུ་གི་དོན་ལུ་ སྣོད་འཛིན་གནང་བ་ཚུ་ ཐག་བཅད་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་ཚུ་གི་དོན་ལུ་ སྣོད་འཛིན་གནང་བ་ཚུ་ ཐག་བཅད་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
@@ -15053,7 +15023,7 @@ msgstr "སར་བར་{0}ག་ཡོད་འཛོལ་མ་ཐོབ།
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
 msgid "Could not make {0} a delegate"
-msgstr "{0}འཐུས་མི་ཅིག་སྦེ་བཟོ་མ་ཚུགས།"
+msgstr "{0}ཚོགས་འཐུས་ཅིག་སྦེ་བཟོ་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
 msgid "Could not read folder permissions"
@@ -15096,20 +15066,20 @@ msgid ""
 msgstr ""
 "ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ ཨེགསི་ཅེནཇི་སར་བར་གུ་ལྕོགས་མིན་ནམ་\n"
 "འགགས་ཏེ་ཡོད་དོ་བཟུམ་སྦེ་མཐོང་མི་ལས་འགན་ལ་ལོ་ཅིག་ལུ་\n"
-"འཛུལ་སྤྱོད་འབད་དགོཔ་འདུག (སྤྱིར་བཏང་གིས་འདི་དོན་ཅན་སྦེ་\n"
-"འབད་འབདཝ་མེན)ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་ཨེགསི་ཅེནཇི་མཐུད་བྱེད་\n"
-"ལག་ལེན་འཐབ་ཚུགས་ནིའི་དོན་ལུ་ ཁྱོད་རའི་ཨེགསི་ཅེནཇི་བདག་སྐྱོང་པ་གིས་\n"
+"འཛུལ་སྤྱོད་འབད་དགོཔ་འདུག (འདི་སྤྱིར་བཏང་གིས་འདི་དོན་ཅན་སྦེ་\n"
+"འབད་འབདཝ་མེན)ཁྱོད་ཀྱིས་ཨི་བོ་ལུ་ཤཱན་མཐུད་བྱེད་\n"
+"ལག་ལེན་འཐབ་ཚུགས་ནིའི་དོན་ལུ་ ཁྱོད་རའི་ཨེགསི་བདག་སྐྱོང་པ་གིས་\n"
 "ལས་འགན་འདི་ལྕོགས་ཅན་བཟོ་དགོཔ་འོང་།\n"
 "\n"
 "ཁྱོད་རའི་ཨེགསི་ཅེནཇི་བདག་སྐྱོང་པ་ལུ་ བརྡ་དོན་བྱིན་ནིའི་དོན་ལུ་\n"
 "འོག་གི་འབྲེལ་ལམ་དང་འཁྲིལ་གནང་:\n"
 "\n"
-"{0}\n"
-"  "
+"{༠}\n"
+"    "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
-msgstr "འཐུས་མི་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་ཚུ་ དུས་མཐུན་བཟོ་མ་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
@@ -15193,8 +15163,8 @@ msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
 msgstr ""
-"སར་བར་གྱིས་ ཨེགསི་ཅེནཇི་ ༥.༥ གཡོག་བཀོལ་དོ། ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ \n"
-" མའི་ཀོརོ་སོཕཊི་ཨེགསི་ཅེནཇི་ ༢༠༠༠ དང་ ༢༠༠༣ རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་ཡོད།"
+"སར་བར་གྱིས་ ཨེགསི་ཅེནཇི་ ༥.༥ གཡོག་བཀོད་དོ། ཨེགསི་ཅེནཇི་མཐུད་བྱེད་ཀྱིས་ \n"
+" ཤའི་ཀོརོ་སོཕཊི་ཨེགསི་ཅེནཇི་ ༢༠༠༠ དང་ ༢༠༠༣ རྐྱངམ་གཅིག་ལུ་ རྒྱབ་སྐྱོར་ཡོད།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid ""
@@ -15220,7 +15190,7 @@ msgstr "ཚད་འཛིན་ཐོ་ཡིག་ལུ་ འཛུལ་�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
-msgstr "འཐུས་མི་ཚུ་ ཞུན་དག་བརྐྱབ་མི་ཚུགས་པས།"
+msgstr "ཚོགས་འཐུས་ཚུ་ ཞུན་དག་བརྐྱབ་མི་ཚུགས་པས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
@@ -15240,11 +15210,11 @@ msgstr "རྒྱབ་སྐྱོར་མེད་པའི་བཀོལ་
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ ཁྱོད་རའི་ཐོབ་སྐལ་ཡོད་མི་དེ་རྫོགས་རན་དོ།"
+msgstr "ཁྱོད་ཀྱིས་སར་བར་འདི་གུ་ ཡིག་འཕྲིན་གསོག་འཇོག་འབད་ནི་ལུ་ ཁྱོད་རའི་ཐོབ་སྐལ་ རྫོགས་རན་དོ།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "You cannot make yourself your own delegate"
-msgstr "ཁྱོད་ཀྱིས་ཁྱོད་རང་ ཁྱོད་རའི་འཐུས་མི་སྦེ་ བཟོ་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱིས་ཁྱོད་རང་ ཁྱོད་རའི་ཚོགས་འཐུས་སྦེ་ བཟོ་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
@@ -15256,15 +15226,15 @@ msgstr "ཁྱོད་ཀྱིས་ཨེགསི་ཅེནཇི་རྩ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
-msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས། ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བཏོན་གཏང་ཞིནམ་ལས་ བར་སྟོང་དུམ་གྲ་ཅིག་བཏོན་ཐབས་འབད།"
+msgstr "ད་ལྟོ་ཁྱོད་ཀྱི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བཏོན་གཏང་ཞིནམ་ལས་ བར་སྟོང་དུམ་གྲ་ཅིག་བཏོན་ཐབས་འབད།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
-msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས། ད་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་གཏང་ནི་དང་ ལེན་ནི་ཚུ་ འབད་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ད་ཁྱོད་ཀྱིས་ ཡིག་འཕྲིན་གཏང་ནི་དང་ ལེན་ནི་ཚུ་ འབད་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "Your current usage is: {0} KB. You will not be able to send mail until you clear up some space by deleting some mail."
-msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{0}ཨིན་པས། ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ལ་ལོ་ཅིག་ བཏོན་གཏང་སྟེ་ བར་སྟོང་དུམ་གྲ་ཅིག་མ་བཟོ་ཚུན་ཚོད་ ཡིག་འཕྲིན་གཏང་མི་ཚུགས།"
+msgstr "ཁྱོད་ཀྱི་ད་ལྟོའི་བེད་སྤྱོད་དེ་: ཀེ་བི་{༠}ཨིན་པས། ཁྱོད་ཀྱིས་ཡིག་འཕྲིན་ལ་ལོ་ཅིག་བཏོན་གཏང་སྟེ་ བར་སྟོང་དུམ་གྲ་ཅིག་མ་བཏོན་ཚུན་ཚོད་ ཡིག་འཕྲིན་གཏང་མི་ཚུགས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15276,7 +15246,7 @@ msgstr "{0}འཛུལ་སྤྱོད་ཚད་འཛིན་ཐོ་ཡ
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
-msgstr "{0}ཧེ་མ་ལས་རང་འཐུས་མི་ཅིག་ཨིན་ཕས།"
+msgstr "{0}ཧེ་མ་ལས་རང་ཚོགས་འཐུས་ཅིག་ཨིན་ཕས།"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid "{0} is already in the list"
@@ -15373,7 +15343,7 @@ msgstr "ངེས་མེད་སྦེ་ དང་ལེན་འབད།"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
-msgstr "<b>ལག་ལེན་པ་ཚུ་ :</b>"
+msgstr "<b>ལག་ལེན་པ་ཚུ་:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
@@ -15475,11 +15445,11 @@ msgstr "%s%sགི་དོན་ལས་ ཆོག་ཡིག་བཙུག�
 
 #: ../plugins/groupwise-features/proxy-login.c:505
 msgid "_Proxy Login..."
-msgstr "པོ་རོ་སི་ ནང་བསྐྱོད་...(_P)"
+msgstr "པོ་རོག་སི་ནང་བསྐྱོད་...(_P)"
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "པོརོ་སི་ཨེབ་ལྡེ་དེ་ རྩིས་ཐོ་དེ་ ལྕོགས་ཅན་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག་འཐོབ་ཚུགས།"
+msgstr "པོརོག་སི་མཆོང་ལྡེ་དེ་ རྩིས་ཐོ་ལྕོགས་ཅན་ཨིན་པ་ཅིན་རྐྱངམ་གཅིག་ འཐོབ་ཚུགས།"
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
@@ -15507,7 +15477,7 @@ msgstr "འཕྲིན་དོན་གནས་ཚད་རྗེས་འཚ
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
-msgstr "ཧུ་ལ་ཟླ་ཐོའི་འབྱུང་ཁུངས་ཚུ་ གཞི་སྒྲིག་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
+msgstr "ཧུ་ལ་ཟླ་ངོའི་འབྱུང་ཁུངས་ གཞི་བཙུགས་འབད་ནིའི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
@@ -15515,15 +15485,15 @@ msgstr "ཧུ་ལ་རྩིས་ཐོའི་གཞི་སྒྲིག
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
-msgstr "ཟླ་བའི་ཟླ་ཐོ་ནང་འདྲེན་འབད།(_I)"
+msgstr "ཟླ་ཐོ་ནང་འདྲེན་འབད།(_I)"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
-msgstr "ལས་ཀ་ལུ་ནང་འདྲེད་འབད།(_I)"
+msgstr "ལས་ཀ་ནང་འདྲེན་འབད།(_I)"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
-msgstr "ཨའི་ཨེསི་སི་ ནང་འདྲེནའབད།"
+msgstr "ཨའི་སི་ཨེསི་ནང་འདྲེནའབད།"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
@@ -15534,18 +15504,18 @@ msgid "Select Calendar"
 msgstr "ཟླ་ཐོ་སེལ་འཐུ་འབད།"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "ནང་འདྲེན། (_I)"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 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 "སེལ་འཐུ་འབད་མི་ ལས་ཀ་/ཟླ་ཐོ་/ཁ་བྱང་ཀི་དེབ་ཚུ་ ཨེ་པཱལ་ཨའི་པོཌི་དང་གཅིག་ཁར་མཉམ་འབྱུང་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་/ཟླ་ངོ་ཚུ/ཁ་བྱང་ཀི་དེབ་དེ་ ཨེ་པཱལ་ཨའི་པོཌི་གི་ཐོག་ལས་ མཉམ་འབྱུང་འབད།"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -15553,24 +15523,24 @@ msgstr "ཨའི་པོཌི་ལུ་ མཉམ་འབྱུང་འ�
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
-msgstr "ཨའི་པོཌི་མཉམ་འབྱུང་།"
+msgstr "ཨའི་པོཌི་གི་མཉམ་འབྱུང་།"
 
 #: ../plugins/ipod-sync/sync.c:158
 msgid "No output directory!"
-msgstr "ཨའུཊི་པུཊི་སྣོད་ཐོ་མིན་འདུག!"
+msgstr "ཨའུཊི་པུཊི་སྣོད་ཐོ་མིན་འདུག།"
 
 #: ../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 "ཨའི་པོཌི་གུ་ ཨའུཊི་པུཊི་གི་སྣོད་ཐོ་དེ་འཚོལ་མ་ཐོབ། ཨའི་པོཌི་ཚུལ་མཐུན་སྦེ་ གཞི་སྒྲིག་འབད་ཞིནམ་ལས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་གནང་།"
+msgstr "ཨའི་པོཌི་གུ་ ཨའུཊི་པུཊི་སྣོད་ཐོ་མ་ཐོབ། ཨའི་པོཌི་དེ་ ངེས་བདེན་སྦེ་ གཞི་བཙུགས་འབད་དེ་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་གནང་།"
 
 #: ../plugins/ipod-sync/sync.c:174
 #: ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས!"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་མ་ཚུགས།"
 
 #: ../plugins/ipod-sync/sync.c:203
 msgid "Exporting data failed."
-msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་ནི་ལུ་འཐུས་ཤོར།"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་མ་བཏུབ།"
 
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
@@ -15578,7 +15548,7 @@ msgstr "ཁ་བྱང་ཀི་དེབ་ཁ་ཕྱེ་མ་ཚུག
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "ཨི་བོ་ལུ་ཤཱན་ཁ་བྱང་ཀི་དེབ་དེ་ གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "ཕྱིར་འདྲེན་འབད་ནིའི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཁ་བྱང་ཀི་དེབ་དེ་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
@@ -15586,7 +15556,7 @@ msgstr "ཟླ་ཐོ་/ཊུ་ཌུ་ཁ་ཕྱེ་མི་ཚུ�
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་འབད་ནི་ལུ་ ཨི་བོ་ལུ་ཤཱན་ ཟླ་ཐོ་/ཊུ་ཌུ་ཐོ་ཡིག་ ཁ་ཕྱེ་མ་ཚུགས།"
+msgstr "གནད་སྡུད་ཕྱིར་འདྲེན་གྱི་དོན་ལུ་ ཨི་བོ་ལུ་ཤཱན་ཟླ་ཐོ་/ཊུ་ཌུ་ཐོ་ཡིག་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
@@ -15651,20 +15621,20 @@ msgstr "ཟླ་ཐོ་'%s' ལུ་ ངོས་ལེན་མེདཔ་
 #: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "ཟླ་ཐོ་'%s' ལུ་ ཆ་མེད་བཏང་ཚརཝ་སྦེ་བཏང་ཡོད།"
+msgstr "ཟླ་ཐོ་'%s' ལུ་ ཆ་མེད་སྦེ་བཏང་ཡོད།"
 
 #: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "འགོ་འདྲེན་པ་གིས་ འཐུས་མི་%sརྩ་བསྐྲད་བཏང་ནུག"
+msgstr "འགོ་འདྲེན་པ་གིས་ ཚོགས་འཐུས་%sརྩ་བསྐྲད་བཏང་ནུག"
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
-msgstr "འཐུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་བཏང་ཡོད།"
+msgstr "ཚོགས་འཐུས་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་ཅིག་བཏང་ཡོད་།"
 
 #: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "འཐུས་མི་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་གཏང་མ་ཚུགས།"
+msgstr "ཚོགས་འཐུས་དེ་ལུ་ ཆ་མེད་བརྡ་བསྐུལ་གཏང་མ་ཚུགས།"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
@@ -15685,7 +15655,7 @@ msgstr "མཉམ་སྦྲགས་འབད་མི་ ཟླ་ཐོ་�
 
 #: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
-msgstr "འཕྲིན་དོན་ནང་ལུ་ ཟླ་ཐོ་ཅིག་ཡོདཔ་སྦེ་ བཤདཔ་ཨིན་རུང་ ཟླ་ཐོ་དེ་ ནུས་ཅན་གྱི་ཨའི་ཟླ་ཐོ་ཅིག་མེན་པས།"
+msgstr "འཕྲིན་དོན་ནང་ལུ་ ཟླ་ཐོ་ཅིག་ཡོདཔ་སྦེ་ བཤདཔ་ཨིན་རུང་ ཟླ་ཐོ་དེ་ ནུས་ཅན་གྱི་ཨའི་ཟླ་ཐོ་མེན་པས།"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
@@ -15916,7 +15886,7 @@ msgstr "<b>%s</b> གིས་ འོག་གི་འཛོམས་འདུ�
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> གིས་%sབརྒྱུད་ཐོག་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འཛོམས་འདུ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
@@ -15986,12 +15956,12 @@ msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད�
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> གིས་%sབརྒྱུད་ཐོག་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་%sབརྒྱུད་དེ་ འོག་གི་འགན་སྤྲོད་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr "<b>%s</b> གིས་ འོག་ལུ་འགན་སྤྲོད་འབད་མི་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག"
+msgstr "<b>%s</b> གིས་ འོག་གི་འགན་སྤྲོད་ལས་ཀ་དེ་ ཆ་མེད་བཏང་ནུག:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
@@ -16084,7 +16054,7 @@ msgstr "ངོ་འཛོམས་པ་ཚུ་ལུ་ དུས་མཐ�
 
 #: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
-msgstr "དུས་སྐབས་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད།(_p)"
+msgstr "དུས་སྐབས་ཆ་མཉམ་ལུ་་འཇུག་སྤྱོད་འབད།(_p)"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
@@ -16095,8 +16065,8 @@ msgid "Itip Formatter"
 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;?"
-msgstr "&quot;{0}&quot གིས་ འཛོམས་འདུ་དེ་ བགོ་སྤེལ་འབད་ནུག ཁྱོད་ཀྱིས་བགོ་སྤེལ་&quot;{1}&quot; ལུ་ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
+msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot གིས་ འཛོམས་འདུ་དེ་ བགོ་སྤེལ་འབད་ནུག ཁྱོད་ཀྱིས་བགོ་སྤེལ་&quot;{1}&quot;ལུ་ ཁ་སྐོང་བརྐྱབ་ནི་ཨིན་ན?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16305,15 +16275,15 @@ msgstr "འཕྲིན་དོན་འདི་བང་མི་ ཡིག�
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
-msgstr "ལྷག་ཡོད་མི་ཆ་མཉམ་རྟགས་བཀལ། "
+msgstr "ལྷག་ཚར་མི་ཆ་མཉམ་རྟགས་བཀལ། "
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark me_ssages as read"
-msgstr "འཕྲིན་དོན་ཚུ་ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_s)"
+msgstr "འཕྲིན་དོན་ཚུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ། (_s)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr "སྣོད་འཛིན་ཅིག་ནང་གི་ འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཀལ་ནི་ལུ་ ལག་ལེན་འཐབ་ཨིན།"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་ སྣོད་འཛིན་ཅིག་གི་འོག་ལུ་ ལྷག་ཡོདཔ་སྦེ་ རྟགས་བཏལ་ནིའི་དོན་ལུ་ ལག་ལེན་འཐབ་ཅི།"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16329,7 +16299,7 @@ msgstr "ཐོབ་ཚུགས་མི་འདི་ ཨོཕ་ལའི�
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
-msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཟླ་ཐོ་ལུ་རྟགས་བཀལ།(_M)"
+msgstr "ཨོཕ་ལ་ཡིན་ ལག་ལེན་གྱི་དོན་ལུ་ ཟླ་ཐོ་ལུ་རྟགས་བཀལ།"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -16396,7 +16366,7 @@ msgid ""
 msgstr ""
 "ཁྱོད་ལུ་ཨེཆ་ཊི་ཨེམ་ཨེལ་ཡིག་འཕྲིན་ཚུ་ ལྕོགས་མིན་བཟོ་ནིའི་ གདམ་ཁ་བརྐྱབ་བཅུག་མི་ རྩ་སྒྲིག་པའི་པ་ལག་ཨིན་ཅིག་ འགྲེམ་སྟོན་འབད་མི་ བརྟག་ཞིབ་པ་ལག་ཨིན་ཅིག\n"
 "\n"
-"པ་ལག་ཨིན་དེ་ རྒྱབ་སྐྱོར་མེད་པའི་འགྲེམ་སྟོན་གྱི་ ཀོཌི་ཙམ་ཅིག་ཨིན།\n"
+"པ་ལག་ཨིན་འདི་ རྒྱབ་སྐྱོར་མེད་པའི་འགྲེམ་སྟོན་གྱི་ ཀོཌི་ཙམ་ཅིག་ཨིན།\n"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -16442,19 +16412,19 @@ msgstr "འཕྲིན་དོན་དེ་ དཔར་བསྐྲུན�
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
-msgstr "ཨི་བོ་ལུ་ཤཱནགྱི་གསལ་སྡུད་བཀོད་མི།"
+msgstr "ཨི་བོ་ལུ་ཤཱནགྱི་ གསལ་སྡུད་བཀོད་མི།"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr "གསལ་སྡུད་བཀོད་མི་ གནད་སྡུད་འབྱུང་ལས་ཚུ་གི་ དྲན་དེབ་ཅིག་འབྲིཝ་ཨིན།"
+msgstr "གསལ་སྡུད་ཀྱི་གནད་སྡུད་བྱུང་ལས་ཚུ་གི་ དྲན་དེབ་ཅིག་འབྲིཝ་ཨིན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
-msgstr "ཟླ་ཐོ་ཚུ་ ཝེབ་གུ་དཔེ་བསྐྲུན་འབད་བཅུགཔ་ཨིན།"
+msgstr "ཟླ་ཐོ་ཚུ་ཝེབ་གུ་དཔེ་བསྐྲུན་འབད་བཅུགཔ་ཨིན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
-msgstr "ཟླ་ཐོའི་དཔེ་བསྐྲུན།"
+msgstr "ཟླ་ཐོ་དཔེ་བསྐྲུན།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
@@ -16462,7 +16432,7 @@ msgstr "གནས་ཁོངས་ཚུ།"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
-msgstr "ཨའི་ཟླ་ཐོའི་བརྡ་དོན་དཔེ་བསྐྲུན་འབད།(_P)"
+msgstr "ཟླ་ཐོའི་བརྡ་དོན་དཔེ་བསྐྲུད་འབད།(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
@@ -16474,7 +16444,7 @@ msgstr "<span weight=\"bold\">གནས་ཁོངས་</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">འབྱུང་ཁུངས་ཚུ་</span>"
+msgstr "<span weight=\"bold\">འབྱུང་ཁུངས་</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
 msgid ""
@@ -16484,19 +16454,19 @@ msgid ""
 msgstr ""
 "ཉིན་རིམ།\n"
 "བདུན་རིམ།\n"
-"ལག་ཐོག (བྱ་བའི་དཀར་ཆག་བརྒྱུད་དེ)"
+"ལག་ཐོག (བྱ་བའི་དཀར་ཆག་བརྒྱུད་ཐོག)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
-msgstr "འདྲེན་ལམ་: (_o)"
+msgstr "འདྲེན་ལམ་: (_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
-msgstr "<b>དཔེ་བསྐྲུན་གནས་ཁོངས་</b> (_L)"
+msgstr "དཔེ་བསྐྲུན་གྱི་གནས་ཁོངས།"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
-msgstr "<b>དཔེ་བསྐྲུན་འབྱུང་ཐེངས་</b>(_F)"
+msgstr "དཔེ་བསྐྲུན་གྱི་འབྱུང་ཐེངས་:(_F)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
@@ -16509,11 +16479,11 @@ msgid ""
 "Custom Location"
 msgstr ""
 "ཨེསི་ཨེསི་ཨེཆ།\n"
-"མི་མང་ཨེཕ་ཊི་པི།\n"
-"ཨེཕ་ཊི་པི། (ནང་བསྐྱོད་དང་བཅས)\n"
-"སྒོ་སྒྲིག་རུབ་སྤྱོད།\n"
-"ཝེབ་ཌེབ། (ཨེཆ་ཊི་ཊི་པི)\n"
-"ཝེབ་ཌེབ་མཐའ་བཙན་བཟོ།(ཨེཆ་ཊི་ཊི་པི་ཨེསི)\n"
+"མི་མང་གི་ཨེཕ་ཊི་པི།\n"
+"ཧེཕ་ཊི་པི།(ནང་བསྐྱོད་བཅས)\n"
+"ཝིན་ཌོསི་རུབ་སྤྱོད།\n"
+"ཝེབ་ཌི་ཨེ་ཝི།(ཨེཆ་ཊི་ཊི་པི)\n"
+"ཝེབ་ཌི་ཨེ་ཝི་ མཐའ་བཙན་བཟོ།(ཨེཆ་ཊི་ཊི་པི་ཨེསི)\n"
 "སྲོལ་སྒྲིག་གནས་ཁོངས།"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
@@ -16522,18 +16492,18 @@ msgstr "ཞབས་ཏོག་གི་དབྱེ་བ་:(_t)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
-msgstr "ཡིག་སྣོད་: (_F)"
+msgstr "ཡིག་སྣོད་:(_F)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
-msgstr "དེ་སྦེ་དཔེ་བསྐྲུན་འབད་:(_P)"
+msgstr "བཟུམ་སྦེ་དཔེ་བསྐྲུན་འབད་:(_P)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
 msgstr ""
-"ཨའི་ཟླ་ཐོ་\n"
+"ཨའི་ཟླ་ཐོ།\n"
 "དལཝ/ཁོམ་མེད།"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
@@ -16542,7 +16512,7 @@ msgstr "སི་པ་མ་ས་སིན།(ནང་སྦྲགས)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
-msgstr "སི་པ་མ་ས་སིན་ ལག་ལེན་འཐབ་ཐོག་ལས་ མཁོ་མེད་འཕྲིན་དོན་ཚུ་ བཙག་གཏངམ་ཨིན། པ་ལག་ཨིན་འདི་གི་དོན་ལུ་ ས་པ་མ་ས་སིན་ གཞི་བཙུགས་འབད་དགོ"
+msgstr "སི་པ་མ་ས་སིན་ ལག་ལེན་འཐབ་ཐོག་ལས་ མཁོ་མེད་འཕྲིན་དོན་ཚུ་ཕྱིར་སེལ་རྐྱབས། པ་ལག་ཨིན་དེ་ གཞི་བཙུགས་འབད་ནི་ལུ་ སི་པ་མ་ས་སིན་དགོ།"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -16569,12 +16539,12 @@ msgstr "མཉམ་སྦྲགས་ཆ་མཉམ་ སྲུངས།"
 msgid "Select save base name"
 msgstr "སྲུང་བཞག་གཞི་རྟེན་གྱི་མིང་ སེལ་འཐུ་འབད།"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "མ་ཡིམ་གྱི་དབྱེ་བ།"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "སྲུངས།"
@@ -16625,7 +16595,7 @@ msgstr "བརྒྱ་ཆ་ཚར་བ།"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "URL"
-msgstr "ཡུ་ཨར་ཨེལ།"
+msgstr "ཡུ་ཨར་ཨེལ་: "
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -16707,7 +16677,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་འདི་རྐྱངམ་
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "A plugin that handles the Startup wizard."
-msgstr "འགོ་བཙུགས་ཝི་ཛཌི་ ལེགས་སྐྱོང་འཐབ་མི་ པ་ལག་ཨིན་ཅིག"
+msgstr "འགོ་བཙུགས་ཝི་ཛརཌི་ ལེགས་སྐྱོང་འབད་མི་ པ་ལག་ཨིན་ཅིག"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -16732,18 +16702,18 @@ msgstr ""
 "འཕྲོ་མཐུད་ནིའི་དོན་ལུ་ \"Forward\" ཨེབ་རྟ་གུ་ ཨེབ་གཏང་འབད་གནང་།"
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "ཁྱོད་ཀྱིས་ ནང་འདྲེན་འབད་དགོ་མནོ་མི་ བརྡ་དོན་དེ་ སེལ་འཐུ་འབད་གནང་།"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "%s ནང་ལས:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "གནད་སྡུད་ནང་འདྲེན་འབད་དོ།"
 
@@ -16798,7 +16768,7 @@ msgstr "སྒོ་སྒྲིག་གི་མཐོ་ཚད་ སྔོ�
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "སྔོན་སྒྲིག་སྒོ་སྒྲིག་གནས་ལུགས།"
+msgstr "སྔོན་སྒྲིག་སྒོ་སྒྲིག་གི་གནས་ལུགས།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -16822,82 +16792,74 @@ msgstr "དཔར་འཕྲུལ་གཞི་སྒྲིག"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
-msgstr "ཟུར་ཁའི་་ཕྲ་རིང་མཐོང་ཚུགས་པས།"
+msgstr "ལག་ཆས་ཕྲ་རིང་མཐོང་ཚུགས་པས།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "གོང་འཕེལ་ཉེན་བརྡའི་ ཌའི་ལོག་གོམ་སྟེ་འགྱོ།"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#: ../shell/main.c:470
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ཨོཕ་ལ་ཡིན་ ཐབས་ལམ་ནང་ འགོ་བཙུགས།"
 
 #: ../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 (for example \"2.6.0\")."
-msgstr "སྦོམ་/ཆུང་ཀུ་ རིམ་སྒྲིག་གནས་རིམ་དང་བཅས་པའི་ ཨི་བོ་ལུ་ཤཱན་རིམ་སྒྲིག་ཐོན་རིམ།(དེཔར་ན་ \"2.6.0\")།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ རིམ་སྒྲིག་ཐོན་རིམ་ སྦོམ་/ཆུང་ཀུ་/རིམ་སྒྲིག་གནས་རིམ་ དང་བཅསཔ་སྦེ།(དཔེར་ན་\"2.6.0\")བཟུམ།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་མཐོ་ཚད་ པིག་སེལསི་ནང་།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "སྒོ་སྒྲིག་གཙོ་བའི་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "ཟུར་ཁའི་ཕྲ་རིང་དོན་ལུ་ སྔོན་སྒྲིག་འབད་མི་རྒྱ་ཚད་ པིག་སེལསི་ནང་།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "སྦོམ་/ཆུང་ཀུ་ རིམ་སྒྲིག་གནས་རིམ་དང་བཅས་པའི་ མཐའ་མཇུག་རྒྱ་སྐྱེད་འབད་ཡོད་པའི་ ཨི་བོ་ལུ་ཤཱན་རིམ་སྒྲིག་ཐོན་རིམ།(དེཔར་ན་ \"2.6.0\")།"
+msgstr "མཐའ་མཇུག་དུས་མཐུན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་གྱི་ རིམ་སྒྲིག་ཐོན་རིམ་ སྦོམ་/ཆུང་ཀུ་/རིམ་སྒྲིག་གནས་རིམ་དང་བཅསཔ་སྦེ།(དཔེར་ན་\"2.6.0\")བཟུམ།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
 msgstr "སྒོ་སྒྲིག་ཨེབ་རྟའི་བཟོ་རྣམ། \"text\", \"icons\", \"both\", \"toolbar\" འོང་སྲིད། གལ་སྲིད་\"toolbar\" གཞི་སྒྲིག་འབད་བ་ཅིན་ ཨེབ་རྟའི་བཟོ་རྣམ་དེ་ ཇི་ནོམ་ལག་ཆས་ཕྲ་རིང་ གཞི་སྒྲིག་གིས་གཏན་འབེབས་བཟོཝ་ཨིན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "ལག་ཆས་ཕྲ་རིང་ མཐོང་ཚུགས་པས།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ཨི་བོ་ལུ་ཤཱན་དེ་ ཨཱོན་ལ་ཡིན་ ཐབས་ལམ་གྱི་ཚབ་ལུ་ ཨོཕ་ལ་ཡིན་་ ཐབས་ལམ་ནང་ འགོ་བཙུགས་ནི་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
-msgstr "སྒོ་སྒྲིག་འཕར་དགོཔ་ཨིན་ན་མེན།"
+msgstr "སྒོ་སྒྲིག་དེ་སྦོམ་བཟོ་དགོཔ་ཨིན་ན་མེན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 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 "གནས་ཚད་ཕྲ་རིང་དེ་མཐོང་དགོཔ་ཨིན་ན་མེན།"
+msgstr "ལག་ཆས་ཕྲ་རིང་དེ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "ལག་ཆས་ཕྲ་རིང་དེ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་ གོང་འཕེལ་ཐོན་རིམ་ནང་གི་ ཉེན་བརྡའི་ཌའི་ལོག་དེ་ གོམ་སྟེ་འགྱོ་ཡི་ག"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མཐོང་དགོཔ་ཨིན་ན།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟའི་བཟོ་རྣམ།"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "སྒོ་སྒྲིག་གི་ཨེབ་རྟ་ཚུ་ མཐོང་ཚུགས།"
 
@@ -16918,11 +16880,11 @@ msgstr "མཐུད་ལམ་འདི་ཚུ་ ཁ་བསྡམས་�
 msgid "(Untitled)"
 msgstr "(མགོ་མིང་མ་བཏགསཔ།)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "གཡོག་བཀོལ་ནིའི་དོན་ལུ་ ནང་འདྲེན་པའི་དབྱེ་བ་ གདམ་ཁ་རྐྱབས།"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
 "\n"
@@ -16932,11 +16894,11 @@ msgstr ""
 "\n"
 "ཁྱོད་ཀྱིས་མ་ཤེས་པ་ཅིན་ \"Automatic\" སེལ་འཐུ་འབདཝ་ད་ ཨི་བོ་ལུ་ཤཱན་ དཀའ་ངལ་སེལ་འཐུ་འབད་འོང་།"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "ནང་འདྲེན་འདི་གི་དོན་ལུ་ འགྲོ་ཡུལ་གདམ་ཁ་རྐྱབས།"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16948,30 +16910,29 @@ msgstr ""
 " ཁྱོད་ཀྱིས་ ལོག་སྟེ་འབད་རྩོལ་བསྐྱེད་པ་ཅིན་\n"
 " \"Back\" ཨེབ་རྟ་ལུ་ ཨེབ་གཏང་འབད།\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ཡིག་སྣོད་མིང་: (_i)"
 
-#: ../shell/e-shell-importer.c:297
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ཡིག་སྣོད་ཅིག་ སེལ་འཐུ་འབད།"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "ཡིག་སྣོད་ཀྱི་དབྱེ་བ་:(_t)"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "ལས་རིམ་རྙིངམ་ཚུ་ནང་ལས་ གནས་སྡུད་ནང་ གཞི་སྒྲིག་ཚུ་ ནང་འདྲེན་འབད། (_o)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "ཡིག་སྣོད་ཕུད་རྡོག་གཅིག་ ནང་འདྲེན་འབད། (_s)"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
-msgstr "ཨི་བོ་ལུ་ཤཱན་དགའ་གདམ་ཚུ།"
+msgstr "ཨི་བོ་ལུ་ཤཱན་ དགའ་གདམ་ཚུ།"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17032,7 +16993,7 @@ msgstr "ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད།"
 
 #: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད། ཨོཕ་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོ་ ཨི་བོ་ལུ་ཤཱན་ ཨཱོན་ལ་ཡིན་གུ་ཡོད། ཨོཕ་ལ་ཡིན་གུ་ བཀལ་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
@@ -17040,7 +17001,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་�
 
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཡོད། ཨཱོན་ལ་ཡིན་གུ་ ལཱ་འབད་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོ་ཨི་བོ་ལུ་ཤཱན་ ཨོཕ་ལ་ཡིན་གུ་ཨིན་མས། ཨཱོན་ལ་ཡིན་གུ་ བཀལ་ནིའི་དོན་ལུ་ ཨེབ་རྟ་འདི་གུ་ ཨེབ་གཏང་འབད།"
 
 #: ../shell/e-shell-window.c:786
 #, c-format
@@ -17129,7 +17090,7 @@ msgstr ""
 "ནང་འདྲེན་འབད་ནི་ལུ་ ལམ་སྟོན་འབད་འོང་།"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17148,22 +17109,22 @@ msgid ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
-"དབའི། ཨི་བོ་ལེ་ཤཱན་གྱི་ གུརུབ་ཝེར་ཆ་ཚང་དེ་གི་ སྔོན་ལྟའི་གསར་སྟོན་འདི་\n"
-" ཕབ་ལེན་འབད་ནི་ལུ་ བསྒུགས་སྡོད་མི་དེ་ལུ་ བཀྲིན་ཆེ།\n"
+"དབའི། ཨི་བོ་ལེ་ཤཱན་གྱི་ གུརུབ་ཝེར་ སུཊི་གི་ སྔོན་ལྟ་འཛིན་གྲོལ་འདི་\n"
+" ཕབ་ལེན་འབད་ནི་ལུ་ བསྒུགས་མི་དེ་ལུ་ བཀྲིན་ཆེ།\n"
 "\n"
-"ཨི་བོ་ལུ་ཤཱན་ཐོན་རིམ་འདི་ ད་ལྟོ་མཇུག་མ་བསྡུ། འདི་རྫོགས་རན་ཁར་ལྷོད་ཡོད་རུང་\n"
+"ཨི་བོ་ལུ་ཤཱན་གྱི་ ཐོན་རིམ་འདི་ ད་ལྟོ་མཇུག་མ་བསྡུ། འདི་མཇུག་བསྡུ་རན་ཁར་ལྷོད་ཡོད་རུང་\n"
 " ཁྱད་རྣམ་ལ་ལོ་ཅིག་ མ་རྫོགས་པའམ་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་མི་བཏུབ་པས།\n"
 "\n"
 " ཁྱོད་ལུ་ཨི་བོ་ལུ་ཤཱན་གྱི་ ཐོན་རིམ་རྩ་བརྟན་ཅིག་དགོ་པ་ཅིན་ ཐོན་རིམ་་འདི་ སྒྲིག་བཤོལ་འབད་ཞིནམ་ལས་\n"
 " དེ་གི་ཚབ་ལུ་ ཐོན་རིམ་%sདེ་ གཞི་བཙུགས་འབད།\n"
 "\n"
-" ཁྱོད་ཀྱིས་རྐྱེན་མཐོང་པ་ཅིན་ bugzilla.gnome.org ལུ་ སྙན་ཞུ་འབད།\n"
+" ཁྱོད་ཀྱིས་རྐྱེན་མཐོང་པ་ཅིན་ bugzilla.gnome.orgལུ་ སྙན་ཞུ་འབད།\n"
 "ཐོན་སྐྱེད་འདི་ ཉེན་ལེན་མེདཔ་སྦེ་འོངམ་ལས་\n"
 " ཁོང་ཁྲོ་ཅན་གྱི་ གང་ཟག་ཚུ་གི་དོན་ལུ་མེན།\n"
 "ང་བཅས་ཀྱི་ དཀའ་སྤྱད་ལཱ་གི་གྲུབ་འབྲས་འདི་ལུ་ ཁྱོད་སྤྲོ་བ་བྱུང་པའི་ རེ་བ་ཡོདཔ་མ་ཚད་\n"
 " དགའ་སྤྲོ་བའི་ཐོག་ལས་ ཁྱོད་ཀྱི་ཕན་འདེབས་ལུ་ བསྒུག་སྟེ་སྡོད་ཡོད།\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17171,39 +17132,35 @@ msgstr ""
 "བཀྲིན་ཆེ།\n"
 "ཨི་བོ་ལུ་ཤཱན་ རུ་ཚན།\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
-msgstr "ང་ལུ་ལོག་མ་སླབ།"
+msgstr "ང་ལུ་ ལོག་སྟེ་མ་སླབས།"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "གསལ་བཀོད་འབད་མི་ ཆ་ཤས་དེ་ཤུགས་ལྡན་བཟོ་མི་ ཨི་བོ་ལུ་ཤཱན་འགོ་བཙུགས།"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ཨཱོན་ལ་ཡིན་ ཐབས་ལམ་ནང་ འགོ་བཙུགས།"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ཆ་ཤས་ཆ་མཉམ་རང་ བང་ཅན་སྦེ་ སྒོ་བསྡམས།"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ཨི་བོ་ལུ་ཤཱན་ ༡.༤ ནང་ལས་ བང་ཅན་སྦེ་ ལོག་སྟེ་གཞིས་སྤོ་འབད།"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ཆ་ཤས་ཆ་མཉམ་གྱི་ ཨའུཊི་པུཊི་ སྐྱོན་སེལ་འཐུ་འབད་དེ་ ཡིག་སྣོད་ཅིག་ནང་གཏང་།"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "པལག་ཨིན་གང་རུང་ མངོན་གསལ་འབད་ནི་ ལྕོགས་མིན་བཟོ།"
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "ཨི་བོ་ལུ་ཤཱན་ པི་ཨའི་ཨེམ་དང་ གློག་འཕྲིན་གྱི་ཞབས་ཏོག་སྤྱོད་མི།"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17248,9 +17205,9 @@ msgid ""
 "\n"
 "Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
 msgstr ""
-"&quot;evolution&quot; གི་སྣོད་ཐོའི་ནང་དོན་ཧྲིལ་བུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་འབད་དོ།\n"
+"&quot;evolution&quot; སྣོད་ཐོའི་ནང་དོན་ཧྲིལ་བུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་གཏང་ནི་འབད་དོ།\n"
 "\n"
-"གནད་སྡུད་རྙིངམ་འདི་ བཏོན་མ་བཏངམ་ལས་ ཁྱོད་རའི་ཡིག་འཕྲིན་དང་ འབྲེལ་ས་ ཟླ་ཐོའི་གནད་སྡུད་ཚུ་ ལག་ཐོག་ལས་བདེན་སྦྱོར་འབད་དེ་ ཨི་བོ་ལུ་ཤཱན་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་བཏུབ་བཟོ།\n"
+"གནད་སྡུད་རྙིངམ་འདི་ བཏོན་མ་བཏངམ་ལས་ ཁྱོད་རའི་ཡིག་འཕྲིན་དང་ འབྲེལ་ས་ ཟླ་ཐོའི་གནད་སྡུད་ཚུ་ ལག་ཐོག་ལས་བདེན་སྦྱོར་འབད་དེ་ཡོདཔ་བཟོ་ཞིནམ་ལས་ ཨི་བོ་ལུ་ཤཱན་ ཚུལ་མཐུན་སྦེ་ ལཱ་འབད་བཏུབ་བཟོ་དགོ\n"
 "\n"
 "ཚར་གཅིག་བཏོན་བཏང་ཞིནམ་ལས་ ལག་ཐོག་ལས་མ་གཏོགས་ ཨི་བོ་ལུ་ཤཱན་ ཧེ་མའི་ཐོན་རིམ་གུ་ མར་བསྐྱེད་འབད་མི་ཚུགས།\n"
 
@@ -17262,7 +17219,7 @@ msgid ""
 msgstr ""
 "ཧེ་མའི་ཨི་བོ་ལུ་ཤཱན་ ཐོན་རིམ་དེ་གིས་ དེ་གི་གནད་སྡུད་ཚུ་ གནས་ཁོངས་སོ་སོ་ཅིག་ནང་ གསོག་འཇོག་སྦེ་བཞག་ནུག\n"
 "\n"
-"ཁྱོད་ཀྱིས་ གནད་སྡུད་འདི་ རྩ་བསྐྲད་བཏང་པ་ཅིན་ &quot;evolution&quot;གི་སྣོད་ཐོའི་ནང་དོན་ཧྲིལ་བུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་འགྱོ་འོང་། ཁྱོད་ཀྱིས་གནད་སྡུད་འདི་ བདག་འཛིན་སྦེ་བཞག་པ་ཅིན་ &quot;evolution&quot; གི་ ནང་དོན་ཚུ་ ཁྱོད་རའི་སྟབས་བདེ་དང་བསྟུན་ཏེ་ ལག་ཐོག་ལས་ རྩ་བསྐྲད་གཏང་བཏུབ།\n"
+"ཁྱོད་ཀྱིས་གནད་སྡུད་འདི་ རྩ་བསྐྲད་གཏང་ནི་ལུ་གདམ་ཁ་བརྐྱབས་པ་ཅིན་ &quot;evolution&quot;སྣོད་ཐོའི་ནང་དོན་ཧྲིལ་བུ་ རྟག་བརྟན་སྦེ་ རྩ་བསྐྲད་འགྱོ་འོང་། ཁྱོད་ཀྱིས་ གནད་སྡུད་འདི་ བདག་འཛིན་སྦེ་ བཞག་པ་ཅིན་ &quot;evolution&quot; གི་ ནང་དོན་ཚུ་ ཁྱོད་རའི་སྟབས་བདེ་དང་བསྟུན་ཏེ་ ལག་ཐོག་ལས་ རྩ་བསྐྲད་གཏང་བཏུབ།\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -17276,7 +17233,7 @@ msgid ""
 msgstr ""
 "ཁྱོད་ཀྱི་གནད་སྡུད་དང་ གཞི་སྒྲིག་ཚུ་ ཡར་བསྐྱེད་ཀྱི་དོན་ལུ་ ཌིཀསི་གི་བར་སྟོང་{༠}ཚུན་ཚོད་དགོཔ་ཨིན་རུང་ཁྱོད་ལུ་བར་སྟོང་{༡} མ་གཏོགས་མིན་འདུག\n"
 "\n"
-"ཁྱོད་ཀྱིས་འཕྲོ་མ་མཐུད་པའི་ཧེ་མར་ ཁྱོད་རའི་ཁྱིམ་གྱི་སྣོད་ཐོ་ནང་ བར་སྟོང་ཧེང་བཀལ་བཟོ་དགོ"
+"ཁྱོད་ཀྱིས་འཕྲོ་མ་མཐུད་པའི་ཧེ་མར་ ཁྱོད་རའི་ཁྱིམ་གྱི་སྣོད་ཐོ་ནང་ བར་སྟོང་ཧེང་བཀལ་ཡོདཔ་བཟོ་དགོ"
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17304,15 +17261,15 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:31
 msgid "_Forget"
-msgstr "སེམས་ལས་བརྗེད།(_F)"
+msgstr "སེམས་བརྗེད།(_F)"
 
 #: ../shell/shell.error.xml.h:32
 msgid "_Keep Data"
-msgstr "གནད་སྡུད་བདག་འཛིན་སྦེ་བཞག (_K)"
+msgstr "གནད་སྡུད་ བདག་འཛིན་སྦེ་བཞག (_K)"
 
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
-msgstr "ང་ལུ་ཤུལ་ལས་དྲན་བསྐུལ་འབད། (_R)"
+msgstr "ང་ལུ་ ཤུལ་ལས་དྲན་བསྐུལ་འབད། (_R)"
 
 #: ../shell/shell.error.xml.h:34
 msgid ""
@@ -17822,27 +17779,34 @@ msgstr "%s (%s)སྒོ་བསྡམ་དོ།\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས་ཚུ་(_B)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་རྒྱུ་དངོས་ཚུ།(_B)"
 
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་གི་ རྒྱུ་དངོས་ཚུ་བསྒྱུར་བཅོས་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་ སྣོད་འཛིན་འདི་གི་ རྒྱུ་དངོས་ཚུ་ བསྒྱུར་བཅོས་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "འབྲེལ་ས་ཆ་མཉམ་འདྲ་བཤུས་བརྐྱབ་ས་...(_p)"
+msgstr "འབྲེལ་ས་ཚུ་ཆ་མཉམ་རང་ འདྲ་བཤུས་རྐྱབས་...(_p)"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "འབྲེལ་སའི་སྔོན་ལྟ།(_P)"
 
+#: ../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
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "སེལ་འཐུ་འབད་མི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་ འདྲ་བཤུས་རྐྱབས་..."
 
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ནང་འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་གི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ནང་ འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-addressbook.xml.h:9
 #: ../ui/evolution-calendar.xml.h:2
@@ -17855,7 +17819,7 @@ msgstr "སྣོད་འཛིན་ལུ་ འདྲ་བཤུས་ར�
 
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
-msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་འཛིན་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད།"
+msgstr "ཁ་བྱང་ཀི་དེབ་ཀྱི་སྣོད་ཐོ་གསརཔ་ཅིག་ གསར་བསྐྲུན་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5
@@ -17871,7 +17835,7 @@ msgstr "སེལ་འཐུ་འབད་མི་བཏོག"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
-msgstr "ཁ་བྱང་བཏོན་གཏང་།(_e)"
+msgstr "ཁ་བྱང་ཀི་དེབ་བཏོན་གཏང་།(_e)"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
@@ -17879,7 +17843,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་བཏོན་གཏང་།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་བཏོན་གཏང་།"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
@@ -17887,7 +17851,7 @@ msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད།
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "འབྲེལ་ས་ཆ་མཉམ་སྤོ་བཤུད་འབད་ས་...(_v)"
+msgstr "འབྲེལ་ས་ཚུ་ཆ་མཉམ་རང་ སྤོ་བཤུད་འབད་ཡུལ་...(_v)"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
@@ -17895,7 +17859,7 @@ msgstr "སེལ་འཐུ་འབད་མི་འབྲེལ་ས་ཚ
 
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་སྤོ་བཤུད་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྣོད་འཛིན་གཞན་མི་ནང་ སྤོ་བཤུད་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -17923,11 +17887,11 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་ལུ་ བསྐྱར་མིང་བཏགས།"
+msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་དེ་ལུ་ བསྐྱར་མིང་བཏགས།"
 
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
-msgstr "ཁ་བྱང་ཀི་དེབ་དེ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_a)"
+msgstr "ཁ་བྱང་ཀི་དེབ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_a)"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
@@ -17935,7 +17899,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་�
 
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "སེལ་འཐུ་འབད་མི་སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།"
+msgstr "སེལ་འཐུ་འབད་མི་ འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་བཟུམ་ཅིག་སྦེ་སྲུངས།"
 
 #: ../ui/evolution-addressbook.xml.h:34
 #: ../widgets/text/e-text.c:2709
@@ -17944,7 +17908,7 @@ msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
 #: ../ui/evolution-addressbook.xml.h:35
 #: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "ཆ་མཉམ་སེལ་འཐུ་འབད། (_A)"
@@ -17993,15 +17957,15 @@ msgstr "བྱ་བ་ཚུ། (_A)"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "འབྲེལ་ས་འདྲ་བཤུས་བརྐྱབ་ས་...(_C)"
+msgstr "འབྲེལ་ས་འདྲ་བཤུས་བརྐྱབ་ཡུལ་...(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ འདྲ་བཤུས་བརྐྱབ་ས་...(_C)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ འདྲ་བཤུས་བརྐྱབ་ཡུལ་...(_C)"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
-msgstr "འབྲེལ་ས་བཏོན་གཏང་ (_D)"
+msgstr "འབྲེལ་ས་བཏོན་གཏང་། (_D)"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
@@ -18009,11 +17973,11 @@ msgstr "འབྲེལ་ས་གདོང་བསྐྱོད་འབད་
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "འབྲེལ་ས་སྤོ་བཤུད་འབད་ས་...(_M)"
+msgstr "འབྲེལ་ས་སྤོ་བཤུད་འབད་ཡུལ་...(_M)"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ སྤོ་བཤུད་འབད་ས་...(_M)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ཚུ་ སྤོ་བཤུད་འབད་ཡུལ་...(_M)"
 
 #: ../ui/evolution-addressbook.xml.h:55
 #: ../ui/evolution.xml.h:46
@@ -18026,11 +17990,11 @@ msgstr "བསྐྱར་མིང་བཏགས།(_R)"
 
 #: ../ui/evolution-addressbook.xml.h:61
 msgid "_Save Contact as VCard..."
-msgstr "འབྲེལ་ས་ཝི་ཤོག་བྱང་སྦེ་སྲུངས།...(_S)"
+msgstr "འབྲེལ་ས་ཝི་ཤོག་བྱང་བཟུམ་སྦེ་སྲུངས་...(_S)"
 
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
-msgstr "སྣོད་འཛིན་གྱི་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_S)"
+msgstr "སྣོད་འཛིན་འབྲེལ་ས་ཚུ་ ཝི་ཤོག་བྱང་སྦེ་སྲུངས།(_S)"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
@@ -18078,7 +18042,6 @@ msgstr "ཟླཝ།"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "ཤུལ་མམ།"
 
@@ -18089,6 +18052,7 @@ msgstr "དཔར་བསྐྲུན་འབད་ནིའི་ ཟླ་�
 #: ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "ཧེ་མམ།"
 
@@ -18164,7 +18128,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ཚིག་ཡིག་ �
 
 #: ../ui/evolution-composer-entries.xml.h:3
 msgid "Copy selection to clipboard"
-msgstr "སེལ་འཐུ་འབད་མི་དེ་ འཛིན་པང་གུ་འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཛིན་པང་ལུ་འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-composer-entries.xml.h:6
 #: ../ui/evolution-editor.xml.h:9
@@ -18173,19 +18137,19 @@ msgstr "སེལ་འཐུ་འབད་མི་ ཚིག་ཡིག་�
 
 #: ../ui/evolution-composer-entries.xml.h:7
 msgid "Cut selection to clipboard"
-msgstr "སེལ་འཐུ་འབད་མི་དེ་ བཏོག་སྟེ་འཛིན་པང་ལུ་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཛིན་པང་ལུ་བཏོག་བཀལ།"
 
 #: ../ui/evolution-composer-entries.xml.h:9
 msgid "Paste from clipboard"
-msgstr "འཛིན་སྤང་གུ་ལས་སྦྱར།"
+msgstr "འཛིན་སྤང་ནང་ལས་སྦྱར།"
 
 #: ../ui/evolution-composer-entries.xml.h:10
-#: ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "འཛིན་པང་ནང་ལས་ ཚིག་ཡིག་སྦྱར།།"
 
 #: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "ཚིག་ཡིག་ཆ་མཉམ་སེལ་འཐུ་འབད།"
 
@@ -18196,19 +18160,19 @@ msgstr "མཉམ་སྦྲགས་འབད།"
 
 #: ../ui/evolution-editor.xml.h:2
 msgid "Click here to attach a file"
-msgstr "ཡིག་སྣོད་མཉམ་སྦྲགས་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད>"
+msgstr "ཡིག་སྣོད་ཅིག་ མཉམ་སྦྲགས་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-editor.xml.h:3
 msgid "Click here to close the current window"
-msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་ཁ་བསྡམ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོའི་ཡིག་སྣོད་སྒོ་སྒྲིག་དེ་ ཁ་བསྡམ་ནི་ལུ་ཡིག་སྣོད་ཅིག་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-editor.xml.h:4
 msgid "Click here to save the current window"
-msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་བསྲུང་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ད་ལྟོའི་སྒོ་སྒྲིག་བསྲུང་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།།"
 
 #: ../ui/evolution-editor.xml.h:5
 msgid "Click here to view help available"
-msgstr "ཐོབ་ཚུགས་པའི་གྲོགས་རམ་ཚུ་བལྟ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ཐོབ་ཚུགས་པའི་གྲོགས་རམ་སྟོན་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18222,25 +18186,19 @@ msgstr "ཐོབ་ཚུགས་པའི་གྲོགས་རམ་ཚུ
 msgid "Close"
 msgstr "ཁ་བསྡམས།"
 
-#: ../ui/evolution-editor.xml.h:10
-#: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "བཙུགས། (_n)"
-
-#: ../ui/evolution-editor.xml.h:15
+#: ../ui/evolution-editor.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "མཉམ་སྦྲགས་...(_A)"
 
-#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:15
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "ཁ་བསྡམས།་(_C)"
 
-#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
@@ -18249,11 +18207,15 @@ msgstr "ཁ་བསྡམས།་(_C)"
 msgid "_File"
 msgstr "ཡིག་སྣོད། (_F)"
 
-#: ../ui/evolution-editor.xml.h:20
+#: ../ui/evolution-editor.xml.h:19
 #: ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "གྲོགས་རམ། (_H)"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "བཙུགས། (_I)"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "གདམ་ཁ་ཚུ།(_O)"
@@ -18270,47 +18232,47 @@ msgstr "ཉིནམ་གང་གི་བྱུང་ལས།(_D)"
 #: ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
-msgstr "གསང་བ་སྦེ་དབྱེ་རིམ་བཐོ།"
+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 "སྒེར་དོན་སྦེ་དབྱེ་ཁག་བཟོ།"
+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 "མི་མང་སྦེ་དབྱེ་ཁག་བཟོ།"
+msgstr "མི་མང་སྦེ་དབྱེ་བ་བཟོ།"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr "བྱུང་ལས་འདི་གི་དོན་ལུ་ འཇིགས་བརྡ་ཚུ་གཞི་སྒྲིག་འབད་ནི་དང་ སྒྲིག་བཤོལ་འབད་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "འབྱུང་ལས་འདི་གི་དོན་ལུ་ འཇིགས་བརྡ་ཚུ་གཞི་སྒྲིག་ ཡང་ན་ སྒྲིག་བཤོལ་འབད་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-event-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
-msgstr "མཐོ་རིམ་ཅན་གྱི་ གཏང་ནིའི་གདམ་ཁ་ཚུ་བཙུགས། "
+msgstr "མཐོ་རིམ་ཅན་གྱི་ གཏང་བའི་གདམ་ཁ་ཚུ་བཙུགས། "
 
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
-msgstr "འདི་སླར་འབྱུང་བྱུང་ལས་ཅིག་སྦེུ་བཟོ། "
+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 "མི་མང་གི(_b)"
+msgstr "མི་མང་།(_b)"
 
 #: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
-msgstr "ངོ་འཛོམས་པ་ཚུ་གི་དོན་ལས་ དལཝ་/ཁོམ་མེད་ཀྱི་བརྡ་དོན་གྱི་དྲི་དཔྱད་འབད།"
+msgstr "ངོ་འཛོམས་པ་ཚུ་གི་དོན་ལུ་ དལཝ་/ཁོམ་མེད་ཀྱི་བརྡ་དོན་དྲི་དཔྱད་འབད།"
 
 #: ../ui/evolution-event-editor.xml.h:13
 #: ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
-msgstr "ལས་འགན་ས་སྒོ། (_o)"
+msgstr "ལས་འགན་ས་སྒོ་ལུ། (_o)"
 
 #: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as _busy"
@@ -18319,46 +18281,46 @@ msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་སྟོན།
 #: ../ui/evolution-event-editor.xml.h:17
 #: ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
-msgstr "ཆུ་ཚོད་ཀྱི་གླིང་སྡེ། (_Z) "
+msgstr "ཆུ་ཚོད་གླིང་སྡེ་: (_Z) "
 
 #: ../ui/evolution-event-editor.xml.h:18
 #: ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "ངོ་འཛོམས་པའི་དབྱེ་བའི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ངོ་འཛོམས་པའི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:19
 #: ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "ངོས་ལན་གྱི་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ངོས་ལན་གྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:20
 #: ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
-msgstr "ལས་འགན་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ལས་འགན་གྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:21
 #: ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
-msgstr "གནས་ཚད་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "གནས་ཚད་ཀྱི་ས་སྒོ་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:22
 #: ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
-msgstr "ཆུ་ཚོད་གླིང་དེ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
+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 "དབྱེ་རིམ་ཚུ་ བཀྲམ་སྟོན་འབད་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "དབྱེ་བ་ཚུ་ བཀྲམ་སྟོན་འབད་མ་འབད་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All Day Event"
-msgstr "ཉིནམ་གང་གི་བྱུང་ལས་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ཉིནམ་གང་གི་འབྱུང་ལས་ཡོད་དགོཔ་ཨིན་ན་མེན་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
-msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་ སྟོན་དགོ་ག་མིན་དགོ་ སོར་སྟོན་འབདཝ་ཨིན།"
+msgstr "ཆུ་ཚོད་ཁོམ་མེད་སྦེ་ སྟོན་ནི་ཨིན་ན་མེན་ སོར་སྟོན་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_Alarms"
@@ -18374,7 +18336,7 @@ msgstr "དབྱེ་བཟོ། (_C)"
 #: ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
-msgstr "གསང་བའི།(_C)"
+msgstr "གསང་བ།(_C)"
 
 #: ../ui/evolution-event-editor.xml.h:30
 msgid "_Free/Busy"
@@ -18389,7 +18351,7 @@ msgstr "སྒེར་དོན།(_P)"
 #: ../ui/evolution-event-editor.xml.h:32
 #: ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
-msgstr "ངོས་ལན།(_P)"
+msgstr "ངོས་ལན།(_R)"
 
 #: ../ui/evolution-event-editor.xml.h:33
 msgid "_Recurrence"
@@ -18398,12 +18360,12 @@ msgstr "སླར་འབྱུང་།(_R)"
 #: ../ui/evolution-event-editor.xml.h:34
 #: ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
-msgstr "གནས་ཚད་ས་སྒོ།: (_S)"
+msgstr "གནས་ཚད་ས་སྒོ།(_S)"
 
 #: ../ui/evolution-event-editor.xml.h:35
 #: ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
-msgstr "དབྱེ་བའི་ས་སྒོ། (_T)"
+msgstr "དབྱེ་བའི་ས་སྒོ།(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -18450,7 +18412,7 @@ msgstr "སྣོད་འཛིན་ཆ་མཉམ་ནང་ལས་ བ�
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
-msgstr "སྣོད་འཛིན་ཚུ་ འཚོལ་ཞིབ་འབད།(_o)"
+msgstr "སྣོད་འཛིན་ཚུ་ འཚོལ་ཞིབ་འབད།"
 
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
@@ -18466,7 +18428,7 @@ msgstr "སྣོད་འཛིན་ཚུ་ འདྲ་བཤུས་ར�
 
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "_Message Filters"
-msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།(_F)"
+msgstr "འཕྲིན་དོན་གྱི་ཚགས་མ་ཚུ།(_M)"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
@@ -18481,7 +18443,7 @@ msgstr "གསརཔ་...(_N)"
 #.
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Subscriptions"
-msgstr "མཁོ་མངགས་དངུལ།(_S)"
+msgstr "མངགས་དངུལ།(_S)"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
@@ -18493,7 +18455,7 @@ msgstr "སྣོད་འཛིན་འདི་གི་ རྒྱུ་ད�
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "ཐེ་རེཌི་ཆ་མཉམ་ཧྲམ་གཏང་(_T)"
+msgstr "ཐེ་རེཌི་ཆ་མཉམ་ཧྲམ་གཏང་།(_T)"
 
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
@@ -18510,7 +18472,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "ཐེརེཌི་ཆ་མཉམ་རྒྱ་འཕར།(_x)"
+msgstr "ཐེརེཌི་ཆ་མཉམ་ རྒྱ་འཕར་འབད།(_x)"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -18518,11 +18480,11 @@ msgstr "ཕྱིར་བསྐྲད། (_x)"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "འཕྲིན་དོན་ཐེ་རེཌི་ཆ་མཉམ་རྒྱ་འཕར།"
+msgstr "འཕྲིན་དོན་གྱི་ཐེརེཌི་ཆ་མཉམ་རྒྱ་འཕར།"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་ཚུ་སྦ་བཞག (_e)"
+msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་ཚུ་ སྦ་བཞག (_e)"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
@@ -18538,7 +18500,7 @@ msgstr "བཏོན་གཏང་མི་ འཕྲིན་དོན་ཚ�
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
-msgstr "འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ རྟགས་བཀལ། (_k)"
+msgstr "འཕྲིན་དོན་ཆ་མཉམ་ ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ། (_k)"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
@@ -18574,7 +18536,7 @@ msgstr "མཐོང་ཚུགས་པའི་ འཕྲིན་དོན�
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Sh_ow Hidden Messages"
-msgstr "སྦ་སྟེ་བཞག་མི་ འཕྲིན་དོན་ཚུ་སྟོན།(_o)"
+msgstr "སྦ་སྟེ་བཞག་མི་ འཕྲིན་དོན་ཚུ་སྟོན།"
 
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
@@ -18689,7 +18651,7 @@ msgstr "དོན་ཚན་འདི་གི་ཐོག་ལས་ འཕ�
 
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་བཏོག་ཏེ་ འཛིན་པང་གུ་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་བཏོགས་ཏེ་ འཛིན་པང་གུ་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -18725,7 +18687,7 @@ msgstr "ཧེ་མའི་འཕྲིན་དོན་ མ་ལྷག་�
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
-msgstr "བཟུམ་སྦེ་ གདོང་བསྐྱོད་འབད་...(_o)"
+msgstr "བཟུམ་སྦེ་གདོང་བསྐྱོད་འབད་...(_o)"
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -18749,7 +18711,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ ཟུར་རྟགས་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ལུ་ ཤུལ་དཔྱད་ཀྱི་དོན་ལུ་ ཟུར་རྟགས་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -18801,7 +18763,7 @@ msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན
 
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ལྷག་ཡོདཔ་སྦེ་རྟགས་བཀལ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ མ་ལྷགཔ་སྦེ་རྟགས་བཀལ།"
 
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
@@ -18813,11 +18775,11 @@ msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོ�
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ལུ་སྤོ་བཤུད་འབད།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྣོད་འཛིན་གཞན་ཅིག་ལུ་ སྤོ་བཤུད་འབད།"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
-msgstr "འཕྲིན་དོན་གལ་ཅན་ ཤུལ་མམ། (_I)"
+msgstr "འཕྲིན་དོན་གལ་ཅན་ཤུལ་མམ། (_I)"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
@@ -18825,7 +18787,7 @@ msgstr "ཐེརེཌི་ཤུལ་མམ། (_T)"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
-msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཤུལ་མམ།"
+msgstr "མ་ལྷག་པའི་འཕྲིན་དོན་ཤུལ་མམ།(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
@@ -18837,11 +18799,11 @@ msgstr "ཡིག་འཕྲིན་གྱི་ འཕྲིན་དོན�
 
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
-msgstr "སེལ་འཐུ་འབད་མི་ འཕྲིན་དོན་དེ་སྒོ་སྒྲིག་གསརཔ་ཅིག་ནང་ཁ་ཕྱེ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ སྒོ་སྒྲིག་གསརཔ་ཅིག་ནང་ཁ་ཕྱེ།"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
-msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཞུན་དག་གི་དོན་ལུ་ རྩོམ་མཁན་ནང་ལུ་ཁ་ཕྱེ།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཞུན་དག་གི་དོན་ལུ་རྩོམ་མཁན་ནང་ཁ་ཕྱེ།"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
@@ -18849,7 +18811,7 @@ msgstr "ཧེ་མའི་ འཕྲིན་དོན་མ་ལྷགཔ�
 
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས འཕྲིན་དོན་ཚུ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ འཕྲིན་དོན་ཚུ་སྦྱར།"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
@@ -18893,7 +18855,7 @@ msgstr "ཚིག་ཡིག་དེ་ ཧེ་མའི་ཚད་གུ�
 
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
-msgstr "སེ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཚིག་ཡིག་ཡིག་སྣོད་ཅིག་སྦེ་སྲུངས།"
+msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན་ཚུ་ ཚིག་ཡིག་ཡིག་སྣོད་ཅིག་སྦེ་སྲུངས།"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
@@ -18937,7 +18899,7 @@ msgstr "འཕྲིན་དོན་ཚུ་སྤྱིར་བཏང་བ
 
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
-msgstr "འཕྲིན་དོན་ཚུ་གློག་འཕྲིན་མགོ་ཡིག་ཆ་མཉམ་དང་སྦྲགས་ཏེ་སྟོན།"
+msgstr "འཕྲིན་དོན་ཚུ་གློག་འཕྲིན་མགོ་ཡིག་ ཆ་མཉམ་དང་སྦྲགས་ཏེ་སྟོན།"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
@@ -18949,7 +18911,7 @@ msgstr "སེལ་འཐུ་འབད་མི་འཕྲིན་དོན
 
 #: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
-msgstr "གལ་ཅན་མེནམ།(_m)"
+msgstr "གལ་ཅན་མེནམ།(_i)"
 
 #: ../ui/evolution-mail-message.xml.h:100
 msgid "Zoom _Out"
@@ -19001,7 +18963,7 @@ msgstr "གཟུགས་བརྙན་ཚུ་ མངོན་གསལ་�
 
 #: ../ui/evolution-mail-message.xml.h:117
 msgid "_Message Source"
-msgstr "འཕྲིན་དོན་འབྱུང་ཁུངས།(_M)"
+msgstr "འཕྲིན་དོན་གྱི་འབྱུང་ཁུངས།(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
@@ -19025,7 +18987,7 @@ msgstr "ཧེ་མའི་འཕྲིན་དོན། (_P)"
 
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
-msgstr "འདྲེན་རྟགས་ནང་བཀོད་ཡོདཔ།(_Q)"
+msgstr "འདྲེན་རྟགས་བཀོད་ཡོདཔ།(_Q)"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -19055,11 +19017,11 @@ msgstr "ལག་ཆས་ཕྲ་རིང་གཙོ་བོ།"
 
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
-msgstr "སེལ་འཐུ་འབད་མི་བརྗེན་ཐོ་འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
-msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་བཏོག"
+msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་བཏོག་གཏང་།"
 
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
@@ -19067,15 +19029,15 @@ msgstr "སེལ་འཐུ་འབད་མི་བརྗེད་ཐོ་
 
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས་བརྗེད་ཐོ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ ཚིག་ཡིག་སྦྱར།།"
 
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "དཔར་བསྐྲུན་འབད་ནིའི་ བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ སྔོན་ལྟ་འབདཝ་ཨིན།"
+msgstr "དཔར་བསྐྲུན་འབད་ནིའི་བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ སྔོན་ལྟ་འབདཝ་ཨིན།"
 
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་དཔར་བསྐྲུན་འབད།"
+msgstr "བརྗེད་ཐོ་ཚུ་གི་ཐོ་ཡིག་ དཔར་བསྐྲུན་འབད།"
 
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
@@ -19118,12 +19080,17 @@ msgstr "རྩ་སྒྲིག (_m)"
 
 #: ../ui/evolution-message-composer.xml.h:9
 msgid "Get delivery notification when your message is read"
-msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ལྷག་ཚརཝ་དང་ འགྲེམ་སྤེལ་བརྡ་དོན་ལེན།"
+msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ལྷག་པའི་སྐབས་ འགྲེམ་སྤེལ་གྱི་བརྡ་དོན་ལེན།"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "ཨེཆ་ཊི་ཨེམ་ཨེལ། (_M)"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "བཙུགས། (_n)"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ཡིག་སྣོད་ཅིག་ཁ་ཕྱེ།"
@@ -19199,7 +19166,7 @@ msgstr "ཡིག་འཕྲིན་འདི་གཏང་།"
 
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Set the message priority to high"
-msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་མཐོ་སར་གཞི་སྒྲིག་འབད།"
+msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་ མཐོ་དྲགས་སྦེ་གཞི་སྒྲིག་འབད།"
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
@@ -19255,11 +19222,11 @@ msgstr "ཁ་ཕྱེ་...(_O)"
 
 #: ../ui/evolution-message-composer.xml.h:50
 msgid "_Post-To Field"
-msgstr "ས་སྒོ་ལུ་གནས་བསྐྱོད་འབད། (_P)"
+msgstr "ས་སྒོ་ལུ་-གནས་བསྐྱོད་འབད། (_P)"
 
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Prioritize Message"
-msgstr "འཕྲིན་དོན་གཙོ་རིམ་བཟོ།(_P)"
+msgstr "འཕྲིན་དོན་གྱི་གཙོ་རིམ་བཟོ།(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
@@ -19275,7 +19242,7 @@ msgstr "ས་སྒོ་ལུ། (_T)"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
-msgstr "ཁ་བསྡམས། (_l)"
+msgstr "ཁ་བསྡམས། (_C)"
 
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "H_TML"
@@ -19322,15 +19289,15 @@ msgstr "མཁོ་མངགས་བཤོལ།"
 
 #: ../ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
-msgstr "སེལ་འཐུ་འབད་མི་ འདྲེན་རྟགས་ནང་བཙུགས། (_I)"
+msgstr "སེལ་འཐུ་འབད་མི་ གནས་ལོག་འབད། (_I)"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr "ལས་ཀའི་རྒྱས་བཤད་གནས་ཚད་ སོར་/སྟོན་ལུ་ ཨེབ་གཏང་འབད།"
+msgstr "ལས་ཀའི་གནས་ཚད་རྒྱས་བཤད བསྒྱུར་བཅོས་འབད་ནི་/སྟོན་ནིའི་དོན་ལུ་ ཨེབ་གཏང་འབད།"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
-msgstr "གནས་ཚད་ཀྱི་རྒྱས་བཤད།"
+msgstr "གནས་ཚད་རྒྱས་བཤད།"
 
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
@@ -19342,15 +19309,15 @@ msgstr "གདམ་ཁ་ཚུ་གཏང་།(_S)"
 
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
-msgstr "གནས་ཚད་ཀྱི་རྒྱས་བཤད་ཚུ།(_S)"
+msgstr "གནས་ཚད་རྒྱས་བཤད།(_S)"
 
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
-msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་ འདྲ་བཤུས་རྐྱབས།"
+msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་འདྲ་བཤུས་རྐྱབས།"
 
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
-msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་བཏོག"
+msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་བཏོག་གཏང་།"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19362,7 +19329,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ལས་ཀ་ཚུ་ �
 
 #: ../ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
-msgstr "མཇུག་བསྡུཝ་སྦེ་ རྟགས་བཀལ། (_k)"
+msgstr "མཇུག་བསྡུཝ་སྦེ་རྟགས་བཀལ། (_k)"
 
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
@@ -19370,7 +19337,7 @@ msgstr "སེལ་འཐུ་འབད་མི་ ལས་ཀ་ཚུ་ �
 
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
-msgstr "འཛིན་པང་ནང་ལས་ལས་ཀ་ཚུ་སྦྱར།"
+msgstr "འཛིན་པང་ནང་ལས་ ལས་ཀ་ཚུ་སྦྱར།"
 
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
@@ -19382,7 +19349,7 @@ msgstr "ལས་ཀའི་ཐོ་ཡིག་ དཔར་བསྐྲུ�
 
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
-msgstr "ལས་ཀ་སྔོན་ལྟའི་སྒོ་སྒྲིག་སྟོན།"
+msgstr "འབྲེལ་ས་སྔོན་ལྟའི་ སྒོ་སྒྲིག་སྟོན།"
 
 #: ../ui/evolution-tasks.xml.h:19
 msgid "Task _Preview"
@@ -19446,7 +19413,7 @@ msgstr "ནང་འདྲེན་འབད་...(_m)"
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
-msgstr "ངོས་དཔར་དང་ཚིག་ཡིག (_a)"
+msgstr "ངོས་དཔར་དང་ ཚིག་ཡིག (_a)"
 
 #: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
@@ -19482,7 +19449,7 @@ msgstr "ཨི་བོ་ལུ་ཤཱན་གྱི་སྐོར་ལས
 
 #: ../ui/evolution.xml.h:24
 msgid "Side _Bar"
-msgstr "ཟུར་ཁའི་ཕྱ་རིང་།(_B)"
+msgstr "ཟུར་ཁའི་ཕྲ་རིང་།(_B)"
 
 #: ../ui/evolution.xml.h:25
 msgid "Status _Bar"
@@ -19518,11 +19485,11 @@ msgstr "ལག་ཆས་ ཕྲ་རིང་གི་ བཟོ་རྣམ�
 
 #: ../ui/evolution.xml.h:36
 msgid "View/Hide the Side Bar"
-msgstr "ཟུར་ཁའི་ཕྲ་རིང་སྟོན་/སྦ་བཞག"
+msgstr "ཟུར་ཁའི་ཕྲ་རིང་སྟོན་/སྦ།"
 
 #: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
-msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན་/སྦ་བཞག"
+msgstr "གནས་ཚད་ཕྲ་རིང་སྟོན་/སྦ།"
 
 #: ../ui/evolution.xml.h:38
 msgid "_About"
@@ -19534,11 +19501,11 @@ msgstr "སྒོ་སྒྲིག་ཁ་བསྡམས།(_C)"
 
 #: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
-msgstr "ཆོག་ཡིག་ཚུ་སེམས་ཁར་མ་བཞག (_F)"
+msgstr "ཆོག་ཡིག་ཚུ་ སེམས་ཁར་མ་བཞག (_P)"
 
 #: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
-msgstr "ཨེབ་རྟ་ཚུ་ སྦ་བཞག (_H)"
+msgstr "ཨེབ་རྟ་ཚུ་སྦ་བཞག (_H)"
 
 #: ../ui/evolution.xml.h:45
 msgid "_Icons only"
@@ -19570,7 +19537,7 @@ msgstr "སྒོ་སྒྲིག (_W)"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "ཚོང་སྡེའི་ཐོག་ལས། (_C)"
+msgstr "ཚོང་སྡེ་གིས། (_C)"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
@@ -19582,7 +19549,7 @@ msgstr "བརྒྱུད་འཕྲིན་ཐོ་ཡིག (_P)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
-msgstr "བདུན་ཕྲག་གི་མཐོང་སྣང་། (_e)"
+msgstr "བདུན་ཕྲག་གི་མཐོང་སྣང་། (_W)"
 
 #: ../views/calendar/galview.xml.h:2
 msgid "_Day View"
@@ -19606,7 +19573,7 @@ msgstr "བཏང་ཡོད་པའི་ སྣོད་འཛིན་བ�
 
 #: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
-msgstr "གནས་ཚད་ཐོག་ལས། (_t)"
+msgstr "གནས་ཚད་ཐོག་ལས། (_t"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
@@ -19754,10 +19721,6 @@ msgstr "མཐོང་སྣང་གི་དབྱེ་བ།"
 msgid "Type of view:"
 msgstr "མཐོང་སྣང་གི་དབྱེ་བ་:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-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:416
@@ -19765,7 +19728,7 @@ msgid "MTWTFSS"
 msgstr "ཨེམ་ཊི་ཌབ་ལུ་ཊི་ཨེཕ་ཨེསི་ཨེསི།"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1112
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19844,7 +19807,7 @@ msgstr "ཉུང་མཐའི་རྒྱ་ཚད།"
 
 #: ../widgets/misc/e-canvas-vbox.c:114
 #: ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "བར་སྟོང་བཞག་ཐངས།"
 
@@ -19992,53 +19955,53 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "རྒྱ་བསྐྱེད་འབད་ཡོདཔ།"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "རྒྱ་སྐྱེད་པ་དེ་ རྒྱ་བསྐྱེད་འབད་ག་མ་འབད།"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "རྒྱ་སྐྱེད་པའི་ ཁ་ཡིག་གི་ཚིག་ཡིག"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "འོག་ཐིག་ལག་ལེན་འཐབ།"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 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:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "ཁ་ཡིག་དང་ ཅ་ཡེལ་གྱི་བར་ན་ བཙུགས་ནིའི་བར་སྟོང་།"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "ཁ་ཡིག་གི་ ཝི་གེཊི།"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "སྤྱིར་བཏང་རྒྱ་སྐྱེད་པའི་ ཁ་ཡིག་ཚབ་ལུ་ བཀྲམ་སྟོན་འབད་ནིའི་ ཝི་གེཊི་ཅིག"
 
-#: ../widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:222
 #: ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "རྒྱ་སྐྱེད་པའི་ཚད།"
 
-#: ../widgets/misc/e-expander.c:224
+#: ../widgets/misc/e-expander.c:223
 #: ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "རྒྱ་སྐྱེད་པའི་ མདའ་རྟགས་ཀྱི་ཚད།"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "བརྡ་སྟོན་པའི་ བར་སྟོང་བཞག་ཐངས།"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "རྒྱ་སྐྱེད་པའི མདའ་རྟགས་མཐའ་སྐོར་ལུ་ བར་སྟོང་བཞག་ཐངས།"
 
@@ -20053,7 +20016,7 @@ msgstr "འཚོལ་ཞིབ་ཚུ། (_S)"
 
 #: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
-msgstr "འཚོལ་ཞིབ་ཚུ། "
+msgstr "འཚོལ་ཞིབ་ཚུ།"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:227
@@ -20063,7 +20026,7 @@ msgstr "འཚོལ་ཞིབ་སྲུངས།"
 #: ../widgets/misc/e-filter-bar.h:92
 #: ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
-msgstr "འཚོལ་ཞིབ་སྲུངས་...(_S)"
+msgstr "འཚོལ་ཞིབ་སྲུངས་...(_S"
 
 #: ../widgets/misc/e-filter-bar.h:93
 #: ../widgets/misc/e-filter-bar.h:100
@@ -20120,32 +20083,32 @@ msgstr "ཀེར་ཐིག་གི་རྒྱ་ཚད།"
 msgid "Search"
 msgstr "འཚོལ་ཞིབ།"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
-msgstr "འཚོལ་ཞིབ་འབད། (_S)"
+msgstr "འཚོལ་ཞིབ་འབད། (_S"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "ད་ལྟོ་རང་འཚོལ། (_F)"
 
-#: ../widgets/misc/e-search-bar.c:598
-#: ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595
+#: ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "བསལ། (_C)"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "འཚོལ་ཞིབ་དབྱེ་བ།"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "རྣམ་གྲངས་གྱི་ཨའི་ཌི"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "རྣམ་གྲངས་ཡན་ལག་གི་ཨའི་ཌི"
 
-#: ../widgets/misc/e-search-bar.c:911
+#: ../widgets/misc/e-search-bar.c:904
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3485
@@ -20153,9 +20116,9 @@ msgstr "རྣམ་གྲངས་ཡན་ལག་གི་ཨའི་ཌི
 msgid "Text"
 msgstr "ཚིག་ཡིག"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
-msgstr "ད་ལྟོ་རང་འཚོལ། (_w)"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "ད་ལྟོ་རང་འཚོལ། (_N)"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
@@ -20209,7 +20172,7 @@ msgstr "དབྱེ་བཟོ། (_l)"
 
 #: ../widgets/misc/e-send-options.glade.h:7
 msgid "Creat_e a sent item to track information"
-msgstr "ཊེཀ་གི་བརྡ་དོན་ལུ་ བཏང་ཡོད་པའི་ རྣམ་གྲངས་ཅིག་བཟོ།(_e)"
+msgstr "བརྡ་དོན་རྗེས་འཚོལ་འབད་ནི་ལུ་ བཏང་ཡོད་པའི་རྣམ་གྲངས་ཅིག་ གསར་བསྐྲུན་འབད།(_e)"
 
 #: ../widgets/misc/e-send-options.glade.h:8
 msgid "Deli_vered and opened"
@@ -20239,7 +20202,7 @@ msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:16
 msgid "R_eply requested"
-msgstr "ལན་གསལ་གྱི་ཞུ་བ་ཡོད། (_e)"
+msgstr "ལན་གསལ་གྱི་ཞུ་བ་འབད་ཡོད། (_e)"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
@@ -20317,7 +20280,7 @@ msgstr "%s (%d%% ཡོངས་བསྒྲུབས།)"
 
 #: ../widgets/misc/e-url-entry.c:107
 msgid "Click here to go to URL"
-msgstr "ཡུ་ཨར་ཨེལ་ལུ་འགྱོ་ནི་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
+msgstr "ཡུ་ཨར་ཨེལ་ལུ་ འགྱོ་ནིའི་དོན་ལུ་ ནཱ་ལུ་ཨེབ་གཏང་འབད།"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -20490,7 +20453,7 @@ msgstr "ཐོག་ལས་སྡེ་ཚན་བཟོ་...(_G)"
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
-msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན་:(_S)"
+msgstr "ས་སྒོ་འདི་ཚུ་ གོ་རིམ་ནང་སྟོན།(_S)"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
@@ -20914,6 +20877,20 @@ msgstr "ཨའི་ཨེམ་སྐབས་དོན།"
 msgid "Handle Popup"
 msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 
+#~ msgid "Properties..."
+#~ msgstr "རྒྱུ་དངོས་ཚུ་..."
+#~ 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 ""
+#~ "འཕྲིན་དོན་འདི་ ཕྱི་ཁའི་གློག་རིམ་ &quot;sendmail&quot;བརྒྱུད་དེ་བཏང་ནུག སེནཌི་མེལ་གྱིས་ འོག་གི་"
+#~ "འཛོལ་བ་དེ་ སྙན་ཞུ་འབད་མིའི་ནང་ གནས་ཚད་༦༧:འབད་མི་ ཡིག་འཕྲིན་དེ་ བཏང་མ་ཚུགས་ཟེར་ཨིན་པས།\n"
+#~ "འཕྲིན་དོན་འདི་ ཕྱི་སྒྲོམ་སྣོད་འཛིན་ནང་ གསོག་འཇོག་འབད་དེ་འདུག འཕྲིན་དོན་གྱི་འཛོལ་བ་ ཞིབ་དཔྱད་འབད་"
+#~ "ཞིནམ་ལས་ ལོག་སྟེ་གཏང་།"
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ དོན་ཚན་&quot;{0}&quot;འབད་མི་དེ་ འགྲེམ་སྤེལ་མ་འབད་བས།"
 #~ msgid "Addressbook"
 #~ msgstr "ཁ་བྱང་ཀི་དེབ།"
 #~ msgid ""
@@ -21103,18 +21080,6 @@ msgstr "པོཔ་ཨཔ་ལེགས་སྐྱོང་འཐབ།"
 #~ msgstr "འགྲུལ་ལམ་:%sདབྱེ་བ་ %s།"
 #~ msgid "Type: %s"
 #~ msgstr "དབྱེ་བ་:%s།"
-#~ 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 ""
-#~ "འཕྲིན་དོན་འདི་ ཕྱི་ཁའི་གློག་རིམ་ &quot;sendmail&quot;བརྒྱུད་དེ་བཏང་ནུག འཕྲིན་གཏང་གིས་ འོག་གི་"
-#~ "འཛོལ་བ་དེ་ སྙན་ཞུ་འབད་མིའི་ནང་ གནས་ཚད་༦༧:འབད་མི་ ཡིག་འཕྲིན་དེ་ བཏང་མ་ཚུགས་ཟེར་ཨིན་པས།\n"
-#~ "འཕྲིན་དོན་འདི་ ཕྱི་སྒྲོམ་སྣོད་འཛིན་ནང་ གསོག་འཇོག་འབད་ནུག འཕྲིན་དོན་གྱི་འཛོལ་བ་ ཞིབ་དཔྱད་འབད་ཞིནམ་"
-#~ "ལས་ ལོག་སྟེ་གཏང་།"
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "ཁྱོད་ཀྱི་འཕྲིན་དོན་ དོན་ཚན་&quot;{0}&quot;འབད་མི་དེ་ འགྲེམ་སྤེལ་མ་འབད་བས།"
 #~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
 #~ msgstr "<span weight=\"bold\">རང་བཞིན་གྱི་འབྲེལ་ས་ཚུ་</span>"
 #~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
diff --git a/po/el.po b/po/el.po
index 539b91d488..4889b72d3b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -41,15 +41,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 13:38+0200\n"
-"PO-Revision-Date: 2006-02-24 18:11+0200\n"
+"POT-Creation-Date: 2006-05-14 11:37+0300\n"
+"PO-Revision-Date: 2006-05-14 11:39+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <team@gnome.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.1\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -91,32 +91,32 @@ msgstr "Επαφή: "
 msgid "evolution minicard"
 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
 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 "Γεγονός ημερολογίου: Η περίληψη είναι %s."
 
-#: ../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:299
 msgid "calendar view event"
 msgstr "προβολή γεγονότος ημερολογίου"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Λήψη Εστίασης"
 
@@ -145,32 +145,32 @@ 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
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Έχει %d γεγονός."
 msgstr[1] "Έχει %d γεγονότα."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Δεν έχει γεγονότα."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Προβολή εργάσιμης εβδομάδας: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Προβολή Ημέρας: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "προβολή ημερολογίου για μια εργάσιμη εβδομάδα"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "προβολή ημερολογίου για μια ή περισσότερες ημέρες"
 
@@ -246,21 +246,21 @@ msgstr "Jump button"
 msgid "Click here, you can find more events."
 msgstr "Κάντε κλικ εδώ για να βρείτε περισσότερα γεγονότα."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Προβολή Μήνα: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 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 "προβολή ημερολογίου για μια ή περισσότερες εβδομάδες"
 
@@ -421,8 +421,7 @@ msgstr "Δημιουργία βιβλίου διευθύνσεων GroupWise:"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
-"Η απάντηση του διακομιστή IMAP δεν περιείχε έγκυρες πληροφορίες σχήματος."
+msgstr "Η απάντηση του διακομιστή IMAP δεν περιείχε έγκυρες πληροφορίες σχήματος."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
@@ -439,8 +438,7 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Το Βιβλίο Διευθύνσεων του Evolution τερματίστηκε απρόσμενα."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Η εικόνα που επιλέξατε είναι μεγάλη. Θέλετε να αλλαχθεί το μέγεθος της και "
 "να αποθηκευθεί;"
@@ -526,8 +524,7 @@ msgstr ""
 "αλλαγές;"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Οι επαφές σας για {0} δεν θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει "
 "ξανά."
@@ -564,8 +561,7 @@ msgstr "Αδυναμία φόρτωσης του βιβλίου διευθύνσ
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -585,9 +581,9 @@ msgstr "Ρυθμίστε εδώ την αυτόματη συμπλήρωση"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Επαφές"
 
@@ -859,7 +855,7 @@ msgstr "Αποθήκευση ως VCard..."
 msgid "_Properties..."
 msgstr "Ι_διότητες..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Επιλογέας πηγής επαφής"
 
@@ -868,12 +864,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση στο διακομιστή LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
@@ -912,8 +908,7 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"URI για το φάκελο που χρησιμοποιήθηκε τελευταία στο διάλογο επιλογής ονομάτων"
+msgstr "URI για το φάκελο που χρησιμοποιήθηκε τελευταία στο διάλογο επιλογής ονομάτων"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
@@ -1001,8 +996,7 @@ msgid "Email address"
 msgstr "Διεύθυνση Email"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Το Evolution θα χρησιμοποιήσει αυτήν τη διεύθυνση για την πιστοποίησή σας "
 "στο διακομιστή."
@@ -1236,12 +1230,9 @@ msgstr "κάρτες"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1500,7 +1491,7 @@ msgstr "Διεύθυνση"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2509,7 +2500,7 @@ msgstr "Υπηρεσία"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Τοποθεσία"
@@ -2573,15 +2564,15 @@ msgstr "Αλλάχθηκε"
 msgid "Contact Editor - %s"
 msgstr "Επεξεργαστής Επαφών - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2759
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Παρακαλώ επιλέξτε μια εικόνα για αυτή την επαφή"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2760
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Χωρίς εικόνα"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3044
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2589,7 +2580,7 @@ msgstr ""
 "Τα δεδομένα επαφής δεν είναι έγκυρα:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Μη έγκυρη επαφή."
 
@@ -2746,8 +2737,8 @@ msgstr "Υπηρεσία _IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:224
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Τοποθεσία:"
 
@@ -2790,8 +2781,7 @@ msgstr "Επιλο_γή"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2918,7 +2908,7 @@ msgstr "Πηγή"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2931,7 +2921,7 @@ msgid "Save as VCard..."
 msgstr "Αποθήκευση ως VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3151,7 +3141,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:491
+#: ../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"
@@ -3190,7 +3180,7 @@ msgstr "Ιστοσελίδα"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../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:656
@@ -3198,7 +3188,7 @@ msgstr "Ιστοσελίδα"
 #: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Πλάτος"
@@ -3206,14 +3196,14 @@ msgstr "Πλάτος"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../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:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Ύψος"
@@ -3590,7 +3580,7 @@ msgstr[0] ""
 "Ανοίγοντας %d επαφή θα γίνει άνοιγμα %d  νέου παραθύρου.\n"
 "Θέλετε να εμφανίσετε αυτή την επαφή;"
 msgstr[1] ""
-";Ανοίγοντας %d επαφές θα γίνει άνοιγμα %d  νέων παραθύρων.\n"
+"Ανοίγοντας %d επαφές θα γίνει άνοιγμα %d  νέων παραθύρων.\n"
 "Θέλετε να εμφανίσετε όλες αυτές τις επαφές;"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
@@ -3733,19 +3723,19 @@ msgstr "Εισαγωγέας CSV και Tab του Evolution"
 msgid "Importing ..."
 msgstr "Γίνεται εισαγωγή ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Εισαγωγέας LDIF του Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Εισαγωγέας VCard Evolution"
 
@@ -3808,7 +3798,7 @@ msgstr "Μορφοποίηση"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Κεφαλίδα"
@@ -3912,9 +3902,9 @@ msgstr "Σκίαση"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:226
-#: ../plugins/exchange-operations/exchange-contacts.c:207
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Μέγεθος:"
 
@@ -3954,8 +3944,7 @@ msgstr "Πνευματικά Δικαιώματα (C) 2000, Ximian, Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
-"Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφών"
+msgstr "Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφών"
 
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -4004,8 +3993,7 @@ msgid "Export in asynchronous mode"
 msgstr "Εξαγωγή σε ασύγχρονη κατάσταση"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Ο αριθμός των καρτών σε ένα αρχείο αποτελέσματος σε ασύγχρονη κατάσταση, "
 "προεπιλεγμένο μέγεθος 100."
@@ -4015,8 +4003,7 @@ msgid "NUMBER"
 msgstr "ΑΡΙΘΜΟΣ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Σφάλμα παραμέτρων γραμμής εντολών, παρακαλώ χρησιμοποιήστε --help για να "
 "δείτε τη χρήση."
@@ -4074,8 +4061,7 @@ msgstr ""
 "δε θα είναι δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες σε αυτό το ημερολόγιο θα διαγραφούν και δε θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4095,8 +4081,7 @@ msgstr ""
 "δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες για αυτό το ραντεβού θα διαγραφούν και δε θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4110,8 +4095,7 @@ msgstr ""
 "θα είναι δυνατή η ανάκτηση τους."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Όλες οι πληροφορίες για αυτή τη συνάντηση θα διαγραφούν και δεν θα είναι "
 "δυνατή η ανάκτηση τους."
@@ -4140,8 +4124,7 @@ msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφούν
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε να διαγραφούν αυτές οι {0} καταχωρήσεις ημερολογίου;"
+msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφούν αυτές οι {0} καταχωρήσεις ημερολογίου;"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -4212,8 +4195,7 @@ msgstr ""
 "επιτρέψουν να αποδεχθούν αυτή την εργασία."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Προσκλήσεις μέσω email θα σταλούν σε όλους τους συμμετέχοντες και θα τους "
 "επιτρέψουν να απαντήσουν."
@@ -4348,8 +4330,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Θέλετε να στείλετε σε όλους τους συμμετέχοντες μια ειδοποίηση ακύρωσης;"
+msgstr "Θέλετε να στείλετε σε όλους τους συμμετέχοντες μια ειδοποίηση ακύρωσης;"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4367,8 +4348,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
-"Θέλετε να στείλετε ενημερωμένες πληροφορίες εργασίας στους συμμετέχοντες;"
+msgstr "Θέλετε να στείλετε ενημερωμένες πληροφορίες εργασίας στους συμμετέχοντες;"
 
 #: ../calendar/calendar.error.xml.h:62
 msgid ""
@@ -4394,18 +4374,15 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr ""
-"Έχετε κάνει αλλαγές σε αυτό το memo, αλλά δεν τις έχετε αποθηκεύσει ακόμα."
+msgstr "Έχετε κάνει αλλαγές σε αυτό το memo, αλλά δεν τις έχετε αποθηκεύσει ακόμα."
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Τα ημερολόγια σας δε θα είναι διαθέσιμα μέχρι το Evolution ξεκινήσει ξανά."
+msgstr "Τα ημερολόγια σας δε θα είναι διαθέσιμα μέχρι το Evolution ξεκινήσει ξανά."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Οι εργασίες σας δε θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει ξανά."
+msgstr "Οι εργασίες σας δε θα είναι διαθέσιμες μέχρι το Evolution ξεκινήσει ξανά."
 
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
@@ -4422,7 +4399,7 @@ msgid "_Save Changes"
 msgstr "Απο_θήκευση αλλαγών"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Αποστολή"
 
@@ -4455,14 +4432,12 @@ msgstr "Δεν ήταν δυνατή η εκκίνηση του  evolution-data-
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανάγνωση του τμήματος Memo του Υπολογιστή ΠαλάμηςMemo "
+msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Memo του Υπολογιστή ΠαλάμηςMemo "
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
@@ -4476,14 +4451,12 @@ msgstr "Προκαθορισμένη Προτεραιότητα:"
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+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 ""
-"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:1969
@@ -4539,14 +4512,14 @@ msgid "Memos"
 msgstr "Memos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Εργασίες"
@@ -4565,9 +4538,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του Ημερολογίου του Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "λεπτό"
@@ -4700,67 +4670,34 @@ msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστ
 msgid "invalid time"
 msgstr "μη έγκυρη ώρα"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld δευτερόλεπτα)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "δευτερόλεπτο"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "δευτερόλεπτα"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr "%u δευτερόλεπτο"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr "%u δευτερόλεπτα"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr "%u λεπτό"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr "%u λεπτά"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ώρα"
+msgstr[1] "%d ώρες"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "%u ώρα"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d λεπτό"
+msgstr[1] "%d λεπτά"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u ώρες"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d δευτερόλεπτο"
+msgstr[1] "%d δευτερόλεπτα"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4772,21 +4709,18 @@ msgstr "Ερώτηση επαλήθευσης για τα στοιχεία πο�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr ""
-"Χρώμα παρασκηνίου για τις εργασίες που λήγουν σήμερα, σε μορφή \"#rrggbb\"."
+msgstr "Χρώμα παρασκηνίου για τις εργασίες που λήγουν σήμερα, σε μορφή \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr ""
-"Χρώμα παρασκηνίου για τις εργασίες που έχουν λήξει, σε μορφή \"#rrggbb\"."
+msgstr "Χρώμα παρασκηνίου για τις εργασίες που έχουν λήξει, σε μορφή \"#rrggbb\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Ημερολόγια για την εκτέλεση ειδοποιήσεων"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Χρώμα για το σχεδιασμό της γραμμής  Marcus Bains στη γραμμή χρόνου (κενό για "
 "προεπιλογή)"
@@ -4966,8 +4900,7 @@ msgstr "Ε_μφάνιση χρόνων τέλους ραντεβού στις π
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
-"Εμφάνιση πεδίου κατηγοριών στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου κατηγοριών στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
@@ -4975,8 +4908,7 @@ msgstr "Εμφάνιση συναγερμών στην περιοχή ειδοπ
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
-msgstr ""
-"Εμφάνιση πεδίου κατάστασης στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου κατάστασης στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
@@ -4990,8 +4922,7 @@ msgstr "Προβολή του ταμπλό \"Προεπισκόπηση\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
-"Εμφάνιση πεδίου ζώνης ώρας στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
+msgstr "Εμφάνιση πεδίου ζώνης ώρας στον επεξεργαστή γεγονότος/εργασίας/συνάντησης"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
@@ -5046,12 +4977,10 @@ msgstr "24ωρη μορφή ώρας"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Μονάδες για μια προεπιλεγμένη υπενθύμιση. \"λεπτά\", \"ώρες\" or \"ημέρες\"."
+msgstr "Μονάδες για μια προεπιλεγμένη υπενθύμιση. \"λεπτά\", \"ώρες\" or \"ημέρες\"."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Μονάδες για τον καθορισμό της απόκρυψης εργασιών, \"λεπτά\", \"ώρες\" ή "
 "\"ημέρες\"."
@@ -5076,8 +5005,7 @@ msgstr "Ερώτηση επαλήθευσης για τη διαγραφή ρα�
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Αν θα γίνεται ερώτηση επαλήθευσης για την εξάλειψη ραντεβού και εργασιών."
+msgstr "Αν θα γίνεται ερώτηση επαλήθευσης για την εξάλειψη ραντεβού και εργασιών."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
@@ -5094,8 +5022,7 @@ msgstr ""
 "μήνα."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Αν θα σχεδιάζεται η γραμμή  Marcus Bains (γραμμή στη τρέχουσα ώρα) στο "
 "ημερολόγιο."
@@ -5133,8 +5060,7 @@ msgstr ""
 "συναντήσεων"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+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:79
@@ -5204,10 +5130,10 @@ msgstr "Εκτύπωση"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5275,8 +5201,7 @@ msgstr ""
 
 #: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-"Δεν υπάρχει διαθέσιμο ημερολόγιο για τη δημιουργία γεγονότων και συναντήσεων"
+msgstr "Δεν υπάρχει διαθέσιμο ημερολόγιο για τη δημιουργία γεγονότων και συναντήσεων"
 
 #: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
@@ -5469,7 +5394,7 @@ msgstr "λεπτό(ά)"
 msgid "start of appointment"
 msgstr "αρχή ραντεβού"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Ενέργεια/Trigger"
 
@@ -5545,8 +5470,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u και %d θα αντικατασταθούν από χρήστη και τομέα από τη διεύθυνση email."
 "</i>"
@@ -5589,7 +5513,7 @@ msgid "Display"
 msgstr "Εμφάνιση"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Διαθεσιμότητα"
@@ -5951,30 +5875,30 @@ msgstr "_Μετακίνηση"
 msgid "Cancel _Drag"
 msgstr "Ακύρωση _Drag"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, 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:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Απόκρυψη _μπάρας συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Εμφάνιση _μπάρας συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5983,84 +5907,83 @@ msgstr "Εμφάνιση _μπάρας συνημμένων"
 msgid "_Remove"
 msgstr "_Απομάκρυνση"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Ιδιότητες"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Προσθήκη συνημμένου..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Εμφάνιση συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
-msgstr ""
-"Πατήστε το πλήκτρο space για να εναλλάσσεται η προβολή της γραμμής συνημμένων"
+msgstr "Πατήστε το πλήκτρο space για να εναλλάσσεται η προβολή της γραμμής συνημμένων"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Συνάντηση  -  %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Ανατιθέ_μενη εργασία  -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση   -   %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "συνημμένο"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
 "καταφθάσει μια ενημέρωση"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Δεν ήταν δυνατή η εκτέλεση της τρέχουσας έκδοση!"
 
@@ -6102,8 +6025,7 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
-"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6148,106 +6070,106 @@ msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Αυτό το γεγονός έχει ειδοποιήσεις"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Ημερο_λόγιο:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "_Διοργανωτής:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "Ε_κπρόσωποι"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Παρευρι_σκόμενοι"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Γεγονός χωρίς ημερομηνία έναρξης"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Γεγονός χωρίς ημερομηνία λήξης"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Το επιλεγμένο organizer δεν έχει πια ένα λογαριασμό."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Προσθήκη"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Αδυναμία ανοίγματος του ημερολογίου '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ημέρα πριν από ραντεβού"
 msgstr[1] "%d ημέρες πριν από ραντεβού"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, 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:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Προσαρμογή"
 
@@ -6256,7 +6178,7 @@ msgstr "Προσαρμογή"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6385,14 +6307,14 @@ msgstr "Μέλος"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6429,7 +6351,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα του memo '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ομάδα:"
@@ -6476,8 +6398,7 @@ msgstr "Όνομα Λίστας Εργασιών"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε;"
+msgstr "Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
@@ -6485,14 +6406,11 @@ msgstr "Αναθέτετε ένα επαναλαμβανόμενο γεγονό�
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε;"
+msgstr "Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε;"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε;"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6534,6 +6452,15 @@ msgstr "στο"
 msgid "first"
 msgstr "πρώτη"
 
+#. 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:998
+msgid "second"
+msgstr "δευτερόλεπτο"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6678,7 +6605,7 @@ msgstr "<span weight=\"bold\">Κατάσταση</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
@@ -6754,11 +6681,11 @@ msgstr "_Εργασία"
 msgid "Task Details"
 msgstr "Λεπτομέρειες εργασίας"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα των εργασιών στο '%s'."
@@ -6842,30 +6769,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d εβδομάδα"
 msgstr[1] "%d εβδομάδες"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, 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/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d λεπτό"
-msgstr[1] "%d λεπτά"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d δευτερόλεπτο"
-msgstr[1] "%d δευτερόλεπτα"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Άγνωστης ενέργεια για εκτέλεση"
@@ -6927,7 +6830,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:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Κλικ για άνοιγμα %s"
@@ -7026,27 +6929,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ναι"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../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-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7063,35 +6966,35 @@ msgstr "Επανάληψη"
 msgid "Assigned"
 msgstr "Ανάθεση"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Επιλογή φακέλου για αποθήκευση των επιλεγμένων συνημμένων..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ανώνυμη_εικόνα.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Αποθήκευση _Ως..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../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:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "Απο_θήκευση επιλεγμένων"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
@@ -7323,25 +7226,25 @@ msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Διοργανωτής: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Διοργανωτής: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Τοποθεσία: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "'Ωρα: %s %s"
@@ -7505,7 +7408,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7518,7 +7421,7 @@ msgstr "Δοκιμαστική Αποδοχή"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7531,8 +7434,7 @@ msgid ""
 msgstr "Η συνάντηση ακυρώθηκε αλλά μπορεί να βρεθεί στα ημερολόγια σας"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr "Η εργασία ακυρώθηκε αλλά μπορεί να βρεθεί στη λίστα εργασιών σας"
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7714,8 +7616,7 @@ msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει �
 
 #: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
-msgstr ""
-"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δε μπορούν να προβληθούν"
+msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δε μπορούν να προβληθούν"
 
 #: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
@@ -7727,8 +7628,7 @@ msgstr "Το αντικείμενο δεν είναι έγκυρο και δε �
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί;"
+msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί;"
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -7850,81 +7750,81 @@ msgid "Resources"
 msgstr "Πόροι"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Άτομο"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Πόρος"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Αίθουσα"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Προεδρείο"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Απαραίτητος Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Προαιρετικός Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Μη-Συμμετέχων"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Απαιτεί Ενέργεια"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Εξουσιοδοτήθηκε"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Παρευρισκόμενος"
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7933,7 +7833,7 @@ msgstr "%A, %d %B, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -8019,7 +7919,7 @@ msgstr "Κλικ εδώ για προσθήκη memo"
 msgid "Memo sort"
 msgstr "Ταξινόμηση memo"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -8038,7 +7938,7 @@ msgstr "Φόρτωση memo"
 msgid "Opening memos at %s"
 msgstr "Άνοιγμα memos στο %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
@@ -8047,20 +7947,20 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 msgid "Enter the password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
@@ -8340,12 +8240,6 @@ msgstr "Αδυναμία εισαγωγής ημερολογίου '%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Αδυναμία εισαγωγής των εργασιών '%s'"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d δευτερόλεπτα)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1η"
@@ -10257,7 +10151,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Μπάρα Συνημμένων"
 
@@ -10352,8 +10246,7 @@ msgstr "Απο_στολή Σε:"
 
 #: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
-msgstr ""
-"Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
+msgstr "Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
 
 #: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
@@ -10368,8 +10261,7 @@ msgid "Insert Attachment"
 msgstr "Εισαγωγή συνημμένου"
 
 #: ../composer/e-msg-composer.c:828
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
 "υπογραφής από το λογαριασμό"
@@ -10451,8 +10343,7 @@ msgstr "Όλοι οι λογαριασμοί απομακρύνθηκαν."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
-"Είστε βέβαιοι για τη διαγραφή του μηνύματος με όνομα '{0}', που γράφετε;"
+msgstr "Είστε βέβαιοι για τη διαγραφή του μηνύματος με όνομα '{0}', που γράφετε;"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -10461,7 +10352,7 @@ msgstr ""
 "αλληλογραφίας."
 
 #: ../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 "Λόγω του &quot;{1}&quot;."
 
@@ -10579,11 +10470,11 @@ msgstr "_Αποθήκευση Μηνύματος"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Groupware Suite"
 
@@ -10754,7 +10645,7 @@ msgstr "Θέλετε να αντικατασταθεί;"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Το αρχείο υπάρχει &quot;{0}&quot; "
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "Αντι_κατάσταση"
 
@@ -10922,7 +10813,7 @@ msgstr "Λείπει η ημερομηνία."
 msgid "Missing file name."
 msgstr "Λείπει το όνομα αρχείου."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Λείπει το όνομα."
 
@@ -10994,6 +10885,10 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "δευτερόλεπτα"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "η τρέχουσα ώρα"
@@ -11023,16 +10918,14 @@ msgid "Composer Preferences"
 msgstr "Προτιμήσεις Επεξεργαστή"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Ρυθμίστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
 "ασφάλειας και της προβολής μηνυμάτων"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Ρυθμίστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
+msgstr "Ρυθμίστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11173,7 +11066,7 @@ msgstr "[Προεπιλογή]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
@@ -11202,7 +11095,7 @@ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 msgid "Signature(s)"
 msgstr "Υπογραφή(ές)"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "--------Προωθημένο Μήνυμα --------"
 
@@ -11537,7 +11430,7 @@ msgstr "Πρόχειρα"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
@@ -11623,7 +11516,7 @@ msgstr "_Νέος Φάκελος..."
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Ά_δειασμα Απορριμμάτων"
 
@@ -11766,37 +11659,37 @@ msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../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:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Αδύνατη η ανάκτηση του μηνύματος"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "Αντι_γραφή τοποθεσίας δεσμού"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Δημιουργία φακέλου α_ναζήτησης"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Από αυτή τη διεύ_θυνση"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Σε αυτή τη διεύθυνση"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %s"
@@ -11915,64 +11808,64 @@ msgstr "Προ_βολή Πιστοποιητικού"
 msgid "This certificate is not viewable"
 msgstr "Το πιστοποιητικό δεν είναι αναγνώσιμο"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ολοκληρώθηκε σε %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Έχουν λήξει:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "από %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "Προβολή μέ_σα στο μήνυμα"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "Απόκρυ_ψη"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Προσαρμογή στο πλάτος"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Εμφάνιση _αρχικού μεγέθους"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συνημμένο"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Επιλογή φακέλου για την αποθήκευση όλων των συνημμένων..."
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "Απο_θήκευση επιλεγμένων..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d συνημ_μένο"
 msgstr[1] "%d συνημ_μένα"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Αποθήκευ_ση"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Αποθήκευση ό_λων"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Χωρίς συνημμένο"
 
@@ -12083,7 +11976,7 @@ msgstr "Ομάδες συζήτησης"
 msgid "%s attachment"
 msgstr " %s επισύναψη"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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: Άγνωστο σφάλμα"
 
@@ -12099,11 +11992,11 @@ msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησ�
 msgid "Unsupported signature format"
 msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Σφάλμα επιβεβαίωσης υπογραφής"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
 
@@ -12168,14 +12061,12 @@ msgstr "Αδυναμία αντιγραφής POP3 keep-on-server data `%s': %s"
 #: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr ""
-"Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
+msgstr "Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
 
 #: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
-"Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
+msgstr "Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
 
 #: ../mail/em-migrate.c:2731
 msgid ""
@@ -12237,20 +12128,20 @@ msgstr "Να μην εμφανιστεί ξανά αυτό το μήνυμα."
 msgid "Message Filters"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "μήνυμα"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Αποθήκευση μηνύματος..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Μήνυμα από %s "
@@ -12349,8 +12240,7 @@ msgstr "Άδειασμα Φακέλων Απορριμμάτων στην έξο
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr ""
-"Άδειασμα όλων των φακέλων Απορριμμάτων κατά την έξοδο από το Evolution."
+msgstr "Άδειασμα όλων των φακέλων Απορριμμάτων κατά την έξοδο από το Evolution."
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -12519,8 +12409,7 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12565,8 +12454,7 @@ msgstr "Αναγνώριση smileys στο κείμενο και αντικατ
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr ""
-"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
+msgstr "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
@@ -12586,8 +12474,7 @@ msgstr "Εμφάνιση κινούμενων εικόνων ως κινούμε
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr ""
-"Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στη λίστα μηνυμάτων."
+msgstr "Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στη λίστα μηνυμάτων."
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
@@ -12599,8 +12486,7 @@ msgstr "Αρχείο για αναπαραγωγή ήχου κατά την άφ
 
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
+msgstr "Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
 
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
@@ -12620,8 +12506,7 @@ msgstr "Γραμματοσειρά τερματικού"
 
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Η τελευταία φορά που έγινε άδειασμα απορριμμάτων, σε ημέρες από την εποχή."
+msgstr "Η τελευταία φορά που έγινε άδειασμα απορριμμάτων, σε ημέρες από την εποχή."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
@@ -13369,8 +13254,7 @@ msgstr "Επεξεργαστής Μηνύματος"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
-"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
 #: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
@@ -13579,8 +13463,7 @@ msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr ""
-"Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
+msgstr "Να μην υπογράφονται αιτήσεις _συναντήσεων (για συμβατότητα με το Outlook)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
@@ -13955,7 +13838,7 @@ msgid "Checking for new mail"
 msgstr "Γίνεται έλεγχος για νέα μηνύματα"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:681
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισαγωγή Κωδικού Πρόσβασης για %s"
@@ -14029,8 +13912,7 @@ msgid "New Search Folder"
 msgstr "Νέος φάκελος αναζήτησης"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr ""
 "Ένας φάκελος που ονομάζεται &quot;{1}&quot; υπάρχει ήδη. Παρακαλώ "
 "χρησιμοποιείστε ένα διαφορετικό όνομα."
@@ -14040,14 +13922,14 @@ 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 ""
-"Ένας φάκελος που δεν είναι άδειος στο&quot;{1}&quot; υπάρχει ήδη.\n"
+"Ένας φάκελος που δεν είναι άδειος στο &quot;{1}&quot; υπάρχει ήδη.\n"
 "\n"
 "Μπορείτε να αγνοήσετε αυτό το φάκελο, να αντικαταστήσετε ή προσθέσετε στα "
-"περιεχόμενα του ή να εγκαταλείψετε.\n"
+"περιεχόμενα του ή να εγκαταλείψετε."
 
-#: ../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}?"
@@ -14055,7 +13937,7 @@ msgstr ""
 "Ζητήθηκε μια βεβαίωση ανάγνωσης για &quot;{1}&quot;.  Να σταλεί η ειδοποίηση "
 "βεβαίωσης σε {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."
@@ -14063,7 +13945,7 @@ msgstr ""
 "Μια υπογραφή που ονομάζεται &quot;{1}&quot; υπάρχει ήδη. Παρακαλώ "
 "χρησιμοποιείστε ένα διαφορετικό όνομα."
 
-#: ../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."
@@ -14071,28 +13953,27 @@ 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
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+#: ../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?"
@@ -14100,7 +13981,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;?"
@@ -14108,85 +13989,85 @@ msgstr ""
 "Είστε σίγουροι ότι θέλετε να διαγράψετε οριστικά όλα τα μηνύματα που έχουν "
 "διαγραφεί στο φάκελο &quot;{0}&quot;;"
 
-#: ../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 "Λόγω του &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Λόγω του &quot;{2}&quot;."
 
-#: ../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 "Αδυναμία προσθήκης φακέλου αναζήτησης &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 "Αδυναμία αντιγραφής φακέλου &quot;{0}&quot; σε &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου &quot;{0}&quot;."
 
-#: ../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 ""
 "Δεν ήταν δυνατή η δημιουργία του καταλόγου αποθήκευσης. λόγω του &quot;{1}"
 "&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου &quot;{0}&quot;.."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου συστήματος &quot;{0}&quot;."
 
-#: ../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 ""
 "Δεν είναι δυνατή η επεξεργασία του φακέλου αναζήτησης &quot;{0}&quot; επειδή "
 "δεν υπάρχει."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Αδυναμία μετακίνησης φακέλου &quot;{0}&quot; σε &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Δεν ήταν δυνατό το άνοιγμα στόχου &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 "
@@ -14196,33 +14077,33 @@ msgstr ""
 "προβλήματος εγκατάστασης.  Δεν θα μπορείτε να χρησιμοποιείτε αυτόν τον "
 "πάροχο μέχρι να αποδεχθείτε την άδεια χρήσης του."
 
-#: ../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; σε &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 ""
 "Δεν ήταν δυνατή η μετονομασία ή η μετακίνηση του φακέλου συστήματος &quot;{0}"
 "&quot;."
 
-#: ../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 "Δεν ήταν δυνατή η αποθήκευση στον κατάλογο &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Αδυναμία αποθήκευσης σε αρχείο &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Αδυναμία ορισμού δέσμης ενεργειών υπογραφής  &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."
@@ -14230,71 +14111,71 @@ 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 "Διαγραφή &quot;{0}&quot;;"
 
-#: ../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."
@@ -14302,12 +14183,11 @@ 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 ""
-"Αν προχωρήσετε, όλοι οι λογαριασμοί διαμεσολαβητή θα διαγραφούν οριστικά."
+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."
@@ -14315,11 +14195,11 @@ 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."
@@ -14327,19 +14207,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 "
@@ -14351,37 +14231,37 @@ 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 as read in the selected folder"
 msgstr "Σήμανση όλων των μηνυμάτων στον επιλεγμένο φάκελο ως αναγνωσμένα"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Λείπει ο φάκελος."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Δεν έχουν επιλεγεί πηγές."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Το άνοιγμα πολλών μυνημάτων μαζί μπορεί να διαρκέσει αρκετά."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Ελέγξτε τις ρυθμίσεις του λογαριασμού σας και προσπαθείστε ξανά."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr ""
 "Παρακαλώ ενεργοποιήστε το λογαριασμό ή στείλτε το με τη χρήση άλλου "
 "λογαριασμού."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14390,7 +14270,7 @@ msgstr ""
 "ψάξετε για διευθύνσεις email κάνοντας κλικ στο κουμπί Προς δίπλα από το "
 "κουτί καταχώρησης."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14402,50 +14282,49 @@ msgstr ""
 "{0}\n"
 "Να αποσταλεί οπωσδήποτε;"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Εισάγετε ένα μοναδικό όνομα για αυτήν την υπογραφή."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Παρακαλώ περιμένετε."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Πρόβλημα εισαγωγής παλιού φακέλου αλληλογραφίας  &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Επικοινωνία με διακομιστή"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
-"Ερώτημα στο διακομιστή για λίστα υποστηριζόμενων μηχανισμών πιστοποίησης."
+msgstr "Ερώτημα στο διακομιστή για λίστα υποστηριζόμενων μηχανισμών πιστοποίησης."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Απαιτείται βεβαίωση ανάγνωσης."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Να γίνει πραγματικά διαγραφή του φακέλου &quot;{0}&quot; και όλων των "
 "υποφακέλων του;"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Οι φάκελοι αναζήτησης ενημερώθηκαν αυτόματα."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Αποστολή βεβαίωσης"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Η υπογραφή υπάρχει ήδη"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14453,7 +14332,7 @@ msgstr ""
 "Οι φάκελοι συστήματος απαιτούνται από το Ximian Evolution για να "
 "λειτουργήσει σωστά και δε μπορεί να μετονομαστούν, μετακινηθούν ή διαγραφούν."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14470,7 +14349,7 @@ msgstr ""
 "όλους τους παραλήπτες στο μήνυμα σας. Για να αποφύγετε αυτό προσθέστε "
 "τουλάχιστον ένα παραλήπτη στο πεδία Προς ή Κοιν."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14484,7 +14363,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Και τώρα έγινε η ενημέρωση."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14498,23 +14377,11 @@ msgstr ""
 "&quot;{1}&quot;\n"
 "Και τώρα έγινε η ενημέρωση."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Αυτό το μήνυμα στάλθηκε μέσω της εξωτερικής εφαρμογής &quot;sendmail&quot;. "
-"Το Sendmail αναφέρει το ακόλουθο σφάλμα: status 67: μήνυμα δε στάλθηκε.\n"
-"Το μήνυμα αποθηκεύτηκε στο φάκελο των εξερχομένων. Ελέγξτε το μήνυμα για "
-"σφάλματα και ξαναστείλτε το."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Το αρχείο δέσμης ενεργειών πρέπει να υπάρχει και να είναι εκτελέσιμη."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14523,7 +14390,7 @@ msgstr ""
 " αν απαιτείται πηγαίνετε στο επεξεργαστή εικονικού φακέλου και προσθέστε το "
 "κατηγορηματικά."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14531,14 +14398,13 @@ msgstr ""
 "Δεν είναι δυνατή η αποστολή αυτού του μηνύματος επειδή δεν έχει "
 "ενεργοποιηθεί ο λογαριασμός με τον οποίο επιλέξατε να το στείλετε."
 
-#: ../mail/mail.error.xml.h:110
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:107
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Δεν είναι δυνατή η αποστολή αυτού του μηνύματος επειδή δεν έχετε καθορίσει "
 "κανένα Παραλήπτη."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14546,11 +14412,11 @@ msgstr ""
 "Ο διακομιστής δεν υποστηρίζει τον τύπο πιστοποίησης και μπορεί να μην "
 "υποστηρίζει καθόλου πιστοποίηση."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Η υπογραφή έχει αλλάξει αλλά δεν έχει αποθηκευτεί."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14558,11 +14424,11 @@ msgstr ""
 "Αυτό θα κάνει σήμανση όλων των μηνυμάτων ως αναγνωσμένα στον επιλεγμένο "
 "φάκελο και τους υποφακέλους."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Αδυναμία σύνδεσης στο GroupWise server."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14570,41 +14436,41 @@ msgstr ""
 "Δεν είναι δυνατό το άνοιγμα του φακέλου προχείρων για αυτόν το λογαριασμό. "
 "Θέλετε να κάνετε χρήση του προεπιλεγμένου φακέλου;"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Δεν είναι δυνατή η ανάγνωση αρχείου άδειας χρήσης."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Χρήση προεπιλο_γών"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Χρήση ως τον προεπιλεγμένο φάκελο προχείρων;"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμενες πληροφορίες."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Υπάρχουν μη απεσταλμένα μηνύματα, θέλετε να τερματίσετε την εφαρμογή "
 "οπωσδήποτε;"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Δεν επιτρέπεται να δημιουργήσετε δύο λογαριασμούς με το ίδιο όνομα."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Πρέπει να δώσετε όνομα στον φάκελο αναζήτησης."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14615,28 +14481,23 @@ msgstr ""
 "επιλέξετε όλους τους τοπικούς φακέλους, όλους τους απομακρυσμένους φακέλους "
 "ή και τα δύο."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Η είσοδος σας στο διακομιστή  &quot;{0}&quot; ως &quot;{0}&quot; απέτυχε."
-
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Το μήνυμα σας με θέμα &quot;{0}&quot; δεν παραδόθηκε."
+msgstr "Η είσοδος σας στο διακομιστή  &quot;{0}&quot; ως &quot;{0}&quot; απέτυχε."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "Προ_σθήκη"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "Ε_ξάλειψη"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Άνοιγμα Μηνυμάτων"
 
@@ -14707,7 +14568,7 @@ msgstr "%d %b %Y"
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -14882,8 +14743,7 @@ msgstr "Αυτόματες Επαφές"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Α_υτόματη δημιουργία εγγραφών στο βιβλίο διευθύνσεων όταν απαντάτε σε "
 "μηνύματα"
@@ -14894,10 +14754,8 @@ msgstr "Επαφές Instant Messaging"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
-"Περιοδικός συγχρονισμός πληροφοριών επαφών και εικόνων από το gaim buddy list"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "Περιοδικός συγχρονισμός πληροφοριών επαφών και εικόνων από το gaim buddy list"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -15020,8 +14878,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Έλεγχος αν το Evolution είναι η προεπιλεγμένη εφαρμογή αλληλογραφίας"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Κάθε φορά που ξεκινά το Evolution να ελέγχει αν είναι η προεπιλεγμένη "
 "εφαρμογή αλληλογραφίας"
@@ -15038,8 +14895,7 @@ msgstr "Προεπιλεγμένη εφαρμογή αλληλογραφίας"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
-"Θέλετε να κάνετε το Evolution την προεπιλεγμένη εφαρμογή αλληλογραφίας σας;"
+msgstr "Θέλετε να κάνετε το Evolution την προεπιλεγμένη εφαρμογή αλληλογραφίας σας;"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -15160,24 +15016,24 @@ msgstr "Μέγεθος φακέλων"
 msgid "Exchange Settings"
 msgstr "Ρυθμίσεις Exchange "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "Πι_στοποίηση"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Τύπος Πιστοποίησης"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "_Έλεγχος για υποστηριζόμενους τύπους "
 
-#: ../plugins/exchange-operations/exchange-calendar.c:194
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15217,7 +15073,7 @@ msgstr "Νέος κωδικός:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Ο κωδικός σας έχει λήξει. Παρακαλώ αλλάξτε τον κωδικό σας τώρα."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Ο κωδικός σας θα λήξει στις επόμενες %d ημέρες"
@@ -15359,14 +15215,14 @@ msgstr "Δέντρο φακέλου Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Αποχώρηση από το φάκελο..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Αποχώρηση από το φάκελο \"%s\";"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Αποχώρηση από το \"%s\""
@@ -15475,8 +15331,7 @@ msgstr "Σ_υνδρομή στο ημερολόγιο άλλου χρήστη"
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr ""
-"Μια πρόσθετη λειτουργία που χειρίζεται λειτουργίες λογαριασμών Exchange."
+msgstr "Μια πρόσθετη λειτουργία που χειρίζεται λειτουργίες λογαριασμών Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15810,7 +15665,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Αποχώρηση από τους φακέλους"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -15867,8 +15722,7 @@ msgstr "Επιλογές αποστολής"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
-"Μια πρόσθετη λειτουργία για τις λειτουργίες στους λογαριασμούς Groupwise."
+msgstr "Μια πρόσθετη λειτουργία για τις λειτουργίες στους λογαριασμούς Groupwise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
@@ -16117,8 +15971,7 @@ msgstr "Αποτυχία φόρτωσης του ημερολογίου '%s'."
 #: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
-"Ένα ραντεβού στο ημερολόγιο '%s' έρχεται σε σύγκρουση με αυτή τη συνάντηση"
+msgstr "Ένα ραντεβού στο ημερολόγιο '%s' έρχεται σε σύγκρουση με αυτή τη συνάντηση"
 
 #: ../plugins/itip-formatter/itip-formatter.c:433
 #, c-format
@@ -16139,8 +15992,7 @@ msgstr "Αδύνατη η εύρεση αυτής της εργασίας σε �
 
 #: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
-msgstr ""
-"Αδυναμία εύρεσης αυτής της καταχώρισης ημερολογίου σε κάποιο ημερολόγιο"
+msgstr "Αδυναμία εύρεσης αυτής της καταχώρισης ημερολογίου σε κάποιο ημερολόγιο"
 
 #: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
@@ -16432,8 +16284,7 @@ msgstr "ο/η <b>%s</b> παρακαλεί την παρουσία σας στη
 #: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
-"ο/η <b>%s</b> μέσω %s θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
+msgstr "ο/η <b>%s</b> μέσω %s θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
@@ -16442,8 +16293,7 @@ msgstr "ο/η <b>%s</b> θα ήθελε να προσθέσει σε μια υπ
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "ο/η <b>%s</b> θα ήθελε να λάβει τις τελευταίες πληροφορίες για την ακόλουθη "
 "συνάντηση:"
@@ -16471,8 +16321,7 @@ msgstr "ο/η <b>%s</b> έχει προτείνει τις ακόλουθες α
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
-"ο/η <b>%s</b> μέσω του %s έχει αρνηθεί τις ακόλουθες αλλαγές συνάντησης:"
+msgstr "ο/η <b>%s</b> μέσω του %s έχει αρνηθεί τις ακόλουθες αλλαγές συνάντησης:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
@@ -16507,8 +16356,7 @@ msgstr "ο/η <b>%s</b> έχει αναθέσει σε εσάς μια εργα�
 #: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
-"ο/η <b>%s</b> μέσω του %s θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία:"
+msgstr "ο/η <b>%s</b> μέσω του %s θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία:"
 
 #: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
@@ -16653,8 +16501,7 @@ msgid "This meeting has been delegated"
 msgstr "Η συνάντηση έχει ανατεθεί."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί ο "
 "αποστολέας ως παρευρισκόμενος;"
@@ -16690,8 +16537,7 @@ msgid "No store available"
 msgstr "Δεν υπάρχει διαθέσιμος αποθηκευτικός χώρος"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Μια πρόσθετη λειτουργία που εφαρμόζει ένα περιβάλλον χρήσης CORBA για την "
 "απομακρυσμένη πρόσβαση δεδομένων αλληλογραφίας."
@@ -16868,8 +16714,7 @@ msgstr "_Αποστολή μηνύματος"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Επικοινωνία με τον ιδιοκτήτη της λίστας ταχυδρομείου από αυτό το μήνυμα"
+msgstr "Επικοινωνία με τον ιδιοκτήτη της λίστας ταχυδρομείου από αυτό το μήνυμα"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
@@ -16901,8 +16746,7 @@ 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 ""
-"Χρησιμοποιείται για να σημειώσει ως αναγνωσμένα όλα τα μηνύματα σε ένα φάκελο"
+msgstr "Χρησιμοποιείται για να σημειώσει ως αναγνωσμένα όλα τα μηνύματα σε ένα φάκελο"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16972,8 +16816,7 @@ msgstr "Περιγραφή"
 
 #: ../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:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
@@ -17057,7 +16900,7 @@ msgstr "Τοποθεσίες"
 msgid "_Publish Calendar Information"
 msgstr "Δημοσίευση πληροφοριών ημερολογίου"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Είστε βέβαιοι ότι θέλετε να διαγραφεί αυτό το URL;"
 
@@ -17350,8 +17193,7 @@ msgstr "Γίνεται εισαγωγή δεδομένων."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"Επισημαίνει αν η αλληλουχία των μηνυμάτων πρέπει να γυρίσει πίσω στο θέμα."
+msgstr "Επισημαίνει αν η αλληλουχία των μηνυμάτων πρέπει να γυρίσει πίσω στο θέμα."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -17399,42 +17241,44 @@ msgid "Default window height"
 msgstr "Προκαθορισμένο ύψος παραθύρου"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+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 ""
-"ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
+msgstr "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Τελευταία ενημερωμένη έκδοση ρυθμίσεων"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+#: ../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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 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:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Παράκαμψη του διάλογος προειδοποίησης ανάπτυξης"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17442,19 +17286,19 @@ msgstr ""
 "Η έκδοση του Evolution, με μέγιστο/ελάχιστο επίπεδο ρυθμίσεων (για "
 "παράδειγμα \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Το προεπιλεγμένο ύψος του κυρίως παραθύρου, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Το προκαθορισμένο πλάτος του κυρίως παραθύρου, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Το προκαθορισμένο πλάτος της πλευρικής στήλης, σε εικονοστοιχεία."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17462,7 +17306,7 @@ msgstr ""
 "Η τελευταία αναβαθμισμένη έκδοση του Evolution, με μέγιστο/ελάχιστο επίπεδο "
 "ρυθμίσεων (για παράδειγμα \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17472,40 +17316,43 @@ msgstr ""
 "\"και τα δύο\", \"εργαλειοθήκη\". Αν ορισθεί \"εργαλειοθήκη\". το στυλ των "
 "κουμπιών καθορίζεται από τη ρύθμιση της εργαλειοθήκης του GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Ορατή Εργαλειοθήκη"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Αν το Evolution θα ξεκινάει σε κατάσταση εργασίας χωρίς σύνδεση αντί να "
 "είναι με σύνδεση."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Αν θα είναι το παράθύρο μεγιστοποιημένο ή όχι."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Αν θα είναι ορατή η πλευρική στήλη."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Αν θα είναι ορατή η εργαλειοθήκη."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Αν θα παρακάπτεται ο διάλογος προειδοποίησης στις υπό ανάπτυξη εκδόσεις του "
 "Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Αν θα είναι ορατά τα κουμπιά παραθύρου."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Στυλ κουμπιών παραθύρου"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Τα κουμπιά παραθύρου είναι ορατά"
 
@@ -17519,8 +17366,7 @@ msgstr "Ενεργές Συνδέσεις"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr ""
-"Πατήστε ΟΚ για να κλείσετε τις συνδέσεις και να εργαστείτε χωρίς σύνδεση"
+msgstr "Πατήστε ΟΚ για να κλείσετε τις συνδέσεις και να εργαστείτε χωρίς σύνδεση"
 
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
@@ -17627,40 +17473,39 @@ msgstr "Δεν ήταν δυνατή η εκτέλεση του Bug buddy."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Κώστας Παπαδήμας <pkst@gnome.org>\n"
 "Νίκος Χαρωνιτάκης <charosn@her.forthnet.gr>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "Εργασία Ε_ντός Δικτύου"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Εργασία χωρίς σύνδεση"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Εργασία χωρίς σύνδεση"
 
-#: ../shell/e-shell-window.c:368
+#: ../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:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Το Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
-"Το Evolution είναι εκτός δικτύου.  Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
+msgstr "Το Evolution είναι εκτός δικτύου.  Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Αλλαγή σε %s"
@@ -17747,7 +17592,7 @@ msgstr ""
 "στο Evolution από εξωτερικά αρχεία."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17782,7 +17627,7 @@ msgstr ""
 "Ελπίζουμε τα απολαύσετε τα αποτελέσματα της σκληρής μας δουλειάς\n"
 "και περιμένουμε με ανυπομονησία τη συμβολή σας!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17790,36 +17635,35 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Evolution\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Εκκίνηση του Evolution με ενεργοποίηση του καθορισμένου συστατικού"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Βίαιο κλείσιμο όλων των συστατικών του evolution"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Βίαια επαναεισαγωγή από το Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
-msgstr ""
-"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Απενεργοποίηση φόρτωσης πρόσθετων λειτουργιών."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18101,8 +17945,7 @@ msgstr "<b>Εκδόθηκε Σε</b>"
 
 #: ../smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr ""
-"<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί για τις ακόλουθες χρήσεις</b>"
+msgstr "<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί για τις ακόλουθες χρήσεις</b>"
 
 #: ../smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -18237,16 +18080,14 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Έχετε πιστοποιητικά από οργανισμούς που πιστοποιούν εσάς:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τις παρακάτω αρχές "
 "πιστοποίησης:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
+msgstr "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -18909,8 +18750,7 @@ msgstr "Διαβάθμιση ως δημόσιο"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr ""
-"Κάντε κλικ εδώ για να ρυθμίσετε τις σχετικές ειδοποιήσεις με το γεγονός"
+msgstr "Κάντε κλικ εδώ για να ρυθμίσετε τις σχετικές ειδοποιήσεις με το γεγονός"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
@@ -19053,8 +18893,7 @@ msgstr "Μετακίνηση του επιλεγμένου φακέλου σε �
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
-"Οριστική απομάκρυνση όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr "Οριστική απομάκρυνση όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -19066,8 +18905,7 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
-"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "_Copy Folder To..."
@@ -19142,8 +18980,7 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
 "γραμμή στη μέση"
@@ -19290,13 +19127,11 @@ msgstr "Δημιουργία κανόνα για το φιλτράρισμα μ�
 
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
-"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
@@ -19722,8 +19557,7 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr ""
-"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
@@ -19945,8 +19779,7 @@ msgstr "Αντιστρο_φή Επιλογής"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr ""
-"Κάντε κλικ στο αλλαγή / προβολή των λεπτομερειών κατάστασης της εργασίας"
+msgstr "Κάντε κλικ στο αλλαγή / προβολή των λεπτομερειών κατάστασης της εργασίας"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
@@ -20317,7 +20150,7 @@ msgid "_Edit..."
 msgstr "_Επεξεργασία..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20442,17 +20275,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../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:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Ελάχιστο πλάτος"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../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:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Ελάχιστο Πλάτος"
 
@@ -20712,15 +20545,15 @@ msgstr "Συγχρονισμός Ιδιωτικών Αρχείων:"
 msgid "Sync Categories:"
 msgstr "Κατηγορίες Συγχρονισμού:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Κενό μήνυμα"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "Μοντέλο Reflow"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Πλάτος στήλης"
 
@@ -20764,12 +20597,12 @@ msgstr "Κείμενο"
 msgid "Find _Now"
 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 "Στήλη Δρομέα"
@@ -20962,23 +20795,23 @@ msgstr "Εστιασμένη Στήλη"
 msgid "Unselected Column"
 msgstr "Μη Επιλεγμένη Στήλη"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Επισημασμένη στήλη"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Υπογράμμιση στήλης"
 
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Έντονη Στήλη"
 
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Χρώμα Στήλης"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Χρώμα BG Στήλης"
 
@@ -21101,14 +20934,14 @@ msgstr "Εμ_φάνιση αυτών των πεδίων με σειρά:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Κώδικας DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Πλήρης Κεφαλίδα"
 
@@ -21152,7 +20985,7 @@ msgstr "%s (%d αντικείμενα)"
 #: ../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:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Εναλλαγές γραμμές χρωμάτων"
 
@@ -21160,7 +20993,7 @@ msgstr "Εναλλαγές γραμμές χρωμάτων"
 #: ../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:2979 ../widgets/table/e-table-item.c:2980
+#: ../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 "Οριζόντια σχεδίαση πλέγματος"
@@ -21169,7 +21002,7 @@ msgstr "Οριζόντια σχεδίαση πλέγματος"
 #: ../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:2986 ../widgets/table/e-table-item.c:2987
+#: ../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 "Κάθετη σχεδίαση πλέγματος"
@@ -21178,7 +21011,7 @@ msgstr "Κάθετη σχεδίαση πλέγματος"
 #: ../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:2993 ../widgets/table/e-table-item.c:2994
+#: ../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 "Εστίαση σχεδίασης"
@@ -21187,7 +21020,7 @@ msgstr "Εστίαση σχεδίασης"
 #: ../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:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Λειτουργία δρομέα"
 
@@ -21195,7 +21028,7 @@ msgstr "Λειτουργία δρομέα"
 #: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Μοντέλο επιλογής"
 
@@ -21203,7 +21036,7 @@ msgstr "Μοντέλο επιλογής"
 #: ../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:3007 ../widgets/table/e-table-item.c:3008
+#: ../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"
@@ -21213,7 +21046,7 @@ msgstr "Διάρκεια αφετηρίας"
 #: ../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:3041 ../widgets/table/e-table-item.c:3042
+#: ../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"
@@ -21274,31 +21107,31 @@ msgstr "Μορφοποίηση Στηλών..."
 msgid "Customize Current View..."
 msgstr "Προσαρμογή Τρέχουσας Προβολής..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Γραμματοσειρές"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Πληροφορίες ταξινόμησης"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Δέντρο"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Κεφαλίδα πίνακα"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Μοντέλο πίνακα"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Γραμμή δρομέα"
 
@@ -21462,3 +21295,4 @@ msgstr "Περιεχόμενο IM"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Χειρισμός αναδυόμενου"
+
diff --git a/po/es.po b/po/es.po
index bad7615767..4dbac98568 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,4 @@
-# translation of es.po to Spanish
 # translation of Evolution to Spanish
-# Copyright © 2000-2002, 2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the evolution package.
 # Carlos Perelló Marín <carlos@gnome-db.org>, 2000-2001.
 # Héctor García Álvarez <hector@scouts-es.org>, 2000-2002.
 # Ismael Olea <ismael@olea.org>, 2001, (revisiones) 2003.
@@ -9,23 +6,25 @@
 # Héctor García Álvarez <hector@scouts-es.org>, 2002.
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2003 (revisión).
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003, 2004, 2005, 2006.
+# Copyright © 2000-2002, 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution package.
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-29 16:25+0200\n"
-"PO-Revision-Date: 2006-05-29 16:32+0200\n"
+"POT-Creation-Date: 2006-05-26 21:37+0200\n"
+"PO-Revision-Date: 2006-05-26 21:38+0200\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "libreta de direcciones de Evolution"
 
@@ -39,12 +38,12 @@ msgstr "Contacto nuevo"
 msgid "New Contact List"
 msgstr "Lista de contactos nueva"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "la carpeta de libretas de direcciones actual %s tiene %d tarjeta"
-msgstr[1] "la carpeta de libretas de direcciones actual %s tiene %d tarjetas"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "la carpeta de libretas de direcciones actual tiene %d tarjeta"
+msgstr[1] "la carpeta de libretas de direcciones actual tiene %d tarjetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -63,32 +62,32 @@ msgstr "Contacto: "
 msgid "evolution minicard"
 msgstr "minitarjeta de Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Tiene alarmas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Tiene repeticiones."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Es una reunión."
 
-#: ../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 "Acontecimiento de calendario: El resumen es %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 "Acontecimiento de calendario: Sin resumen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vista de acontecimientos del calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Obtener el foco"
 
@@ -159,10 +158,8 @@ msgstr "%A, %e de %b de %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
@@ -193,10 +190,8 @@ msgstr "%e de %B de %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%e de %b"
 
@@ -415,7 +410,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "La libreta de direcciones de Evolution ha terminado inesperadamente."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "La imagen que ha seleccionado es grande. ¿quiere redimensionarla y "
 "almacenarla?"
@@ -459,15 +455,15 @@ msgstr "Este servidor no soporta el esquema de información LDAPv3."
 
 #: ../addressbook/addressbook.error.xml.h:25
 msgid "Unable to open addressbook"
-msgstr "Es imposible abrir la libreta de direcciones"
+msgstr "No se pudo abrir la libreta de direcciones"
 
 #: ../addressbook/addressbook.error.xml.h:26
 msgid "Unable to perform search."
-msgstr "Es imposible efectuar la búsqueda."
+msgstr "No se pudo efectuar la búsqueda."
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to save {0}."
-msgstr "Es imposible guardar {0}."
+msgstr "No se pudo guardar {0}."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Would you like to save your changes?"
@@ -478,8 +474,8 @@ 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 ""
-"Está moviendo un contacto desde una libreta a otra, pero no puede ser "
-"eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
+"Está moviendo un contacto desde una libreta a otra, pero éste no se puede "
+"eliminar de la de origen. ¿Quiere guardar una copia en su lugar?"
 
 #: ../addressbook/addressbook.error.xml.h:30
 msgid ""
@@ -498,7 +494,8 @@ msgid ""
 msgstr "Ha hecho modificaciones a este contacto. ¿Desea guardar estos cambios?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Sus contactos para {0} no estarán disponibles hasta que Evolution sea "
 "reiniciado."
@@ -555,7 +552,7 @@ msgstr "Configure el autocompletado aquí"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -618,7 +615,7 @@ msgstr "En este equipo"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Privado"
 
@@ -651,7 +648,7 @@ msgstr "Libreta de direcciones nueva"
 
 #: ../addressbook/gui/component/addressbook-component.c:243
 msgid "Address _Book"
-msgstr "Libreta de _direcciones"
+msgstr "Libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
@@ -678,9 +675,9 @@ msgstr "Copiar el contenido del libro localmente para operación desconectada"
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
@@ -721,12 +718,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrando…"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
@@ -802,35 +799,35 @@ msgstr "Los nombres de carpetas no pueden contener el carácter «/»"
 msgid "A Folder with this name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Libreta de direcciones _nueva"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1096
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../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 "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Guardar como VCard…"
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propiedades…"
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Selector de origen de contactos"
 
@@ -839,7 +836,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticar.\n"
 
@@ -894,7 +891,7 @@ msgstr ""
 "nombres."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posición vertical del panel"
 
@@ -973,8 +970,10 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1111,7 +1110,7 @@ msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
-"Este es el máximo número de entradas para descargar.  Si pone este número "
+"Este es el máximo número de entradas para descargar. Si pone este número "
 "demasiado alto ralentizará su libreta de direcciones."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
@@ -1120,7 +1119,7 @@ msgid ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
-"Este es el método que usará Evolution para autenticarle a usted.  Note que "
+"Este es el método que usará Evolution para autenticarle a usted. Note que "
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
@@ -1225,6 +1224,7 @@ msgstr "minutos"
 #: ../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
@@ -1274,13 +1274,13 @@ msgstr "<b>Trabajo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1331,7 +1331,7 @@ msgstr "Teléfono"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Trabajo"
@@ -1359,8 +1359,10 @@ msgid "_Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "Ca_tegorías…"
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorías"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1447,8 +1449,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Código postal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Dirección"
 
@@ -1456,7 +1458,7 @@ msgstr "Dirección"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../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
@@ -2442,7 +2444,7 @@ msgstr "Zimbabwe"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nombre"
@@ -2453,7 +2455,7 @@ msgstr "Mensajería AOL"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2463,7 +2465,7 @@ msgstr "Mensajería Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2493,17 +2495,17 @@ msgid "Other"
 msgstr "Otro"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2537,15 +2539,15 @@ msgstr "Modificados"
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2553,23 +2555,23 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, 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:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
-msgstr "%s«%s» está vacío"
+msgstr "%s'%s' está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2581,15 +2583,15 @@ msgstr "Añadir contacto rápido"
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "Nombre _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
 msgstr "_Correo-e"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Seleccione la libreta de direcciones"
 
@@ -2597,7 +2599,7 @@ msgstr "_Seleccione la libreta de direcciones"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "¿Seguro que quiere\n"
 "borrar la lista de contactos (%s)?"
@@ -2614,7 +2616,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "¿Seguro que quiere\n"
 "borrar el contacto (%s)?"
@@ -2725,7 +2727,6 @@ msgid "_IM Service:"
 msgstr "Servicio de _MI:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2741,7 +2742,7 @@ msgid "Add an email to the List"
 msgstr "Añadir un correo-e a la lista"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:874
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -2771,9 +2772,10 @@ msgstr "_Seleccionar"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../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
@@ -2782,15 +2784,15 @@ msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista infer
 msgid "Book"
 msgstr "Libro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:747
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
@@ -2813,7 +2815,7 @@ msgid ""
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
 "La dirección o el nombre modificados de este contacto\n"
-"ya existen en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"ya existen en esta carpeta. ¿Quiere añadirlo de todos modos?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2829,7 +2831,7 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "El nombre o la dirección de correo-e de este contacto ya existe\n"
-"en esta carpeta.  ¿Quiere añadirlo de todos modos?"
+"en esta carpeta. ¿Quiere añadirlo de todos modos?"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
@@ -2911,9 +2913,9 @@ msgid "Save as VCard..."
 msgstr "Guardar como VCard…"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1241
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -2970,13 +2972,13 @@ msgstr "Cor_tar"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1249
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1082 ../mail/message-list.c:1742
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../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-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3038,7 +3040,7 @@ msgid "Company Phone"
 msgstr "Teléfono de empresa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo-e"
@@ -3088,7 +3090,7 @@ msgid "Manager"
 msgstr "Jefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
@@ -3097,7 +3099,7 @@ msgid "Nickname"
 msgstr "Apodo"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Nota"
 
@@ -3106,7 +3108,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organización"
 
@@ -3284,89 +3286,68 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Tiene el cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en el navegador"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2467
-msgid "_Copy Link Location"
-msgstr "_Copiar dirección del enlace"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Enviar un mensaje nuevo a…"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copiar dirección de _correo-e"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Correo-e"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Posición"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Charla por vídeo"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "trabajo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Página personal"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Puesto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Página personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Diario web"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3493,7 +3474,7 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
-"No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
+"No se pudo abrir esta libreta de direcciones. Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
@@ -3542,11 +3523,13 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:159
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El backend de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El backend para esta libreta de direcciones rehusó a efectuar esta consulta."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:165
 msgid "This query did not complete successfully."
@@ -3557,7 +3540,7 @@ msgid "Error adding list"
 msgstr "Error al añadir la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Error al añadir el contacto"
 
@@ -3574,7 +3557,7 @@ msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
@@ -3609,57 +3592,57 @@ msgstr "Sobreescribir"
 #. 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:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contacto"
 msgstr[1] "contactos"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Información de contacto"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Información de contacto de %s"
@@ -3754,12 +3737,12 @@ msgstr "Importador de VCard de Evolution"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3912,7 +3895,7 @@ msgstr "Escala de grises"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4003,7 +3986,8 @@ msgid "Export in asynchronous mode"
 msgstr "Exportar en modo asíncrono"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -4013,7 +3997,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -4067,25 +4052,29 @@ msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
-"Toda la información en  estas entradas del diario se borrarán y no se podrán "
+"Toda la información en estas entradas del diario se borrarán y no se podrán "
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr "Toda la información en este diario se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:5
 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 puede 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."
-msgstr "Toda la información de de estas tareas se borrará y no se podrá recuperar."
+msgstr ""
+"Toda la información de de estas tareas se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "Toda la información de esta cita se borrará y no se podrá recuperar."
 
 #: ../calendar/calendar.error.xml.h:8
@@ -4097,7 +4086,8 @@ msgstr ""
 "recuperar."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Toda la información acerca de esta reunión se borrará y no se podrá "
 "recuperar."
@@ -4137,17 +4127,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere borrar esta cita?"
 
 #: ../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 "¿Seguro que quiere borrar esta entrada del diario?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere borrar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere borrar esta tarea?"
 
@@ -4200,7 +4187,8 @@ msgstr ""
 "permitirá aceptar esta tarea."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+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 les "
 "permitirá confirmarlas."
@@ -4335,7 +4323,8 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "¿Quiere enviar a todos los participantes una notificación de cancelación?"
+msgstr ""
+"¿Quiere enviar a todos los participantes una notificación de cancelación?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4347,7 +4336,8 @@ msgstr "¿Quiere enviar esta tarea a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "¿Quiere enviar información de la reunión actualizada a los participantes?"
+msgstr ""
+"¿Quiere enviar información de la reunión actualizada a los participantes?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
@@ -4424,8 +4414,8 @@ msgstr "Dividir acontecimientos de días múltiples:"
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
@@ -4464,7 +4454,7 @@ msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4514,7 +4504,7 @@ msgstr "Notas"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4537,13 +4527,13 @@ msgstr "_Tareas"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servicio de notificación por alarma del Calendario de Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4555,7 +4545,7 @@ msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Hora de inicio"
 
@@ -4566,8 +4556,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1618
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4583,7 +4573,7 @@ msgstr "_Posponer durante:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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:13
@@ -4600,31 +4590,32 @@ msgstr "_Posponer"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alarmas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4636,7 +4627,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4653,7 +4644,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -4712,14 +4703,16 @@ msgstr "Color de fondo para las tareas que vencen hoy, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
+msgstr ""
+"Color de fondo para las tareas que están retrasadas, en formato «#rrggbb»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "Los calendarios ejecutarán alarmas durante"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "Color para dibujar la línea de Marcus Bains en la barra de Tiempo (vacía por "
 "omisión)."
@@ -4738,7 +4731,8 @@ msgstr "Confirmar compactación"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
+msgstr ""
+"Días en los cuales debe indicarse el inicio y fin de las horas de trabajo."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
@@ -4753,108 +4747,96 @@ msgid "Default reminder value"
 msgstr "Valor predeterminado del recordatorio"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Degradado de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparencia de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URLs del servidor de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL de la plantilla de disponibilidad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Degradado de los eventos en las vistas de calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Ocultar tareas terminadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ocultar Lista de tareas nueva"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ocultar el valor de la tarea"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Posición horizontal del panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora en la que acaba la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora a la que empieza la jornada laboral, en formato de veinticuatro horas, "
 "de 0 a 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr ""
 "Los intervalos de tiempo mostrados en las vistas diarias y semanales, en "
 "minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Hora de la última alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs del servidor para publicación de disponibilidad."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Línea de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Color de la línea de Marcus Bains - Vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Color de la línea de Marcus Bains - Barra de tiempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto en el que acaba la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto en el que empieza la jornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Posición del panel horizontal de la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Posición del panel vertical en la vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cuándo ocultar tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Color para las tareas fuera de plazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4862,7 +4844,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y la fecha del navegador del "
 "calendario y lista de tareas cuando no está en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4870,7 +4852,7 @@ msgstr ""
 "Posición del panel horizontal, entre la vista y el navegador de fechas del "
 "calendario y la lista de tareas en la vista de mes, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4878,7 +4860,7 @@ msgstr ""
 "Posición del la hoja vertical, entre la lista de tareas y el la hoja de "
 "vista previa de tareas, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4886,7 +4868,7 @@ msgstr ""
 "Posición de la hoja vertical, entre la vista y el navegador del calendario y "
 "la lista de tareas en la vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4895,69 +4877,74 @@ msgstr ""
 "calendario y la lista de tareas cuando no está en la vista mensual, en "
 "píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sean ejecutados por las alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Confirmar» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
-msgstr "Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo «Rol» en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr ""
 "Mostrar las horas de finalización de las citas en las vistas semanales y "
 "mensuales"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr ""
 "Mostrar el campo de categorías en el editor de acontecimientos/reuniones/"
 "tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Mostrar el visor de la alarma en una bandeja de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
-msgstr "Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de estado en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Mostrar el panel de vista previa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
-msgstr "Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
+msgstr ""
+"Mostrar el campo de zona horaria en el editor de acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
-msgstr "Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
+msgstr ""
+"Mostrar el campo de tipo en el editor de acontecimientos/tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Mostrar los números de las semanas en el navegador de fechas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Color para las tareas que vencen hoy"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posición del panel vertical de tareas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4967,7 +4954,7 @@ msgstr ""
 "reemplaza por la parte del usuario de la dirección de correo y %d se "
 "reemplaza por el dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4976,63 +4963,58 @@ msgstr ""
 "calendario, como una localización sin correspondencia en una base de datos "
 "de franjas horarias Olsen, como en \"América/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisiones de hora"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "La hora en que la última alarma sonó, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Zona horaria "
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Transparencia de los eventos en las vistas de calendario (Un valor entre 0 y "
-"10, opaco por omisión)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de veinticuatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para el recordatorio predeterminado, \"minutes\", \"hours\" o \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cuándo ocultar tareas, \"minutes\", \"hours\" o "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Comienzo de la semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
+msgstr ""
+"El día en que empieza la semana, desde el domingo (0) hasta el sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas."
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica si debe pedir confirmación al borrar una cita o tarea."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica si debe pedir confirmación al compactar citas y tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5040,89 +5022,93 @@ msgstr ""
 "Indica si se deben comprimir los fines de semana, lo cual pone al sábado y "
 "al domingo en el mismo espacio que un día laborable."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica si debe mostrar la hora de finalización de los acontecimientos en las "
 "vistas semanales y mensuales."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica si debe dibujar la línea Marcus Bains (línea a la hora actual) en el "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica si debe ocultar las tareas terminadas en la vista de tareas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
-msgstr "Indica si debe establecer un recordatorio predeterminado para las citas."
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para las citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Confirmar» en el editor de acontecimiento/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Categorías» en el editor de acontecimientos/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Rol» en el editor de acontecimientos/tareas/"
 "reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Estado» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica si debe mostrar las horas en formato de veinticuatro horas en vez de "
 "usar am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Zona horaria» en el editor de "
 "acontecimientos/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
 "Indica si debe mostrar el campo «Tipo» en el editor de acontecimientos/"
 "tareas/reuniones"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas."
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Hora de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minuto de finalización de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Hora de comienzo de la jornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minuto de comienzo de la jornada laboral"
 
@@ -5155,7 +5141,7 @@ msgstr "Imprimir"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5222,61 +5208,62 @@ msgstr "Falló al actualizar calendarios."
 #: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "No se pudo abrir el calendario «%s» para crear acontecimientos y reuniones"
+msgstr ""
+"No se pudo abrir el calendario «%s» para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay un calendario disponible para crear acontecimientos y reuniones"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Selector de origen del calendario"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Crea una solicitud de reunión nueva"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Cita para todo el _día"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Crea una cita nueva para todo el día"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
@@ -5434,21 +5421,22 @@ msgstr "Aña_dir"
 msgid "Alarms"
 msgstr "Alarmas"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../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:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
-msgid "_Suggest automatic display of attachment"
-msgstr "_Sugerir mostrar automáticamente el adjunto"
+#: ../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"
+msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propiedades de adjuntos"
@@ -5457,19 +5445,19 @@ msgstr "Propiedades de adjuntos"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descripción:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nombre del archivo:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Tipo MIME:"
@@ -5494,7 +5482,8 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u y %d se reemplazarán por el usuario y el dominio de la dirección de "
 "correo-e.</i>"
@@ -5535,7 +5524,7 @@ msgid "Display"
 msgstr "Mostrar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:587
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Disponibilidad"
@@ -5633,7 +5622,7 @@ msgid "Thursday"
 msgstr "Jueves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "_Zona horaria:"
 
@@ -5704,7 +5693,8 @@ msgstr "_Sáb"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
-msgstr "_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
+msgstr ""
+"_Mostrar la hora del final de las citas en las vistas semanales y mensuales"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
@@ -5723,47 +5713,47 @@ msgid "before every appointment"
 msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "_Copiar el contenido del calendario localmente para operación desconectada"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Co_piar el contenido del la lista de tareas localmente para operación "
-"desconectada"
+"Copiar el contenido del calendario localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Copia_r el contenido de la lista de notas localmente para operación "
+"Copiar el contenido del la lista de tareas localmente para operación "
 "desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copiar el contenido de la nota localmente para operación desconectada"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_olor:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propiedades del calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Calendario nuevo"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tareas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
@@ -5821,7 +5811,7 @@ msgstr "%s  Ha hecho cambios. ¿Olvido los cambios y cierro el editor?"
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
+msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
@@ -5838,12 +5828,14 @@ msgstr "Esta entrada del diario ha cambiado."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
+msgstr ""
+"%s  Ha realizado cambios. ¿Quiere olvidar estos cambios y actualizar el "
+"editor?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
+msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
@@ -5870,29 +5862,29 @@ msgstr " (Vence "
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensaje adjunto - %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:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensaje adjunto"
 msgstr[1] "%d mensajes adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
@@ -5900,7 +5892,7 @@ msgstr "Cancelar _arrastre"
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5912,101 +5904,101 @@ msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "_Quitar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Añadir adjunto…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Mostrar adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Pulse la barra espaciadora para cambiar la barra de adjuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunión - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarea asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:363
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "adjunto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2764
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Los cambios efectuados a este elemento pueden descartarse si llega una "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
-msgstr "Imposible usar la versión actual."
+msgstr "No se pudo usar la versión actual."
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
@@ -6020,10 +6012,6 @@ msgstr "No se pudo abrir el destino"
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "¿_Borrar este elemento de todos los otros buzones del destinatario?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "El acontecimiento no se pudo borrar debido a un error de CORBA"
@@ -6042,7 +6030,8 @@ msgstr "El elemento no se pudo borrar debido a un error de CORBA"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
-msgstr "El acontecimiento no se pudo borrar porque el se ha denegado el permiso"
+msgstr ""
+"El acontecimiento no se pudo borrar porque el se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
@@ -6050,7 +6039,8 @@ msgstr "La tarea no se pudo borrar porque se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no se pudo borrar porque se ha denegado el permiso"
+msgstr ""
+"La entrada del diario no se pudo borrar porque se ha denegado el permiso"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6085,11 +6075,11 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:560
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:564
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Repetición"
@@ -6105,7 +6095,7 @@ msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6134,7 +6124,7 @@ msgstr "La fecha de inicio está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
-msgstr "La fecha de finalización  está equivocada"
+msgstr "La fecha de finalización está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
@@ -6142,7 +6132,7 @@ msgstr "La hora de inicio está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
-msgstr "La  hora de finalización  está equivocada"
+msgstr "La hora de finalización está equivocada"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
@@ -6207,7 +6197,7 @@ msgstr "Personalizar"
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
@@ -6256,12 +6246,16 @@ msgstr "_Descripción:"
 msgid "Event Description"
 msgstr "Descripción del acontecimiento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Lugar:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarma"
 
@@ -6337,7 +6331,7 @@ msgstr "Confirmar"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -6369,7 +6363,7 @@ msgstr "Nota"
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
-msgstr "No es posible abrir las notas en «%s»."
+msgstr "No se pudieron abrir las notas en «%s»."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:434
@@ -6419,7 +6413,8 @@ msgstr "Nombre de la lista de tareas"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 msgid "You are delegating a recurring event. What would you like to delegate?"
@@ -6430,8 +6425,10 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Está modificando una tarea que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite. ¿Qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite. ¿Qué quiere modificar?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6451,7 +6448,7 @@ msgstr "Todas las instancias"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
+msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6624,14 +6621,14 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Terminado"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
@@ -6646,14 +6643,14 @@ msgstr "En proceso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baja"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6707,7 +6704,7 @@ msgstr "La fecha de vencimiento es errónea"
 #: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
-msgstr "No es posible abrir las tareas en «%s»."
+msgstr "No se pudieron abrir las tareas en «%s»."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 msgid "Categor_ies..."
@@ -6739,7 +6736,7 @@ msgstr "<b>Frecuencia de publicación</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "<b>Publishing _Location</b>"
-msgstr "<b>_Lugar de publicación</b>"
+msgstr "<b>_Dirección de publicación</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Publishing Settings"
@@ -6849,7 +6846,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:2832
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -6932,7 +6929,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupada"
 
@@ -6946,17 +6943,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sí"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "No"
@@ -6967,21 +6964,21 @@ msgstr "No"
 #: ../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:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:718
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Repetición"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Asignado"
 
@@ -6989,7 +6986,7 @@ msgstr "Asignado"
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1939
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 
@@ -6998,9 +6995,9 @@ msgstr "Seleccione la carpeta donde guardar los adjuntos seleccionados…"
 msgid "untitled_image.%s"
 msgstr "imagen-_sin-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1243
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Guardar _como…"
 
@@ -7067,25 +7064,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1105
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../calendar/gui/e-calendar-table.c:1242 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: ../calendar/gui/e-calendar-table.c:1244
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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:123 ../ui/evolution-memos.xml.h:20
@@ -7093,44 +7090,44 @@ msgstr "Abrir página _web"
 msgid "_Print..."
 msgstr "Im_primir…"
 
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1254 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../calendar/gui/e-calendar-table.c:1255 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1256
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../calendar/gui/e-calendar-table.c:1257
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
-#: ../calendar/gui/e-calendar-table.c:1262
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1495
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse para añadir una tarea"
@@ -7165,105 +7162,105 @@ msgstr "Fecha de inicio"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Moviendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "_Cita nueva…"
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "_Reunión nueva"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "Vista _actual"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Seleccionar _hoy"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha…"
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario…"
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reunión…"
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar…"
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repetición _movible"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s (%s)"
@@ -7293,7 +7290,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divisiones de %02i minutos"
@@ -7304,21 +7301,19 @@ msgstr "divisiones de %02i minutos"
 #. 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7429,7 +7424,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7442,7 +7437,7 @@ msgstr "Aceptado provisionalmente"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7457,7 +7452,8 @@ msgstr ""
 "calendarios"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
@@ -7653,7 +7649,8 @@ msgstr "El objeto es inválido y no puede ser actualizado\n"
 
 #: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
+msgstr ""
+"Esta respuesta no es de un participante. ¿Desea añadirlo como participante?"
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
@@ -7775,63 +7772,63 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "No participan"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Necesita acción"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7842,14 +7839,14 @@ msgstr "Delegado"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En proceso"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7857,86 +7854,86 @@ msgstr "%A, %d de %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%e/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sin información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Participantes…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pciones"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Auto-seleccionar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr "_>>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Borrar las notas seleccionadas"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Pulse para añadir una nota"
 
@@ -7996,8 +7993,7 @@ msgstr "Seleccione la zona horaria"
 #. 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -8146,10 +8142,6 @@ msgstr "Información de iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "Lista de notas _nueva"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -8173,7 +8165,7 @@ msgstr "Fallo al actualizar las notas."
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr ""
-"No es posible abrir la lista de notas «%s» para crear acontecimientos y "
+"No se pudo abrir la lista de notas «%s» para crear acontecimientos y "
 "reuniones"
 
 #: ../calendar/gui/memos-component.c:884
@@ -8239,7 +8231,8 @@ msgstr ""
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No se pudo migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
@@ -8251,7 +8244,7 @@ msgstr "No se pudo migrar el calendario «%s»"
 #: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
-msgstr "No es posible migrar las tareas en «%s»"
+msgstr "No se pudieron migrar las tareas en «%s»"
 
 #: ../calendar/gui/print.c:493
 msgid "1st"
@@ -8509,7 +8502,7 @@ msgstr "Fallo al actualizar las tareas."
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
-"No es posible abrir la lista de tareas «%s» para crear acontecimientos y "
+"No se pudo abrir la lista de tareas «%s» para crear acontecimientos y "
 "reuniones"
 
 #: ../calendar/gui/tasks-component.c:890
@@ -8552,7 +8545,7 @@ msgstr "_Lista de tareas"
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8564,11 +8557,11 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
@@ -10163,7 +10156,7 @@ msgid "%.0fG"
 msgstr "%.0fGib"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1022
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra de adjuntos"
 
@@ -10171,28 +10164,28 @@ msgstr "Barra de adjuntos"
 #: ../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
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "No se pudo adjuntar el archivo %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
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "No se pudo adjuntar el archivo %s: no es un archivo normal"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destino donde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Pulse aquí para acceder a la libreta de direcciones"
 
@@ -10203,45 +10196,45 @@ msgstr "Pulse aquí para acceder a la libreta de direcciones"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Cco:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10252,15 +10245,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar en:"
 
@@ -10268,12 +10261,13 @@ msgstr "Publicar en:"
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Inserta un adjunto"
 
 #: ../composer/e-msg-composer.c:828
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No se puede firmar el mensaje saliente: No hay establecido un certificado de "
 "firma para esta cuenta"
@@ -10286,12 +10280,12 @@ msgstr ""
 "No se puede encriptar el mensaje saliente: no hay establecido un certificado "
 "de encriptado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
 
@@ -10317,25 +10311,26 @@ msgstr "Mensaje sin título"
 msgid "Open File"
 msgstr "Abrir archivo"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
@@ -10353,11 +10348,13 @@ msgstr "Todas las cuentas han sido eliminadas."
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+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:18
@@ -10420,7 +10417,8 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr ""
+"El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
@@ -10475,7 +10473,7 @@ msgstr "_Guardar mensaje"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10600,7 +10598,7 @@ msgstr ""
 "Cuando reciba un correo con una solicitud de notificación de lectura, ¿qué "
 "debería hacer Evolution?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10608,7 +10606,7 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
@@ -10725,23 +10723,23 @@ msgstr "%e-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Más tarde"
@@ -10791,11 +10789,11 @@ msgid "Include threads"
 msgstr "Incluir conversaciones"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -10891,7 +10889,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "segundos"
 
@@ -10924,7 +10922,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -10961,7 +10960,7 @@ msgstr "Control de configuración del redactor de correo de Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11085,7 +11084,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -11264,7 +11263,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Detección de spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11340,7 +11339,7 @@ msgstr "Ejecutar programa"
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Remitente"
 
@@ -11372,9 +11371,9 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar de procesar"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11458,48 +11457,48 @@ msgstr "Correo enviado"
 msgid "Loading..."
 msgstr "Cargando…"
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en «%s»"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11507,28 +11506,28 @@ msgstr "Analizando carpetas en «%s»"
 msgid "_View"
 msgstr "_Ver"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copiar…"
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Mover…"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -11537,13 +11536,13 @@ msgstr "_Vaciar papelera"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando «%s» a «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../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:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11565,158 +11564,158 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:126
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta…"
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ninguno"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Carpeta de búsqueda según el a_sunto"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Carpeta de búsqueda según el re_mitente"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Carpeta de búsqueda según los des_tinatarios"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Carpeta de búsqueda según la _lista de correo"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../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:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copiar dirección del enlace"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/em-folder-view.c:2471
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_A esta dirección"
 
-#: ../mail/em-folder-view.c:2825
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: ../mail/em-folder-view.c:2830
-msgid "Click to hide/unhide addresses"
-msgstr "Pulse para ocultar/mostrar las direcciones"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:781 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11724,11 +11723,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:782 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11736,11 +11735,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:783 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11748,11 +11747,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11760,11 +11759,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:790 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Desencriptado"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11772,11 +11771,11 @@ msgstr ""
 "Este mensaje no está encriptado. Su contenido puede verse en tránsito a "
 "través de Internet."
 
-#: ../mail/em-format-html-display.c:791 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Encriptado, débil"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11786,11 +11785,11 @@ msgstr ""
 "Debería ser difícil, pero no imposible para un espía ver el contenido de "
 "este mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:792 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11798,11 +11797,11 @@ msgstr ""
 "Este mensaje está encriptado. Sería difícil para un espía ver el contenido "
 "de este mensaje."
 
-#: ../mail/em-format-html-display.c:793 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11812,72 +11811,72 @@ msgstr ""
 "muy difícil que un espía vea el contenido de este mensaje en empleando un "
 "tiempo razonable."
 
-#: ../mail/em-format-html-display.c:894 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %e de %B de %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Ajustar al ancho"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostrar tamaño _original"
 
-#: ../mail/em-format-html-display.c:1693 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione la carpeta donde guardar todos los adjuntos…"
 
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Guardar seleccionados…"
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ad_junto"
 msgstr[1] "%d ad_juntos"
 
-#: ../mail/em-format-html-display.c:2021 ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Guardar"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Guardar _todo"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sin adjunto"
 
@@ -11891,94 +11890,94 @@ msgstr "Página %d de %d"
 msgid "Retrieving `%s'"
 msgstr "Obteniendo «%s»"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Firma válida, pero no se puede verificar el remitente"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en «%s»"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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 "De"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Cco"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 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:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../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 "Fecha"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
@@ -12028,7 +12027,7 @@ msgstr "Una vez por semana"
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12040,47 +12039,47 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas…"
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "No se pudo crear la carpeta nueva: «%s»: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No se pudo copiar el la carpeta «%s» a «%s»: %s"
+msgstr "No se pudo copiar la carpeta «%s» a «%s»: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "No se pudo buscar buzones existentes en «%s»: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "No se pudo abrir los datos antiguos POP keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Fallo al crear directorio de datos POP3 keep-on-server  «%s»: %s"
+msgstr "No se pudo crear el directorio de datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "No se pudo copiar los datos POP3 keep-on-server «%s»: %s"
+msgstr "No se pudieron copiar los datos POP3 keep-on-server «%s»: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Fallo al crear almacén de correo local  «%s»: %s"
+msgstr "Falló al crear el almacén de correo local «%s»: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "No se pudo crear las carpetas de correo local en: «%s»: %s"
+msgstr "No se pudieron crear las carpetas de correo local en: «%s»: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12097,6 +12096,10 @@ msgstr "_Responder al remitente"
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Abrir enlace en el navegador"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Enviar un mensaje nuevo a…"
@@ -12126,28 +12129,28 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mensaje"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Guardar mensaje…"
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -12189,110 +12192,84 @@ msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Comprimir la visualización de direcciones en A/CC/CCO"
-
-#: ../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 "Comprime la visualización de direcciones en A/CC/CCO al número especificado en address_count."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Altura predeterminada de la ventana del redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Altura predeterminada de la ventana del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 "Dibujar indicadores de errores tipográficos en las palabras mientras se "
 "escribe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que pueda ver un cursor cuando lee correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Activa o desactiva la característica de búsqueda al teclear"
-
-#: ../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 ""
-"Activa la característica de búsqueda en la barra para que puede iniciar una "
-"búsqueda interactiva tecleando el texto. El uso es para que pueda encontrar "
-"fácilmente una carpeta en esa barra lateral tan sólo tecleando el nombre de "
-"la carpeta y la selección salta automáticamente a esa carpeta."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
-msgstr "Activar/desactivar modo cursor"
+msgstr "Habilitar/deshabilitar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12300,7 +12277,7 @@ msgstr ""
 "Si el usuario intenta abrir diez o más mensajes al mismo tiempo, preguntar "
 "al usuario si quiere realmente hacerlo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12311,23 +12288,23 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de Gnome puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12336,11 +12313,11 @@ msgstr ""
 "lista contiene cadenas nombrando subdirectorios relativos a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceras personalizadas y si están activadas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12349,19 +12326,19 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imágenes para mensajes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12371,185 +12348,183 @@ msgstr ""
 "Nunca cargar imágenes desde la red 1 - Cargar imágenes si el remitente está "
 "en la libreta de direcciones 2 - Siempre cargar imágenes desde la red"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Registrar acciones de filtrado en el archivo de registro especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Altura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Anchura predeterminada de la ventana de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización del mensaje (\"normal\", \"full headers\" (cabeceras "
 "completas), \"source\" (fuente))"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Archivo de sonido para notificar correo nuevo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Tipo de notificación de correo nuevo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Número de direcciones a mostrar en PARA/CC/CCO"
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente compactar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un mensaje sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cuando el usuario intente abrir diez o más mensajes a la vez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar al enviar mensajes en HTML a contactos quizá no los quieran."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cuando el usuario intente enviar un mensaje sin destinatarios Para "
 "o Cc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Ejecutar la prueba de spam en el correo entrante"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Envía el correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Muestra las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Muestra los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Muestra los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproduce un archivo de sonido cuando llegue correo nuevo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diálogo de suscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La última vez que se vació la papelera, en días desde la época."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "La tipografía de terminal para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "La letra de anchura variable para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12561,105 +12536,99 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt; - poner a activado si la cabecera "
 "se debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Esto establece el número de direcciones a mostrar en la vista de lista de mensajes predeterminada, más allá de los cuales se muestra un «...»."
-
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:85
 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:92
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Agrupar la lista de mensajes por conversaciones"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Usar el demonio y cliente de Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Usar el demonio y cliente de Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar tipografía personalizada para mostrar el correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Usar sólo los tests de spam locales."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa sólo los tests de spam locales (sin DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "El elemento del menú «Ver/Cco» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "El elemento del menú «Ver/Cco» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "El elemento del menú «Ver/Cc» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "El elemento del menú «Ver/Cc» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "El elemento del menú «Ver/Desde» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "El elemento del menú «Ver/Desde» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "El elemento del menú «Ver/Publicar en» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "El elemento del menú «Ver/Publicar en» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "El elemento del menú «Ver/Responder a» está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "El elemento del menú «Ver/Responder a» está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12698,7 +12667,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de carpetas en formato buzón de Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
@@ -12706,7 +12675,7 @@ msgstr "Importando «%s»"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Por favor espere"
 
@@ -12964,7 +12933,8 @@ msgstr "<b>_Idiomas</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+msgstr ""
+"<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -13496,7 +13466,8 @@ msgstr "_No notificarme cuando llegue correo nuevo"
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
@@ -13544,27 +13515,19 @@ msgid "_Show image animations"
 msgstr "_Mostrar animaciones"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "_Reducir las cabeceras Para / Cc / Cco a "
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "_Usar conexión segura:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "direcciones"
-
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr " "
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descripción"
 
@@ -13675,21 +13638,21 @@ msgstr "con todas las carpetas locales"
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Filtrando carpeta"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falló al aplicar los filtros al correo saliente: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13698,114 +13661,123 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "Anexando a la carpeta local «Correo enviado» en su lugar."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falló al anexar a la carpeta local «Correo enviado»: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falló al enviar %d de %d mensajes"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Completado."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Guardando mensaje en la carpeta"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moviendo mensajes a %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensajes a %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Abriendo almacén %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando carpeta %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Actualizando carpeta"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Compactando carpeta"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Obteniendo mensaje %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13814,11 +13786,11 @@ msgstr ""
 "Error guardando mensajes en: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13827,22 +13799,22 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
@@ -13870,26 +13842,17 @@ msgstr "Esperando…"
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduzca la contraseña para %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Introduzca la contraseña"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
@@ -13954,8 +13917,10 @@ msgid "New Search Folder"
 msgstr "Carpeta de búsqueda nueva"
 
 #: ../mail/mail.error.xml.h:1
-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."
+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:2
 msgid ""
@@ -13981,7 +13946,8 @@ msgstr ""
 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."
+msgstr ""
+"Ya existe una firma con el nombre «{0}». Por favor, use un nombre diferente."
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -14000,8 +13966,10 @@ msgid "Are you sure you want to delete this account?"
 msgstr "¿Seguro que quiere borrar esta cuenta?"
 
 #: ../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?"
+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:11
 msgid "Are you sure you want to open {0} messages at once?"
@@ -14423,8 +14391,10 @@ msgstr ""
 "está activada"
 
 #: ../mail/mail.error.xml.h:107
-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"
+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:108
 msgid ""
@@ -14448,7 +14418,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
-msgstr "No es posible conectarse con el servidor GroupWise."
+msgstr "No se pudo conectar con el servidor GroupWise."
 
 #: ../mail/mail.error.xml.h:112
 msgid ""
@@ -14520,74 +14490,74 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "La más baja"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Más baja"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Más alta"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "La más alta"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %e %l:%M %p"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%e %b %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Mensajes"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -14615,7 +14585,7 @@ msgstr "Ubicación original"
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaño"
@@ -14642,7 +14612,7 @@ msgstr "Reenviar"
 
 #: ../mail/message-tag-followup.c:80
 msgid "No Response Necessary"
-msgstr "No es necesaria una respuesta"
+msgstr "Respuesta innecesaria"
 
 #: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply"
@@ -14682,7 +14652,7 @@ msgstr "El asunto o el remitente contiene"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
-msgstr "Libretas local de direcciones"
+msgstr "Libretas locales de direcciones"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Provides core functionality for local address books."
@@ -14693,8 +14663,8 @@ msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
 msgstr ""
-"Un complemento de formato que muestra los adjuntos de sonido en línea y "
-"permite reproducirlos directamente desde evolution."
+"Un complemento formateador que muestra los adjuntos de sonido en línea y "
+"permite reproducirlos directamente desde Evolution."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -14761,7 +14731,8 @@ msgstr "Contactos automáticos"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid "_Automatically create entries in the addressbook when responding to mail"
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Crear entradas _automáticamente en la libreta de direcciones cuando se "
 "responda al correo"
@@ -14772,7 +14743,8 @@ msgstr "Contactos de mensajería instantánea"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Sincronizar periódicamente la información de contacto y las imágenes desde "
 "la lista de amigos de Gaim"
@@ -14788,7 +14760,7 @@ msgid ""
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"Rellena automáticamente su libreta de contactos con los nombres y "
+"Rellena automáticamente su libreta de direcciones con los nombres y "
 "direcciones de correo-e cuando contesta a los correos. También rellena la "
 "información de contacto de MI de su lista de amigos."
 
@@ -14885,6 +14857,10 @@ msgstr ""
 "Un complemento de prueba que demuestra un menú emergente que le permite "
 "copiar cosas al portapapeles."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copiar dirección de _correo-e"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Herramienta de copia"
@@ -14894,14 +14870,16 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Comprobar si Evolution es la aplicación de correo predeterminada"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Cada vez que Evolution se inicie, comprobar si es o no el cliente de correo "
 "predeterminado."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
+msgstr ""
+"Comprueba si Evolution es el cliente de correo predeterminado al iniciar."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
@@ -14967,7 +14945,7 @@ msgid ""
 "This option will connect to the Exchange server using standard plaintext "
 "password authentication."
 msgstr ""
-"Esta opción conectará con el servidor Exchange usando autenticación con  "
+"Esta opción conectará con el servidor Exchange usando autenticación con "
 "contraseña estándar de texto simple."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
@@ -15000,7 +14978,7 @@ 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:2
 msgid "Change Password"
-msgstr "Cambia la contraseña"
+msgstr "Cambiar contraseña"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:335
@@ -15364,11 +15342,11 @@ msgstr "No se pueden mostrar carpetas."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Los cambios a las opciones de la cuenta Exchange «{0}» sólo tendrán lugar "
-"después de reiniciar Evolution."
+"Los cambios a la configuración de la cuenta Exchange tendrán lugar después "
+"de salir y reiniciar Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15508,7 +15486,8 @@ msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr "Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
+msgstr ""
+"Asegúrese de que el usuario y contraseña son correctos e intente de nuevo."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
@@ -15527,8 +15506,8 @@ msgid "Password successfully changed."
 msgstr "Contraseña cambiada con éxito."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Por favor, reinicie Evolution para que los cambios tengan efecto"
+msgid "Please restart Evolution"
+msgstr "Por favor, reinicie Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15578,11 +15557,11 @@ msgstr "Inténtelo con una contraseña diferente."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
 msgid "Unable to add user to access control list:"
-msgstr "No  puede añadirse el usuario a la lista de control de acceso:"
+msgstr "No se pudo añadir el usuario a la lista de control de acceso:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
 msgid "Unable to edit delegates."
-msgstr "Imposible editar delegados."
+msgstr "No de pudieron editar los delegados."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 msgid "Unknown error looking up {0}"
@@ -15602,7 +15581,8 @@ msgstr "Operación no soportada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 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:69
 msgid "You cannot make yourself your own delegate"
@@ -15644,7 +15624,7 @@ msgstr "Su contraseña ha caducado."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid "{0} cannot be added to an access control list"
-msgstr "{0} no  puede añadirse a la lista de control de acceso"
+msgstr "{0} no se puede añadir a la lista de control de acceso"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "{0} is already a delegate"
@@ -15656,7 +15636,7 @@ msgstr "{0} ya está en la lista"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
 msgid "Subscribe to Other User's Tasks"
-msgstr "Subscribirse a las  tareas de otros usuarios"
+msgstr "Subscribirse a las tareas de otros usuarios"
 
 #: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
 msgid "Check folder permissions"
@@ -15852,11 +15832,13 @@ msgstr "Sesión _proxy…"
 
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté conectada."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
+msgstr ""
+"La solapa del Proxy estará disponible sólo cuando la cuenta esté activada."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -15907,12 +15889,12 @@ msgid "Select Calendar"
 msgstr "Seleccione el calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -15954,7 +15936,8 @@ msgstr "No se pudo abrir la libreta de direcciones"
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "No se puedo abrir la libreta de direcciones de Evolution para exportar datos."
+msgstr ""
+"No se puedo abrir la libreta de direcciones de Evolution para exportar datos."
 
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
@@ -16276,7 +16259,8 @@ msgstr "<b>%s</b> ha delegado la reunión siguiente en usted:"
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
+msgstr ""
+"<b>%s</b> solicita su presencia en la siguiente reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -16295,7 +16279,8 @@ msgstr "<b>%s</b> desea apuntarse a una reunión existente:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> desea recibir la última información de la reunión siguiente:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -16321,7 +16306,8 @@ msgstr "<b>%s</b> ha propuesto los cambios siguientes para la reunión."
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
+msgstr ""
+"<b>%s</b> ha declinado los siguientes cambios para la reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
@@ -16380,7 +16366,8 @@ msgstr "<b>%s</b> ha devuelto la siguiente respuesta a la tarea:"
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> a través de %s ha cancelado la siguiente asignación de tarea:"
+msgstr ""
+"<b>%s</b> a través de %s ha cancelado la siguiente asignación de tarea:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
@@ -16390,7 +16377,8 @@ msgstr "<b>%s</b> ha cancelado la siguiente tarea asignada:"
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
+msgstr ""
+"<b>%s</b> ha propuesto los siguientes cambios en la asignación de tareas:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
@@ -16491,9 +16479,9 @@ msgstr "Formateador iTip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
-"&quot;{0}&quot; ha delegado la reunión. ¿Quiere añadir al delegado &quot;{1}"
+"&quot;{0}&quot; ha delegado la reunión. Quiere añadir al delegado &quot;{1}"
 "&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16501,7 +16489,8 @@ msgid "This meeting has been delegated"
 msgstr "Esta reunión se ha delegado"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -16535,7 +16524,8 @@ msgid "No store available"
 msgstr "No hay almacén disponible"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Un complemento que implementa un interfaz Corba para acceder a los datos de "
 "correo de forma remota."
@@ -16698,7 +16688,7 @@ msgid ""
 "This message does not contain the header information required for this "
 "action."
 msgstr ""
-"Este mensaje no  contiene la información de cabecera requerida para esta "
+"Este mensaje no contiene la información de cabecera requerida para esta "
 "acción."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -16721,11 +16711,13 @@ msgstr "Obtener un archivador de la lista a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
+msgstr ""
+"Obtiene información sobre el uso de la lista a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
+msgstr ""
+"Publicar un mensaje en la lista de correo a la que pertenece este mensaje"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -17008,12 +17000,12 @@ msgstr "Guarda todos los adjuntos"
 msgid "Select save base name"
 msgstr "Seleccione el nombre base para guardar"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 #: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save"
 msgstr "Guardar"
@@ -17124,7 +17116,7 @@ msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Seleccione el archivo de destino"
 
@@ -17174,18 +17166,18 @@ msgstr ""
 "Por favor pulse el botón «Adelante» para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la información que quiera importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando datos."
 
@@ -17226,7 +17218,8 @@ msgstr "Componente de Prueba de Evolution"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "A GNOME Print description of the current printer settings"
-msgstr "Una descripción de impresora Gnome de la configuración actual de impresora"
+msgstr ""
+"Una descripción de impresora Gnome de la configuración actual de impresora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
@@ -17257,7 +17250,8 @@ msgid "Last upgraded configuration version"
 msgstr "Última versión de la configuración actualizada"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lista de rutas a las carpetas que se sincronizarán al disco para usar "
 "desconectado"
@@ -17274,15 +17268,11 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diálogo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "La barra de estado es visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17290,19 +17280,19 @@ msgstr ""
 "La versión de configuración de Evolution, con nivel de configuración mayor/"
 "menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "La anchura predeterminada de la ventana principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "La anchura predeterminada para la barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17310,57 +17300,54 @@ msgstr ""
 "La última versión de configuración de Evolution actualizada, con nivel de "
 "configuración mayor/menor (por ejemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 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 ""
 "El estilo de los botones de la ventana. Puede ser \"text\", \"icons\", \"both"
-"\", \"toolbar\". Si  se selecciona \"toolbar\", el estilo de los botones se "
+"\", \"toolbar\". Si se selecciona \"toolbar\", el estilo de los botones se "
 "determina por la configuración de la barra de herramientas de Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica si Evolution se iniciará en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Indica si la ventana deberían o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 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 debería ser visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica si se omite el diálogo de advertencia en las versiones de desarrollo "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indica si la los botones de la ventana deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
@@ -17381,11 +17368,11 @@ msgstr "Pulse «Aceptar» para cerrar estas conexiones y desconectarse"
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17398,11 +17385,11 @@ msgstr ""
 "\n"
 "Si no lo sabe, puede elegir «Automático» y Evolution tratará de encargarse."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importación"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17414,23 +17401,23 @@ msgstr ""
 "configuración que se pueda importar. Si quiere intentarlo de nuevo, pulse\n"
 "el botón «Atrás».\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
@@ -17444,7 +17431,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
@@ -17460,7 +17448,8 @@ msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
@@ -17591,7 +17580,7 @@ msgstr ""
 "importación de archivos externos dentro de Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17627,7 +17616,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17635,39 +17624,35 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depuración de todos los componentes a un archivo."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desactiva la carga de cualquier complemento."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- El cliente de correo-e y GIP Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17889,7 +17874,7 @@ msgstr "Introduzca la contraseña para «%s»"
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
-msgstr "Introduzca una contraseña nueva para  la base de datos de certificados"
+msgstr "Introduzca una contraseña nueva para la base de datos de certificados"
 
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
@@ -17903,7 +17888,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido a:\n"
-"  Asunto: %s\n"
+"   Asunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:122
 #, c-format
@@ -17912,7 +17897,7 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 "Emitido por:\n"
-"  Asunto: %s\n"
+"     Asunto: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
@@ -18083,7 +18068,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -18327,7 +18313,7 @@ msgstr "Cambia las propiedades de la carpeta seleccionada"
 
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
-msgstr "Co_piar todos los contactos a..."
+msgstr "Co_piar todos los contactos a…"
 
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
@@ -18387,7 +18373,7 @@ msgstr "Reenviar contacto"
 
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
-msgstr "Mo_ver todos los contactos a..."
+msgstr "Mo_ver todos los contactos a…"
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
@@ -18440,7 +18426,7 @@ msgid "Select All"
 msgstr "Seleccionar todo"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _todo"
@@ -18488,7 +18474,7 @@ msgstr "A_cciones"
 
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
-msgstr "_Copiar contacto a..."
+msgstr "_Copiar contacto a…"
 
 #: ../ui/evolution-addressbook.xml.h:48
 msgid "_Copy Folder Contacts To"
@@ -18504,7 +18490,7 @@ msgstr "_Reenviar contacto…"
 
 #: ../ui/evolution-addressbook.xml.h:53
 msgid "_Move Contact to..."
-msgstr "_Mover contacto a..."
+msgstr "_Mover contacto a…"
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
@@ -18571,7 +18557,6 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:57
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Siguiente"
 
@@ -18580,7 +18565,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza el calendario a imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:73
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
@@ -18668,11 +18653,11 @@ msgstr "Corta la selección al portapapeles"
 msgid "Paste from clipboard"
 msgstr "Pega del portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Pega texto desde el portapapeles"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Selecciona todo el texto"
 
@@ -18702,31 +18687,30 @@ msgstr "Pulse aquí para ver la ayuda disponible"
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:6
-msgid "I_nsert"
-msgstr "_Insertar"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:14
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:40
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "A_yuda"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Insertar"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opciones"
@@ -18824,11 +18808,6 @@ msgstr "Se activa cuando se deben mostrar la hora como ocupada"
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -18895,7 +18874,7 @@ msgstr "_Carpeta"
 
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Message _List As"
-msgstr "_Lista de mensajes como"
+msgstr "_Lista de mensaje como"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
@@ -18907,7 +18886,8 @@ msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
@@ -18934,7 +18914,6 @@ msgid "_Move Folder To..."
 msgstr "_Mover carpeta a…"
 
 #: ../ui/evolution-mail-global.xml.h:19
-#, fuzzy
 msgid "_New Search _Folder (FIXME)"
 msgstr "Carpeta de búsqueda nueva"
 
@@ -18948,7 +18927,7 @@ msgstr "_Suscripciones"
 
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
-msgstr "Cambia el nombre de esta carpeta"
+msgstr "Cambiar el nombre de esta carpeta"
 
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
@@ -18995,8 +18974,10 @@ msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leídos"
 
 #: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ../ui/evolution-mail-list.xml.h:15
 msgid "Mar_k All Messages as Read"
@@ -19076,7 +19057,7 @@ msgstr "Aplicar _filtros"
 
 #: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
-msgstr "Añade el remitente a la libreta de direcciones"
+msgstr "Añadir remitente a la libreta de direcciones"
 
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
@@ -19208,7 +19189,7 @@ msgstr "Filtro según el _asunto…"
 
 #: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
-msgstr "Filtra los mensajes seleccionados por el estado de spam"
+msgstr "Filtrar los mensajes seleccionados por el estado de spam"
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected messages for follow-up"
@@ -19220,7 +19201,7 @@ msgstr "Se_guimiento…"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
-msgstr "Fuerza la carga de imágenes en el correo HTML"
+msgstr "Forzar la carga de imágenes en el correo HTML"
 
 #: ../ui/evolution-mail-message.xml.h:42
 msgid "Forward the selected message in the body of a new message"
@@ -19580,6 +19561,11 @@ msgstr "Obtener notificación de entrega cuando su mensaje sea leído"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:6
+msgid "I_nsert"
+msgstr "_Insertar"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir un archivo"
@@ -19856,11 +19842,11 @@ msgstr "Acerca de Evolution…"
 
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
-msgstr "Cambia la configuración de Evolution"
+msgstr "Cambiar la configuración de Evolution"
 
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
-msgstr "Cambia la visibilidad de la barra de herramientas"
+msgstr "Cambiar las visibilidad de la barra de herramientas"
 
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
@@ -19886,7 +19872,7 @@ msgstr "Mostrar los botones de la ventana sólo con texto"
 
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
-msgstr "_Preguntas frecuentes sobre Evolution"
+msgstr "Preguntas _frecuentes de Evolution"
 
 #: ../ui/evolution.xml.h:11
 msgid "Exit the program"
@@ -19958,7 +19944,7 @@ msgstr "Enviar informe de _fallos"
 
 #: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Envía un informe de fallos usando Bug Buddy"
+msgstr "Enviar un informe de fallos usando Bug Buddy"
 
 #: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
@@ -20214,19 +20200,14 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Sugerir mostrar adjuntos automáticamente"
-
 #. 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMXJVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20294,7 +20275,7 @@ msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Espaciado"
 
@@ -20436,23 +20417,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Indica si el expansor está o no expandido"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Texto de la etiqueta del expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Usar subrayado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20460,31 +20441,31 @@ msgstr ""
 "Si se establece, un subrayado en el texto indica que el siguiente carácter "
 "debería usarse para la combinación de teclas mnemotécnica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Espacio para poner entre la etiqueta y el descendiente"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etiqueta del widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para mostrar en lugar de la etiqueta usual del expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamaño del expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamaño de la flecha del expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicador de espacio"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Espaciado alrededor de la flecha del expansor"
 
@@ -20565,38 +20546,38 @@ msgstr "Anchura de columna"
 msgid "Search"
 msgstr "Buscar"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Buscar ahora"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Vaciar"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
 msgstr "Buscar _ahora"
 
 #: ../widgets/misc/e-selection-model-array.c:547
@@ -20694,7 +20675,7 @@ msgid ""
 "Standard\n"
 "Low"
 msgstr ""
-"Indefinido\n"
+"Sin definir\n"
 "Alto\n"
 "Estándar\n"
 "Bajo"
@@ -21297,3 +21278,5 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+#~ msgid "Properties..."
+#~ msgstr "Propiedades…"
diff --git a/po/et.po b/po/et.po
index 439724af23..bdfbfb103e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -4,18 +4,18 @@
 # Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 #
-# 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-2005.
+# 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-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.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-06 22:09+0200\n"
+"POT-Creation-Date: 2006-02-16 06:14+0100\n"
 "PO-Revision-Date: 2006-05-07 00:08+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
@@ -40,12 +40,12 @@ msgstr "Uus kontakt"
 msgid "New Contact List"
 msgstr "Uus kontaktide nimekiri"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "käesolev aadressiraamatu kaust %s sisaldab %d kaardi"
-msgstr[1] "käesolev aadressiraamatu kaust %s sisaldab %d kaarti"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "käesolev aadressiraamatu kaust sisaldab %d kaardi"
+msgstr[1] "käesolev aadressiraamatu kaust sisaldab %d kaarti"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -64,32 +64,32 @@ msgstr "Kontakt:"
 msgid "evolution minicard"
 msgstr "evolutioni minikaart"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "On alarmidega."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "See omab kordumisi."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "See on kohtumine."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendrisündmus: Kokkuvõte on %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendrisündmus: Kokkuvõte puudub."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "calendrivaate sündmus"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "Haara fookus"
 
@@ -118,32 +118,32 @@ msgstr "Mine kuupäevale"
 msgid "a table to view and select the current time range"
 msgstr "tabel praeguse ajavahemiku kuvamiseks ja valimiseks"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Sellel on %d sündmus."
 msgstr[1] "Sellel on %d sündmust."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "Sellel pole sündmusi."
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:152
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Töönädala vaade: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:158
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Päeva vaade: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:189
+#: ../a11y/calendar/ea-day-view.c:186
 msgid "calendar view for a work week"
 msgstr "kalendrivaade töönädala jaoks"
 
-#: ../a11y/calendar/ea-day-view.c:191
+#: ../a11y/calendar/ea-day-view.c:188
 msgid "calendar view for one or more days"
 msgstr "kalendrivaade ühe või enama päeva jaoks"
 
@@ -160,10 +160,8 @@ msgstr "%A, %d. %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
@@ -194,10 +192,8 @@ msgstr "%d. %B %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -223,21 +219,21 @@ msgstr ""
 msgid "Click here, you can find more events."
 msgstr "Täiendavate sündmuste lisamiseks klõpsa siia"
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:155
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuu vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:159
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nädala vaade: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:190
 msgid "calendar view for a month"
 msgstr "kalendrivaade kuu jaoks"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for one or more weeks"
 msgstr "kalendrivaade ühe või enama nädala jaoks"
 
@@ -551,9 +547,9 @@ 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:1338
+#: ../addressbook/gui/component/addressbook-view.c:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Kontaktid"
 
@@ -614,7 +610,7 @@ msgstr "Kohalikus arvutis"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Isiklik"
 
@@ -653,7 +649,7 @@ msgstr "_Aadressiraamat"
 msgid "Create a new address book"
 msgstr "Uue aadressiraamatu loomine"
 
-#: ../addressbook/gui/component/addressbook-component.c:406
+#: ../addressbook/gui/component/addressbook-component.c:382
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Tõrge aadressiraamatu seadistuste või kataloogide uuendamisel."
 
@@ -674,10 +670,10 @@ msgstr "Raamatu sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../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:86
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -717,12 +713,12 @@ msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -794,34 +790,34 @@ msgstr "Kausta nimes ei tohi sisalduda '/' sümbol"
 msgid "A Folder with this name already exists"
 msgstr "Sellise nimega kaust on juba olemas"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Uus aadressiraamat"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../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 "_Kustuta"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Salvesta vKaardina..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Kontaktide allika valimine"
 
@@ -830,12 +826,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Tõrge autentimisel.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Sisesta %s parool (kasutaja %s)"
@@ -881,7 +877,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Nimedevaliku dialoogis viimatikasutatud kausta URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Püstpaani asukoht"
 
@@ -1182,10 +1178,13 @@ msgstr "kaardid"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2021
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2020
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1201,6 +1200,7 @@ msgstr "minutit"
 #: ../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
@@ -1250,7 +1250,7 @@ msgstr "<b>Töö</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
@@ -1307,7 +1307,7 @@ msgstr "Telefon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Töö"
@@ -1425,8 +1425,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Postiindeks:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Aadress"
 
@@ -1442,7 +1442,7 @@ msgstr "Aadress"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2420,7 +2420,7 @@ msgstr "Zimbabwe"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nimi"
@@ -2431,7 +2431,7 @@ msgstr "AOL kiirsuhtlusklient"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2441,7 +2441,7 @@ msgstr "Yahoo Kiirsuhtlusklient"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2451,7 +2451,7 @@ msgstr "Teenus"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:497
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Asukoht"
@@ -2471,17 +2471,17 @@ msgid "Other"
 msgstr "Muu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "Groupwise"
 
@@ -2515,15 +2515,15 @@ msgstr "Muudetud"
 msgid "Contact Editor - %s"
 msgstr "Kontaktiredaktor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
 msgid "Please select an image for this contact"
 msgstr "Palun vali selle kontakti jaoks pilt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
 msgid "No image"
 msgstr "Pilti ei ole"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2531,7 +2531,7 @@ msgstr ""
 "Kontaktandmed on vigased:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
@@ -2559,10 +2559,10 @@ msgstr "_Vali aadressiraamat"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Kas sa tõesti soovid\n"
-"kustutada kontaktide loendit (%s)?"
+"kustutada kontaktide loendit (%s) ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2576,7 +2576,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Kas sa tõesti soovid\n"
 "kustutada kontakti (%s)?"
@@ -2687,10 +2687,9 @@ msgid "_IM Service:"
 msgstr "_KS teenus:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-calendar.c:234
+#: ../plugins/exchange-operations/exchange-contacts.c:222
 msgid "_Location:"
 msgstr "_Asukoht:"
 
@@ -2860,22 +2859,22 @@ msgstr "Allikas"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:486
+#: ../calendar/gui/e-meeting-list-view.c:480
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tüüp"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:834
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_va"
@@ -2932,13 +2931,13 @@ msgstr "Lõ_ika"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:986 ../mail/em-folder-view.c:1082
-#: ../mail/message-list.c:1742 ../ui/evolution-addressbook.xml.h:46
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopeeri"
@@ -2954,7 +2953,7 @@ msgid "Any Category"
 msgstr "Suvaline kategooria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1803
 msgid "Print cards"
 msgstr "Prindi kaardid"
 
@@ -2999,7 +2998,7 @@ msgid "Company Phone"
 msgstr "Firma telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-post"
@@ -3049,7 +3048,7 @@ msgid "Manager"
 msgstr "Juht"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
@@ -3058,7 +3057,7 @@ msgid "Nickname"
 msgstr "Hüüdnimi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Märkus"
 
@@ -3067,7 +3066,7 @@ msgid "Office"
 msgstr "Kontor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisatsioon"
 
@@ -3093,7 +3092,7 @@ msgstr "Raadio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:497
+#: ../calendar/gui/e-meeting-list-view.c:491
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
@@ -3132,7 +3131,7 @@ msgstr "Koduleht"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../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/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
 #: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:656
@@ -3140,7 +3139,7 @@ msgstr "Koduleht"
 #: ../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:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Laius"
@@ -3148,14 +3147,14 @@ msgstr "Laius"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../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/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 #: ../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:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Kõrgus"
@@ -3245,83 +3244,65 @@ msgstr "Valitud"
 msgid "Has Cursor"
 msgstr ""
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Ava _viit veebilehitsejas"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2464
-msgid "_Copy Link Location"
-msgstr "Kopeeri _lingi asukoht"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Saada uus sõnum aadressile..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Kopeeri _e-posti aadress"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kaart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Ametikoht"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "töö"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "isiklik"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Koduleht"
 
@@ -3682,19 +3663,19 @@ msgstr "Evolutioni CSV ja Tab-i importija"
 msgid "Importing ..."
 msgstr "Importimine ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:761
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP andmevahetusvorming (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:762
 msgid "Evolution LDIF importer"
 msgstr "Evolutioni LDIF importija"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:547
+#: ../addressbook/importers/evolution-vcard-importer.c:554
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:555
 msgid "Evolution VCard Importer"
 msgstr "Evolutioni VKaardi importija"
 
@@ -3703,12 +3684,12 @@ msgstr "Evolutioni VKaardi importija"
 msgid "Print envelope"
 msgstr "Prindi ümbrik"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Kontaktide trükkimine"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Kontakti trükkimine"
 
@@ -3757,7 +3738,7 @@ msgstr "Vorming"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1826
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Päis"
@@ -3862,8 +3843,8 @@ msgstr "Varjutamine"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-calendar.c:224
+#: ../plugins/exchange-operations/exchange-contacts.c:205
 msgid "Size:"
 msgstr "Suurus:"
 
@@ -4096,17 +4077,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Kas sa tõesti soovid kustutada seda sündmust?"
 
 #: ../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 "Kas sa tõesti soovid kustutada seda päevikukirjet?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Kas sa tõesti soovid kustutada seda koosolekut?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Kas sa tõesti soovid kustutada seda ülesannet?"
 
@@ -4353,7 +4331,7 @@ msgid "_Save Changes"
 msgstr "_Salvesta muudatused"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Saada"
 
@@ -4418,7 +4396,7 @@ msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Kalendrid"
 
@@ -4466,14 +4444,14 @@ msgid "Memos"
 msgstr "Märkmed"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:592
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/exchange-operations/exchange-folder.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ülesanded"
@@ -4492,6 +4470,9 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Evolutioni kalendri alarmteadete teenus"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/util.c:65
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
+#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -4520,8 +4501,8 @@ msgstr "Sündmused"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4537,7 +4518,7 @@ msgstr "_Edasilükkamise aeg:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4554,31 +4535,32 @@ msgstr "_Lükka edasi"
 msgid "location of appointment"
 msgstr "sündmuse asukoht"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Kokkuvõte puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Asukoha kohta puuduvad andmed."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Sul on %d alarmi"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4590,7 +4572,7 @@ msgstr ""
 "saatmist e-posti teel.  Evolution kuvab selle asemel\n"
 "hariliku meeldetuletusdialoogi."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4606,7 +4588,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Selle programmi kohta enam mitte küsida."
 
@@ -4622,34 +4604,67 @@ msgstr "Alarmteavituse teenuse factory't pole võimalik luua"
 msgid "invalid time"
 msgstr "vigane aeg"
 
-#. 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
+#. Can't be zero
+#: ../calendar/gui/alarm-notify/util.c:58
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d tund"
-msgstr[1] "%d tundi"
+msgid "(%ld seconds)"
+msgstr "(%ld sekundit)"
 
-#. 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
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
 #, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuti"
-msgstr[1] "%d minutit"
+msgid "(%d %s %d %s)"
+msgstr "(%d %s %d %s)"
 
-#. 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
+#. 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/alarm-notify/util.c:65
+#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
+msgid "second"
+msgstr "teine"
+
+#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekund"
-msgstr[1] "%d sekundit"
+msgid "(%d %s)"
+msgstr "(%d %s)"
+
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
+#, c-format
+msgid " %u second"
+msgstr "%u sekund"
+
+#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
+#, c-format
+msgid " %u seconds"
+msgstr "%u sekundit"
+
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#, c-format
+msgid " %u minute"
+msgstr "%u minut"
+
+#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#, c-format
+msgid " %u minutes"
+msgstr "%u minutit"
+
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#, c-format
+msgid "%u hour"
+msgstr "%u tund"
+
+#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#, c-format
+msgid "%u hours"
+msgstr "%u tundi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4705,102 +4720,90 @@ msgid "Default reminder value"
 msgstr "Meeldetuletaja vaikimisi väärtus"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Sündmuse kalle"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Sündmuse läbipaistvus"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Vaba/hõivatud serveri URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vaba/hõivatud malli URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Sündmuste kalle kalendrivaates."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Peida lõpetatud ülesanded"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ülesandeühikute peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ülesandeväärtuste peitmine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva lõpuaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Tööpäeva algusaeg, 24-tunnises vormingus, vahemikus 0-23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Päeva ja töönädala vaates näidatavad vahemikud minutites."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Viimase alarmi aeg"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Serveri url-ide loend vaba/hõivatud andmete avaldamiseks."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains'i joon"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains'i joone värv - päeva vaade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains'i joone värv - ajariba"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut, millal tööpäev lõpeb, 0 kuni 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut, millal tööpäev algab, 0 kuni 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Kuuvaate rõhtpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Kuuvaate püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Meeldetuletaja vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Ülesannete peitmiseks vaikimisi ühikute arv."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Tähtaja ületanud ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4808,7 +4811,7 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - kuupäevanavigeerimise kalendri ja ülesannete "
 "loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4816,14 +4819,14 @@ msgstr ""
 "Rõhtpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr ""
 "Rõhtpaani asukoht pikslites - ülesande- ja ülesande eelvaatepaanide vahel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4831,7 +4834,7 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui oldakse kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4839,72 +4842,72 @@ msgstr ""
 "Püstpaani asukoht pikslites - vaate ning kuupäevanavigeerimise kalendri ja "
 "ülesannete loendi vahel, kui ei olda kuuvaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programmid, mida on lubatud alarmide poolt käivitada."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "RSVP välja kuvamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Rollivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Sündmuste lõpuaegade näitamine nädala ja kuu vaadetel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Kategooriavälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Alarmide kuvamine teavitussalves"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Olekuvälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"Eelvaatlus\" paani kuvamine"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"Eelvaatlus\" paani kuvamine."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Ajavööndi välja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Nädalanumbrite näitamine kuupäevavalikus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Tänase tähtajaga ülesannete värvus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Ülesannete püstpaani asukoht"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4912,64 +4915,56 @@ msgstr ""
 "Vaikimisi ajavöönd kalendris märgitud päevadele ja aegadele - tõlkimata "
 "asukohastring Olseni ajavööndite andmebaasist, näiteks \"Europe/Tallinn\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Ajajaotised:"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Viimase alarmi töötamise aeg, time_t ühikuga."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-"Sündmuste läbipaistvus kalendrivaates (väärtus 0 ja 10 vahel, vaikimisi "
-"läbipaistmatu)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Kahekümneneljatunnine ajavorming"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Vaikimisi meeldetuletaja ühikud, \"minutes\" (minutid), \"hours\" (tunnid) "
 "või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Ühikud määramaks, millal ülesandeid peita, \"minutes\" (minutid), \"hours"
 "\" (tunnid) või \"days\" (päevad)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Nädala algus"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Nädalapäev, millal nädal algab, pühapäevast (0) esmaspäevani (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Kas teavitussalve kasutatakse alarmide kuvamiseks või mitte."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Kas sündmuste või ülesannete kustutamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Kas sündmuste või ülesannete puhastamisel küsitakse nõusolekut."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4977,74 +4972,74 @@ msgstr ""
 "Kas nädalalõpud tuleb kuuvaates kokku suruda, selle tulemusena kuvatakse "
 "nädalalõppu ühe päeva suurusena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Kas sündmuste lõpuaegu kuvatakse nädala ja kuu vaadetel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Kas kalendris kuvatakse Marcus Bains'i joont (joon praeguse aja kohal)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Kas lõpetatud ülesanded peidetakse ülesandevaates."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Kas sündmustele seatakse vaikimisi meeldetuletaja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Kas RSVP välja näidatakse sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Kas kategooriate välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Kas rollivälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Kas olekuvälja näidatakse sündmuste/ülesannete/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Kas kellaaegu kuvatakse 24-tunnises või EL/PL vormingus."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Kas ajavööndi välja näidatakse sündmuste/koosolekute redaktoris."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Liigivälja näitamine sündmuste/ülesannete/koosolekute redaktoris"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Kas kuupäevasirvijas näidatakse nädalate numbreid."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Tööpäevad"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Tund, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minut, millal tööpäev lõpeb"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Tund, millal tööpäev algab"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minut, millal tööpäev algab"
 
@@ -5077,12 +5072,12 @@ msgstr "Prindi"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:580
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../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:590
 #: ../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
@@ -5145,59 +5140,59 @@ msgstr "Tõrge kalendrite uuendamisel."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Kalendrit '%s' pole võimalik sündmuste ja koosolekute loomiseks avada"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Sündmuste ja koosolekute loomiseks pole kalendrit saadaval"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Kalendri allika valimine"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Uus sündmus"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Sündmus"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Uue sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Uue koosolekukutse loomine"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Kogu _päeva hõlmav sündmus"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Uue kogu päeva hõlmava sündmuse lisamine"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Kalender"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Uue kalendri loomine"
 
@@ -5340,7 +5335,7 @@ msgstr "minut(it)"
 msgid "start of appointment"
 msgstr "sündmuse algust"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -5358,18 +5353,19 @@ msgstr "Alarmid"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "Manuse _automaatkuvamise soovitamine"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Manuse automaatkuvamise soovitamine"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Manuse omadused"
@@ -5378,19 +5374,19 @@ msgstr "Manuse omadused"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Kirjeldus:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Faili nimi:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME tüüp:"
@@ -5457,7 +5453,7 @@ msgid "Display"
 msgstr "Kuva"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Vaba/hõivatud"
@@ -5555,7 +5551,7 @@ msgid "Thursday"
 msgstr "Neljapäev"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Aja_vöönd:"
 
@@ -5645,46 +5641,46 @@ msgid "before every appointment"
 msgstr "enne iga sündmuse algust"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr ""
-"Kalendri sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+"Kalendri sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr ""
-"Ülesandeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+"Ülesandeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr ""
-"Märkmeloendi sisu _kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
+"Märkmeloendi sisu kopeerimine kohapeale tarvitamiseks võrguvabas keskkonnas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "Vä_rvus:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Ülesannete loend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Märkmeloend"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Kalendri omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Ülesandeloendi omadused"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Uus märkmeloend"
@@ -5803,132 +5799,132 @@ msgstr "Manustatud sõnum - %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:2855
-#: ../composer/e-msg-composer.c:3056
+#: ../composer/e-msg-composer.c:3034
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Manustatud sõnum"
 msgstr[1] "%d manustatud sõnumit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Tõsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:802
+#: ../calendar/gui/dialogs/comp-editor.c:800
 msgid "Could not update object"
 msgstr "Objekti pole võimalik uuendada!"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> fail manusena"
 msgstr[1] "<b>%d</b> faili manusena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:977
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Hide Attachment _Bar"
 msgstr "Peida manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:978
+#: ../calendar/gui/dialogs/comp-editor.c:1442
 msgid "Show Attachment _Bar"
 msgstr "Näita manuseri_ba"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1089
-#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1897
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1198
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3619
+#: ../composer/e-msg-composer.c:3597
 #: ../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 "_Eemalda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3622
+#: ../composer/e-msg-composer.c:3600
 msgid "_Add attachment..."
 msgstr "_Lisa manus..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
-#: ../mail/em-format-html-display.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../mail/em-format-html-display.c:2063
 msgid "Show Attachments"
 msgstr "Näita manuseid"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1467
 msgid "Press space key to toggle attachment bar"
 msgstr "Vajuta tühikut manuseriba sisse-/väljalülitamiseks"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2077
-#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../calendar/gui/dialogs/comp-editor.c:2074
+#: ../calendar/gui/dialogs/comp-editor.c:2117
 msgid "Edit Appointment"
 msgstr "Muuda sündmust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2080
+#: ../calendar/gui/dialogs/comp-editor.c:2123
 #, c-format
 msgid "Meeting - %s"
 msgstr "Koosolek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sündmus - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2089
-#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2086
+#: ../calendar/gui/dialogs/comp-editor.c:2129
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Omistatud ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:2134
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2147
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2144
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2655
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
-#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:399
+#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "manus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2744
-#: ../calendar/gui/dialogs/comp-editor.c:2798
-#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2741
+#: ../calendar/gui/dialogs/comp-editor.c:2795
+#: ../calendar/gui/dialogs/comp-editor.c:2819
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Sellele kirjele tehtud muudatused tühistatakse uuenduste saabumise korral"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:2843
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni pole võimalik kasutada!"
 
@@ -5944,10 +5940,6 @@ msgstr "Sihtkoha avamine nurjus"
 msgid "Destination is read only"
 msgstr "Sihtkoht on kirjutuskaitstud"
 
-#: ../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 "Seda sündmust pole võimalik tänu corba veale kustutada"
@@ -6009,116 +6001,116 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Sünd_mus"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Kordumine"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2714
+#: ../calendar/gui/dialogs/event-page.c:2717
 msgid "This event has alarms"
 msgstr "See sündmus on alarmidega"
 
-#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:875
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Kale_nder:"
 
-#: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:441
+#: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr "Ko_rraldaja:"
 
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:919
 msgid "_Delegatees"
 msgstr "_Delegaadid"
 
-#: ../calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:921
 msgid "Atte_ndees"
 msgstr "_Osalejad"
 
-#: ../calendar/gui/dialogs/event-page.c:1086
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1092
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:848
+#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1267
+#: ../calendar/gui/dialogs/event-page.c:1270
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1290
+#: ../calendar/gui/dialogs/event-page.c:1293
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1297
+#: ../calendar/gui/dialogs/event-page.c:1300
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/event-page.c:1455
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "Valitud korraldajal pole enam kontot."
 
-#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/event-page.c:1461
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:911
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "Korraldaja peab olema määrtud."
 
-#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/event-page.c:1476
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:926
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/event-page.c:1898
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1199
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Lisa "
 
-#: ../calendar/gui/dialogs/event-page.c:2621
+#: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' pole võimalik avada."
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, 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:2932
+#: ../calendar/gui/dialogs/event-page.c:2928
 #, 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:2936
 #, c-format
 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:2956
+#: ../calendar/gui/dialogs/event-page.c:2952
 msgid "Customize"
 msgstr "Kohanda"
 
@@ -6127,7 +6119,7 @@ msgstr "Kohanda"
 #. 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/event-page.c:2961
+#: ../calendar/gui/dialogs/event-page.c:2957
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6180,12 +6172,16 @@ msgstr "_Kirjeldus:"
 msgid "Event Description"
 msgstr "Sündmuse kirjeldus"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Asukoht:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
-msgstr "Kokku_võte:"
+msgstr "Kokkuvõt_e:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarm"
 
@@ -6252,16 +6248,16 @@ msgstr "Liige"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:509
+#: ../calendar/gui/e-meeting-list-view.c:503
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:520
+#: ../calendar/gui/e-meeting-list-view.c:514
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
@@ -6296,7 +6292,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Märkmeid pole võimalik '%s'-s avada."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
@@ -6396,15 +6392,6 @@ msgstr "järgnevatel nädalapäevadel:"
 msgid "first"
 msgstr "esimene"
 
-#. 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:998
-msgid "second"
-msgstr "teine"
-
 #. 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.
@@ -6549,14 +6536,14 @@ msgstr "<span weight=\"bold\">Olek</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Kõrge"
 
@@ -6571,14 +6558,14 @@ msgstr "Töös"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Madal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Keskmine"
 
@@ -6625,11 +6612,11 @@ msgstr "_Ülesanne"
 msgid "Task Details"
 msgstr "Ülesande üksikasjad"
 
-#: ../calendar/gui/dialogs/task-page.c:821
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: ../calendar/gui/dialogs/task-page.c:1649
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ülesandeid pole võimalik '%s'-s avada."
@@ -6713,6 +6700,30 @@ msgid_plural "%d weeks"
 msgstr[0] "%d nädal"
 msgstr[1] "%d nädalat"
 
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:408
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d tund"
+msgstr[1] "%d tundi"
+
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:414
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuti"
+msgstr[1] "%d minutit"
+
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:420
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekundit"
+
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
@@ -6774,7 +6785,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2827
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Klõpsa %s avamiseks"
@@ -6857,7 +6868,7 @@ msgstr "Vaba"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Hõivatud"
 
@@ -6871,74 +6882,74 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Jah"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c: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-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Korduv"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Määratud"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1916
+#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
 msgid "Select folder to save selected attachments..."
 msgstr "Valitud manuste salvestamiseks kataloogi valimine..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:274
 msgid "_Save Selected"
 msgstr "_Salvesta valik"
 
-#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
@@ -6992,25 +7003,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Valitud objektide kustutamine"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Salvestamine kui..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Ava veebileht"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7018,44 +7029,44 @@ msgstr "_Ava veebileht"
 msgid "_Print..."
 msgstr "_Prindi..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Aseta"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Määra ülesanne"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Edasta iKalendrina"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Märgi lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ülesande lisamiseks vajuta siia"
@@ -7090,105 +7101,105 @@ msgstr "Alguskuupäev"
 msgid "Task sort"
 msgstr "Ülesannete sortimine"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Kirjete tõstmine"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kirjete kopeerimine"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Uus _sündmus..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Uus _koosolek"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Uus ü_lesanne"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Käesolev vaade"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Vali _tänane kuupäev"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Vali kuupäev..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Tõsta kalendrisse..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegeeri koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "A_jasta koosolek..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Vasta"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Muuda seekordne sündmus _liigutatavaks"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "K_ustuta seekordne sündmus"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Ku_stuta kõik sündmuse kordused"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Korraldaja: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2183
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Korraldaja: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2199 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Asukoht: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2230
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aeg: %s %s"
@@ -7218,7 +7229,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i-minutiline jaotamine"
@@ -7229,21 +7240,19 @@ msgstr "%02i-minutiline jaotamine"
 #. 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pl"
@@ -7354,7 +7363,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7367,7 +7376,7 @@ msgstr "Proovinõusolek antud"
 
 #: ../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/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7694,81 +7703,81 @@ msgid "Resources"
 msgstr "Ressursid"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Isik"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Ressurss"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Ruum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Juht"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 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/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegeeritud"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:470
+#: ../calendar/gui/e-meeting-list-view.c:464
 msgid "Attendee                          "
 msgstr "Osaleja                           "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Töös"
 
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B %Y"
 
@@ -7776,78 +7785,78 @@ msgstr "%A, %d. %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Andmed puuduvad"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Osalejad..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Valikud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööaja piires"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Näita _väikeses plaanis"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Algus:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Lõpp:"
 
@@ -7863,7 +7872,7 @@ msgstr "Märkme lisamiseks vajuta siia"
 msgid "Memo sort"
 msgstr "Märkmete sortimine"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7882,7 +7891,7 @@ msgstr "Märkmete laadimine"
 msgid "Opening memos at %s"
 msgstr "Märkmete avamine asukohast %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
@@ -7891,20 +7900,20 @@ msgstr "Valitud objektide kustutamine..."
 msgid "Enter the password for %s"
 msgstr "Sisesta parool %s jaoks"
 
-#: ../calendar/gui/e-tasks.c:884
+#: ../calendar/gui/e-tasks.c:866
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: ../calendar/gui/e-tasks.c:971
+#: ../calendar/gui/e-tasks.c:953
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ülesannete avamine asukohast %s"
 
-#: ../calendar/gui/e-tasks.c:1216
+#: ../calendar/gui/e-tasks.c:1198
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: ../calendar/gui/e-tasks.c:1266
+#: ../calendar/gui/e-tasks.c:1248
 msgid "Expunging"
 msgstr "Puhastamine"
 
@@ -7915,8 +7924,7 @@ msgstr "Ajavööndi valimine"
 #. 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -8020,19 +8028,19 @@ 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:631 ../calendar/gui/itip-utils.c:754
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
 msgid "Event information"
 msgstr "Andmed sündmuse kohta"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
 msgid "Task information"
 msgstr "Andmed ülesande kohta"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
 msgid "Journal information"
 msgstr "Päevaraamatu andmed"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud andmed"
 
@@ -8052,16 +8060,16 @@ msgstr "Värskenda"
 msgid "Counter-proposal"
 msgstr "Loenduri esitus"
 
-#: ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:775
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Vaba/hõivatud andmed (%s -> %s)"
 
-#: ../calendar/gui/itip-utils.c:782
+#: ../calendar/gui/itip-utils.c:785
 msgid "iCalendar information"
 msgstr "iKalendri info"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:940
 msgid "You must be an attendee of the event."
 msgstr "Sa pead ise olema sündmusest osavõtja."
 
@@ -8185,6 +8193,12 @@ msgstr "Kalendrit `%s' pole võimalik siirdada"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ülesandeid `%s' pole võimalik siirdada"
 
+#. Can't be zero
+#: ../calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d sekundit)"
+
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1."
@@ -8484,7 +8498,7 @@ msgstr "Ü_lesannete nimekiri"
 msgid "Create a new task list"
 msgstr "Uue ülesandeloendi loomine"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8495,11 +8509,11 @@ msgstr ""
 "lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Prindi ülesanded"
 
@@ -10094,7 +10108,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:986
 msgid "Attachment Bar"
 msgstr "Manuseriba"
 
@@ -10115,15 +10129,15 @@ msgstr "Faili pole võimalik manusesse lisada: %s: %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Faili %s pole võimalik manusesse lisada: see ei ole tavaline fail"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Vali kaust, kuhu sõnum postitada."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 
@@ -10134,45 +10148,45 @@ msgstr "Aadressiraamatu kasutamiseks klõpsa siia"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Vasta-kellele:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Saatja:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Teema:"
 
-#: ../composer/e-msg-composer-hdrs.c:645
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Kellele:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Sisesta sõnumi adressaadid"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "K_oopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Sisesta aadressid, milledele saadetakse sõnumi koopiad"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Pimekoopia:"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10183,15 +10197,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Postita kuhu:"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 
-#: ../composer/e-msg-composer-hdrs.c:672
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Postita kuhu:"
 
@@ -10223,7 +10237,7 @@ msgid "Hide _Attachment Bar"
 msgstr "Peida _manuseriba"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3865
+#: ../composer/e-msg-composer.c:3843
 msgid "Show _Attachment Bar"
 msgstr "Näita _manuseriba"
 
@@ -10258,12 +10272,12 @@ msgstr "Automaatselt koostatud"
 msgid "Si_gnature:"
 msgstr "_Signatuur:"
 
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
-#: ../composer/e-msg-composer.c:3750
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
 msgid "Compose Message"
 msgstr "Sõnumi koostamine"
 
-#: ../composer/e-msg-composer.c:4974
+#: ../composer/e-msg-composer.c:4952
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10293,7 +10307,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Sa pead sõnumile valima teised sätted, põhjus: &quot;{0}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "Kuna &quot;{1}&quot;."
 
@@ -10402,11 +10416,11 @@ msgstr "_Salvesta sõnum"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:511
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr "Grupitöövahend"
 
@@ -10567,7 +10581,7 @@ msgstr "Kas sa soovid seda üle kirjutada?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Fail &quot;{0}&quot; on juba olemas."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -10641,23 +10655,23 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Võrdlusaja valimine"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Vali faili"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Tähtis"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Ülesanne"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Hiljem"
@@ -10735,7 +10749,7 @@ msgstr "Kuupäev on puudu."
 msgid "Missing file name."
 msgstr "Failinimi on puudu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nimi on puudu."
 
@@ -10807,10 +10821,6 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "sekundit"
-
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "praegune aeg"
@@ -10877,7 +10887,7 @@ msgstr "Evolutioni e-posti redaktori seadistuste juhtimine"
 msgid "Evolution Mail preferences control"
 msgstr "Evolutioni e-posti eelistuste juhtimine"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -10923,46 +10933,46 @@ msgstr "Kausta valimine"
 msgid "Ask for each message"
 msgstr "Küsitakse iga sõnumi kohta"
 
-#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identiteet"
 
-#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "E-posti vastuvõtmine"
 
-#: ../mail/em-account-editor.c:2013
+#: ../mail/em-account-editor.c:2012
 msgid "Automatically check for _new mail every"
 msgstr "Uute sõnumite automaatne _kontroll vahemikuga"
 
-#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Kirjade saatmine"
 
-#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Vaikimisi"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Turvalisus"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
 msgid "Receiving Options"
 msgstr "Vastuvõtmise valikud"
 
-#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Checking for New Mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Kontoredaktor"
 
-#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Evolutioni kontoabiline"
 
@@ -10984,7 +10994,7 @@ msgstr "[Vaikimisi]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -11013,18 +11023,18 @@ msgstr "Allkirjaskripti lisamine"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1655
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
 #. 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:1712
+#: ../mail/em-composer-utils.c:1702
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11170,7 +11180,7 @@ msgstr "Rämps"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
 
@@ -11246,7 +11256,7 @@ msgstr "Käivita programm"
 msgid "Score"
 msgstr "Hinne"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Saatja"
 
@@ -11280,7 +11290,7 @@ msgstr "Seiska töötlus"
 
 #: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11302,20 +11312,20 @@ msgstr "Loo otsingu baasil _Otsikaust..."
 
 #. 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
+#: ../mail/em-folder-properties.c:145
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Sõnumeid kokku:"
 msgstr[1] "Sõnumeid kokku:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
+#: ../mail/em-folder-properties.c:158
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Lugemata sõnumeid:"
 msgstr[1] "Lugemata sõnumeid:"
 
-#: ../mail/em-folder-properties.c:316
+#: ../mail/em-folder-properties.c:289
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Kausta omadused"
@@ -11348,7 +11358,7 @@ msgstr "Mustandid"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:598
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Sisendkast"
 
@@ -11364,48 +11374,48 @@ msgstr "Saadetud"
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Kirjakaustade puu"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s tõstmine"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite tõstmine %s kausta"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11413,28 +11423,28 @@ msgstr "\"%s\" kaustade läbivaatamine"
 msgid "_View"
 msgstr "_Vaade"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Tõsta..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Uus kaust..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "_Tühjenda prügikast"
 
@@ -11443,13 +11453,13 @@ msgstr "_Tühjenda prügikast"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopeerimine `%s' -> `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Kausta valimine"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opeeri"
 
@@ -11471,154 +11481,158 @@ msgstr "Kausta loomine"
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Märgi kui l_ugemata"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Märgista _mitterämpsuks"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "Si_lt"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Puudub"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Märgista kui _lõpetatud"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Otsikaust _teema järgi"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Otsikaust _saatja järgi"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Otsikaust _adressaatide järgi"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Otsikaust _postiloendi järgi"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "UTF-8"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: ../mail/em-folder-view.c:2271
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Sõnumit pole võimalik vastu võtta"
 
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "Kopeeri _lingi asukoht"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Loo uus _otsikaust"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Sellelt aadressilt"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "S_ellele aadressile"
 
-#: ../mail/em-folder-view.c:2822
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klõpsa, et saata sõnumit aadressile %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: ../mail/em-format-html-display.c:759 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11626,11 +11640,11 @@ msgstr ""
 "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust pole võimalik "
 "garanteerida."
 
-#: ../mail/em-format-html-display.c:760 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11638,11 +11652,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:761 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11650,11 +11664,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:762
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat pole võimalik tuvastada"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11662,11 +11676,11 @@ msgstr ""
 "See sõnum on signeeritud korrektse allkirjaga, kuid selle saatjat pole "
 "võimalik verifitseerida."
 
-#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Krüptimata"
 
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11674,11 +11688,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:769 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11688,22 +11702,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:770 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 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:771 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: ../mail/em-format-html-display.c:771
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11712,72 +11726,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:872 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Vaata sertifikaati"
 
-#: ../mail/em-format-html-display.c:887
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1172
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1185
+#: ../mail/em-format-html-display.c:1180
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1183
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1248
+#: ../mail/em-format-html-display.c:1243
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: ../mail/em-format-html-display.c:1249
+#: ../mail/em-format-html-display.c:1244
 msgid "_Hide"
 msgstr "_Peida"
 
-#: ../mail/em-format-html-display.c:1250
+#: ../mail/em-format-html-display.c:1245
 msgid "_Fit to Width"
 msgstr "_Sobita laiusega"
 
-#: ../mail/em-format-html-display.c:1251
+#: ../mail/em-format-html-display.c:1246
 msgid "Show _Original Size"
 msgstr "Näita _algset suurust"
 
-#: ../mail/em-format-html-display.c:1670 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
-#: ../mail/em-format-html-display.c:1877
+#: ../mail/em-format-html-display.c:1872
 msgid "Select folder to save all attachments..."
 msgstr "Kõikide manuste salvestamiseks kataloogi valimine..."
 
-#: ../mail/em-format-html-display.c:1924
+#: ../mail/em-format-html-display.c:1919
 msgid "_Save Selected..."
 msgstr "_Salvesta valitud..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1991
+#: ../mail/em-format-html-display.c:1986
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ma_nus"
 msgstr[1] "%d ma_nust"
 
-#: ../mail/em-format-html-display.c:1998 ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
 msgid "S_ave"
 msgstr "_Salvesta"
 
-#: ../mail/em-format-html-display.c:2009
+#: ../mail/em-format-html-display.c:2004
 msgid "S_ave All"
 msgstr "_Salvesta kõik"
 
-#: ../mail/em-format-html-display.c:2070
+#: ../mail/em-format-html-display.c:2065
 msgid "No Attachment"
 msgstr "Manus puudub"
 
@@ -11841,7 +11855,7 @@ msgstr "Vastus-Kuhu"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
@@ -11857,7 +11871,7 @@ msgstr "Pimekoopia"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:999
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Postiprogramm"
 
@@ -11888,7 +11902,7 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit pole võimalik analüüsida: Tundmatu viga"
 
@@ -11904,11 +11918,11 @@ msgstr "Toetamata krüptimistüüp multipart/encrypted sõnumile"
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
@@ -11928,7 +11942,7 @@ msgstr "Kord nädalas"
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11940,47 +11954,47 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Uut kataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kausta `%s' pole võimalik kopeerida `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Olemasolevaid postkaste asukohas '%s' pole võimalik läbi vaadata: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Vana POP `%s' hoia-serveris andmeid pole võimalik avada: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 hoia-serveris andmekataloogi `%s' pole võimalik luua: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 hoia-serveris `%s' andmeid pole võimalik kopeerida: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Tõrge kohaliku postisalvesti `%s' loomisel: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kohalikku postikausta pole võimalik asukohas `%s' luua: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11997,6 +12011,10 @@ msgstr "Saatjale _vastamine"
 msgid "Reply to _List"
 msgstr "Vasta _postiloendisse"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Ava _viit veebilehitsejas"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Saada uus sõnum aadressil..."
@@ -12034,20 +12052,20 @@ msgstr "Seda teadet enam uuesti mitte näidata."
 msgid "Message Filters"
 msgstr "Sõnumifiltrid"
 
-#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "sõnum"
 
-#: ../mail/em-utils.c:668
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: ../mail/em-utils.c:717
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1201
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Andmed %s-st"
@@ -12155,30 +12173,18 @@ msgstr ""
 "Kursorirežiimi lubamine - siis on kirja lugemisel kursori asukoht näha."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Enable or disable type ahead search feature"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:25
-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:26
 msgid "Enable/disable caret mode"
 msgstr "Kursorirežiimi lubamine/keelamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Sõnumiloendi paani kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12186,7 +12192,7 @@ msgstr ""
 "Korraga kümne või enama sõnumi avamise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12197,23 +12203,23 @@ msgstr ""
 "andmebaasis kirjeldatud bonobo-vaaturkomponendiga ja seda vaaturit "
 "kasutatakse sisu kuvamiseks."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Viimane kord kui prügikasti tühjendati"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Siltide ja nende värvuste loend"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Aktsepteeritud litsentside loend"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12221,11 +12227,11 @@ msgstr ""
 "Evolutioni sõnumikomponendile teadaolevate kontode loend. Sisaldab "
 "alamkataloogide nimesid kataloogi /apps/evolution/mail/accounts suhtes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Kohandatud päiste ja nende lubamise tingimuste loend."
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12234,19 +12240,19 @@ msgstr ""
 "värvus vorminus sõnumeid, kus värvus on kirjeldatud HTML-ile sarnaselt "
 "kuueteistkümnendsüsteemis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Mime-tüüpide loend bonobo komponendivaaturi kontrolliks"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Aktsepteeritava litsentsiga protokollide nimede loend."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12257,95 +12263,95 @@ msgstr ""
 "ainult kontaktide hulgast tulnud sõnumite puhul 2 - Pildid laaditakse alati "
 "võrgust alla"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filtrite tegevuste logimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filtri tegevuste logimine määratud logifaili."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Filtrite tegevuse logimise logifail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Filtrite tegevuse logimise logifail."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Sõnumi nähtuks märkimine peale määratud ajapiirangu ületamist"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Sõnumi nähtuks märkimine peale määratud ajapiirangu ületamist."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Tsitaatide märkimine sõnumi eelvaates"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Tsitaatide märkimine sõnumi eelvaates."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Sõnumiakna vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Sõnumiakna vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Sõnumi kuvamise laad (\"tavaline\", \"kõik päised\", \"lähtekood\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Vähim arv päevi prügikasti tühjendamiste vahel töö lõpetamisel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Vähim arv päevi prügikasti tühjendamiste vahel programmi töö lõpetamisel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Helifail uutest sõnumitest teatamiseks"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Uuest sõnumist teatamise tüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Kinnituse küsimine tühja teema korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Kausta puhastamisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Teemata sõnumi saatmisel kasutaja käest kinnituse küsimine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Kinnituse küsimine puhastamise korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Ainult pimekoopiaga saatmisel kasutaja käest kinnituse küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Korraga kümne või enama sõnumi saatmise korral kasutaja käest kinnituse "
 "küsimine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12353,89 +12359,89 @@ msgstr ""
 "Kinnituse küsimine, kui püütakse saata HTML sõnumit isikule, kes ei soovi "
 "HTML sisuga sõnumeid vastu võtta."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Kinnituse küsimine, kui püütakse saata sõnumit, millel pole tavalist saajat "
 "ega pimekoopa saajat määratud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kinnituse küsimine soovimatu HTML saatmise korral"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Tekstis olevate viitade äratundmine ja asendamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Tekstis olevate emotikonide äratundmine ja piltidega asendamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Rämpspostikontrollitestide rakendamine sissetulevatele sõnumitele"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Sõnumite vaikimisi HTML-vormingus saatmine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Animatsioonide kuvamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Animeeritud piltide kuvamine animatsioonidena."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Kustutatud sõnumite kuvamine (läbikriipsutatult) sõnumiloendis."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Kustutatud sõnumite näitamine sõnumiteloendis"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Helifail, mida esitatakse uute sõnumite saabumisel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Kasutaja poolt valitud uuest sõnumist teavitamise tüüp."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Õigekirjakontrolli teostatakse jooksvalt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Tellimisdialoogi vaikimisi kõrgus"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Tellimisdialoogi vaikimisi laius"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminali kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Viimane prügikasti tühjendamise aeg päevades alates epohhi algusest."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Terminali kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12447,99 +12453,99 @@ msgstr ""
 "&lt;header enabled&gt; - kui seda päiserida tuleks kuvada, siis on \"enabled"
 "\" määratud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Sõnumiloendi paigutamine lõimedesse."
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Sõnumiloendi paigutamine lõimedesse"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Sõnumiloendi paigutamine lõimedesse Teema alusel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Aeg, mille jooksul sõnum nähtuks märgitakse."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Vaikimisi määratud konto UID string."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin'i deemoni ja kliendi kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin'i deemoni ja kliendi (spamc/spamd) kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Kohandatud kirjatüüpide kasutamine"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Kohandatud kirjatüüpide kasutamine sõnumi näitamisel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Ainult kohalike rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ainult kohalike (mitte-DNS) rämpspostitestide kasutamine."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Muutuva laiusega kirjatüüp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Vaade/Pimekoopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Vaade/Pimekoopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Vaade/Koopia menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Vaade/Koopia menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Vaade/Kellelt menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Vaade/Kellelt menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Vaade/Postita-kuhu menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Vaade/Vasta-kellele menüükirje on märgitud"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Vasta-kellele menüükirje on märgitud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12579,7 +12585,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postkasti vormingus kaustade importija"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
@@ -12587,7 +12593,7 @@ msgstr "'%s' importimine"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -13676,11 +13682,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: ../mail/mail-ops.c:2091
+#: ../mail/mail-ops.c:2090
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2102
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13689,22 +13695,22 @@ msgstr ""
 "Väljundfaili pole võimalik luua: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2120
+#: ../mail/mail-ops.c:2112
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid pole võimalik kirjutada: %s"
 
-#: ../mail/mail-ops.c:2269
+#: ../mail/mail-ops.c:2262
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: ../mail/mail-ops.c:2269
+#: ../mail/mail-ops.c:2262
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: ../mail/mail-ops.c:2385
+#: ../mail/mail-ops.c:2378
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
@@ -13732,26 +13738,17 @@ msgstr "Ootamine..."
 msgid "Checking for new mail"
 msgstr "Uute sõnumite kontroll"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Parooli sisestamine %s jaoks"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Parooli sisestamine"
-
-#: ../mail/mail-session.c:210
-#: ../plugins/exchange-operations/exchange-config-listener.c:710
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:681
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Parooli sisestamine %s jaoks"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Parooli sisestamine"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Kasutaja katkestas toimingu."
 
@@ -13826,20 +13823,20 @@ 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."
+"quit.\n"
 msgstr ""
 "Asukohas &quot;{1}&quot; on täidetud kaust juba olemas.\n"
 "\n"
 "Sa võid seda kausta eirata, üle kirjutada, selle sisule lisada või toimingu "
-"lõpetada."
+"lõpetada.\n"
 
-#: ../mail/mail.error.xml.h:5
+#: ../mail/mail.error.xml.h:6
 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
+#: ../mail/mail.error.xml.h:7
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
@@ -13847,7 +13844,7 @@ msgstr ""
 "Signatuur nimega &quot;{1}&quot; on juba olemas. Palun kasuta teistsugust "
 "nime."
 
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:8
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
@@ -13855,24 +13852,24 @@ msgstr ""
 "Sõnumile mõtestatud teemarea lisamine annab sõnumi vastuvõtjatele aimu "
 "sõnumi sisu kohta."
 
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot ja kõiki selle proksisid?"
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
 msgid "Are you sure you want to delete this account?"
 msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Kas sa soovid keelata seda kontot ja kustutada kõik selle proksid?"
 
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to open {0} messages at once?"
 msgstr "Oled sa kindel, et soovid korraga avada {0} sõnumit?"
 
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -13880,7 +13877,7 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kõikidest "
 "kaustadest?"
 
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:14
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
@@ -13888,81 +13885,81 @@ msgstr ""
 "Kas sa tõesti soovid jäädavalt eemaldada kõik kustutatud sõnumid kaustast "
 "&quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
 msgstr "Kuna &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Because &quot;{2}&quot;."
 msgstr "Kuna &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid "Blank Signature"
 msgstr "Tühi allkiri"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Otsikausta &quot;{0}&quot; pole võimalik lisada."
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kopeerida &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi pole võimalik luua."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Salvestuskataloogi pole võimalik luua, sest &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik kustutada."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr ""
 "Otsikausta &quot;{0}&quot; pole võimalik redigeerida, kuna seda pole olemas."
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kausta &quot;{0}&quot; pole võimalik tõsta &quot;{1}&quot; kausta."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Allikat &quot;{1}&quot; pole võimalik avada"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Allikat &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Sihtkohta &quot;{2}&quot; pole võimalik avada."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 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 "
@@ -13972,31 +13969,31 @@ msgstr ""
 "paigaldusprobleemiga. Sul pole seda tagajat võimalik enne "
 "litsentsitingimustega nõustumist pruukida."
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;{0}&quot; pole võimalik &quot;{1}&quot;-ks ümber nimetada."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "Süsteemikausta &quot;{0}&quot; pole võimalik ümber nimetada ega tõsta."
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kataloogi &quot;{0}&quot; alla pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Faili &quot;{0}&quot; pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Signatuuriskripti &quot;{0}&quot; pole võimalik määrata."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14005,71 +14002,71 @@ msgstr ""
 "tõstutundlikud, siis veendu, et klaviatuuri \"Caps Lock\" klahv ei oleks "
 "sisse lülitatud."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:42
 msgid "Could not save signature file."
 msgstr "Signatuurifaili pole võimalik salvestada."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Kustutada &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:44
 msgid "Delete account?"
 msgstr "Kustutada konto?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:45
 msgid "Discard changes?"
 msgstr "Kas hüljata muudatused?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:46
 msgid "Do not delete"
 msgstr "Ära kustuta"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:47
 msgid "Do not disable"
 msgstr "Ära keela"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Kas sa soovid seda operatsiooni teostada ka alamkaustades?"
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Do you want to mark all messages as read?"
 msgstr "Kas soovid märkida kõiki sõnumeid loetuks?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Viga käsu täitmisel."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Viga toimingul: {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "Fail on juba olemas, kuid seda pole võimalik üle kirjutada."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "Fail on juba olemas, aga see ei ole tavaline fail."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Kui sa jätkad, siis neid sõnumeid ei ole võimalik enam taastada."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14077,11 +14074,11 @@ msgstr ""
 "Kui sa selle kausta kustutad, siis kustuvad jäädavalt ka kõik selles olevad "
 "sõnumid ja alamkaustad."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Kui sa seda teed, siis kõik proksi kontod kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14089,11 +14086,11 @@ msgstr ""
 "Kui sa seda teed, siis konto ja kõik proksi\n"
 "andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Kui sa seda teed, siis konto andmed kustutatakse jäädavalt."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14101,19 +14098,19 @@ msgstr ""
 "Kui sa praegu lõpetad, siis ei saadeta saatmata sõnumeid enne, kui sa "
 "Evolutioni uuesti käivitad."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Eira"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Vigane autentimine"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Postifiltrid automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 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 "
@@ -14121,35 +14118,35 @@ msgid ""
 "recipient."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Kõigi sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Kõigi valitud kataloogis olevate sõnumite loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Ühtegi allikat pole valitud."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ühekorraga paljude sõnumite avamisele võib kuluda kaua aega."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Palun kontrolli oma kontosätteid ja proovi uuesti."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:75
+#: ../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."
@@ -14157,7 +14154,7 @@ msgstr ""
 "Palun määra sõnumi saaja. Saajat saab kontaktide valida, kui sa vajutad "
 "nupule \"Kellele:\"."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14169,47 +14166,47 @@ msgstr ""
 "{0}\n"
 "Kas saata?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Palun sisesta selle signatuuri identifitseerimiseks unikaalne nimi."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Palun oota."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probleem vana postikausta &quot;{0}&quot; migreerimisel."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serverilt autentimismehhanismide loendi küsimine."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Küsitakse lugemiskinnitust."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Kas tõesti kustutada kaust &quot;{0}&quot; ja selle kõik alamkaustad?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Otsikaustad automaatselt uuendatud."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "Allkiri on juba olemas"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14217,7 +14214,7 @@ msgstr ""
 "Süsteemsed kaustad on tarvilikud Evolutioni korrektseks toimimiseks ja neid "
 "pole võimalik ümber nimetada, ümber tõsta või kustutada."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14227,7 +14224,7 @@ msgid ""
 "recipient. "
 msgstr ""
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14241,7 +14238,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Otsikaustad on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14255,29 +14252,37 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Reeglid on nüüd uuendatud."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
+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:106
 msgid "The script file must exist and be executable."
 msgstr "Skriptifail peab olemas olema ja peab olema käivitatav."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:107
 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:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Seda sõnumit pole võimalik saata kuna adressaadi konto pole lubatud"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Seda sõnumit pole võimalik saata kuna sa pole määranud ühtegi adressaati"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14285,11 +14290,11 @@ msgstr ""
 "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
 "autentimist üleüldse."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14297,144 +14302,148 @@ msgstr ""
 "Kõigi valitud kataloogis ja selle alamkataloogides olevate sõnumite "
 "loetuksmärkimine"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise serveriga pole võimalik ühenduda."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Litsentsifaili pole võimalik lugeda"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Sa ei saa luua kahte sama nimega kontot."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Sa pead sellele otsikaustale nime andma."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Kausta valimine on kohustuslik."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 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:123
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "Tõrge serverisse &quot;{0}&quot; sisselogimisel kasutajana &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
+msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
+
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Lisa"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Hülga muudatused"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Puhasta"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "_Ava sõnumid"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Nähtud"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Vastatud"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Alumine"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Kõrge"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Sõnumid"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "Sõnumiloendi genereerimine"
 
@@ -14462,7 +14471,7 @@ msgstr "Algne asukoht"
 msgid "Received"
 msgstr "Vastuvõetud"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Suurus"
@@ -14729,6 +14738,10 @@ msgstr ""
 "Testplugin asjade lõikelauale kopeerimise hüpikmenüü plugina "
 "demonstreeriseks."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Kopeeri _e-posti aadress"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Kopeerimisvahend"
@@ -14890,8 +14903,8 @@ msgstr "Autentimise tüüp"
 msgid "Ch_eck for Supported Types"
 msgstr "_Tuvasta toetatud tüübid"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-calendar.c:192
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -14931,7 +14944,7 @@ msgstr "Uus parool:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "Sinu käesolev parool on aegunud. Palun vaheta nüüd oma parool ära."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:662
+#: ../plugins/exchange-operations/exchange-config-listener.c:633
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Su parool aegub järgneva %d päeva jooksul"
@@ -15070,14 +15083,14 @@ msgstr "Exchange kirjakaustade puu"
 msgid "Unsubscribe Folder..."
 msgstr "Lõpeta kausta tellimus..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Kas tõesti loobuda kausta \"%s\" tellimusest?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" tellimusest loobumine"
@@ -15502,7 +15515,7 @@ msgstr "Sõnumikaustade tellimise lubamine kaustapuu kontekstimenüüst."
 msgid "Unsubscribe Folders"
 msgstr "Lõpeta kausta tellimus"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
@@ -15665,7 +15678,7 @@ msgstr "Proksi sisselogimine"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:503
+#: ../plugins/groupwise-features/proxy.c:502
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15675,11 +15688,11 @@ msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 msgid "_Proxy Login..."
 msgstr "_Proksi sisselogimine..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "Proksi sakk on saadaval ainult juhul, kui konto on võrku ühendatud."
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:703
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "Proksi sakk on saadaval ainult juhul, kui konto on lubatud."
 
@@ -15719,25 +15732,25 @@ msgstr "_Impordi kalendrisse"
 msgid "_Import to Tasks"
 msgstr "_Impordi ülesannetesse"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:198
+#: ../plugins/import-ics-attachments/icsimporter.c:197
 msgid "Import ICS"
 msgstr "Impordi ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:226
+#: ../plugins/import-ics-attachments/icsimporter.c:225
 msgid "Select Task List"
 msgstr "Ülesandeloendi valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:230
+#: ../plugins/import-ics-attachments/icsimporter.c:229
 msgid "Select Calendar"
 msgstr "Kalendri valimine"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Impordi"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iKalendri vorming (.ics)"
 
@@ -16312,10 +16325,10 @@ msgstr "Itip vormindaja"
 #: ../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 ""
 "&quot;{0}&quot; delegeeris koosoleku. Kas sa soovid lisada delegaati &quot;"
-"{1}&quot;?"
+"{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16697,7 +16710,7 @@ msgstr "Asukohad"
 msgid "_Publish Calendar Information"
 msgstr "_Publitseeri kalendri andmed"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "Oled sa kindel, et soovid eemaldada seda URL-i?"
 
@@ -16804,12 +16817,12 @@ msgstr "Kõikide manuste salvestamine"
 msgid "Select save base name"
 msgstr ""
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME tüüp"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Salvesta"
 
@@ -16968,18 +16981,18 @@ msgstr ""
 "Jätkamiseks klõpsa palun \"Edasi\" nuppu. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige andmed, mida soovid importida:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Andmete importimine."
 
@@ -17033,47 +17046,39 @@ msgid "Default window height"
 msgstr "Akna vaikimisi kõrgus"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-msgid "Default window state"
-msgstr "Akna vaikimisi olek"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Akna vaikimisi laius"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../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 "Käivitamisel vaikimisi näidatava komponendi ID või alias."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Viimati uuendatud seadistuste versioon"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Autonoomses režiimis kettale sünkroniseeritavate kaustade radade loend"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "Printeri sätted"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "Külgpaan on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
 msgid "Start in offline mode"
 msgstr "Alustamine autonoomses režiimis"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Olekuriba on nähtav"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17081,19 +17086,19 @@ msgstr ""
 "Evolutioni viimati uuendatud seadistuste versioon kujul major/minor/"
 "configuration (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "Peaakna vaikimisi kõrgus pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "Peaakna vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "Külgpaani vaikimisi laius pikslites."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17102,7 +17107,7 @@ msgstr ""
 "configuration, kus major on peamine versioon, minor alamversioon ja "
 "configuration seadistuste versioon (näiteks \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17112,44 +17117,36 @@ msgstr ""
 "ikoonide, \"both\" nii tekstinuppude kui ikoonide jaoks ja \"toolbar\" "
 "juhuks, kui nuppude laad tuletatakse GNOME tööriistariba sätetest."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "Tööriistariba on nähtav"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Millal Evolution alustab võrgurežiimi asemel autonoomses režiimis."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether or not the window should be maximized."
-msgstr "Millal aken peaks maksimeeritud olema ja millal mitte."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
 msgstr "Millal külgpaan peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Millal olekuriba peaks nähtav olema."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Millal tööriistariba peaks nähtav olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Millal aknanupud peaksid nähtavad olema."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Aknanupu stiil"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Aknanupud on nähtavad"
 
@@ -17172,11 +17169,11 @@ msgstr ""
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17191,11 +17188,11 @@ msgstr ""
 "Kui Sa ole veendunud, et Evolution tunneb faili\n"
 "ise ära, siis võid failitüübiks valida \"Automaatne\"."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17207,23 +17204,23 @@ msgstr ""
 "ühtegi imporditavat seadistusfaili. Kui sa soovid veel proovida,\n"
 "siis vajuta \"Tagasi\" nuppu.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "_Failinimi:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja seadistuste importimine _vanematest programmidest"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
@@ -17271,7 +17268,7 @@ msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 #. 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:561
+#: ../shell/e-shell-window-commands.c:530
 msgid "translator-credits"
 msgstr ""
 "Ilmar Kerm <ikerm@hot.ee>, 2001.\n"
@@ -17279,35 +17276,35 @@ msgstr ""
 "Kaarel Jõgi <kaarel@gg.ee>, 2002.\n"
 "Priit Laes <amd@store20.com>, 2003-2005."
 
-#: ../shell/e-shell-window-commands.c:806
+#: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: ../shell/e-shell-window-commands.c:832
+#: ../shell/e-shell-window-commands.c:801
 msgid "Work Offline"
 msgstr "Siirdumine autonoomsesse olekusse"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 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:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirdub autonoomsesse olekusse."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 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:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Ümberlülitumine vaatele \"%s\""
@@ -17392,7 +17389,7 @@ msgstr ""
 "importid aväliseid faile Evolutioni keskkonda."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:230
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17412,7 +17409,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: ../shell/main.c:257
+#: ../shell/main.c:254
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17420,7 +17417,7 @@ msgstr ""
 "Täname,\n"
 "Evolutioni meeskond\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:261
 msgid "Do not tell me again"
 msgstr "Enam uuesti mitte näidata"
 
@@ -17449,10 +17446,6 @@ msgid "Disable loading of any plugins."
 msgstr "Kõigi pluginate laadimise keelamine."
 
 #: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolutioni e-posti ja isikliku teabehalduse klient"
-
-#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18198,7 +18191,7 @@ msgid "Select All"
 msgstr "Vali kõik"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -18329,7 +18322,6 @@ msgid "Month"
 msgstr "Kuu"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Järgmine"
 
@@ -18338,7 +18330,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Prinditava kalendri eelvaatlemine"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -18426,11 +18418,11 @@ msgstr "Valitud teksti lõikamine lõikelauale"
 msgid "Paste from clipboard"
 msgstr "Lõikepuhvri sisu asetamine"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Kogu teksti valimine"
 
@@ -18465,31 +18457,30 @@ msgstr "Saadaoleva abiteabe vaatamiseks klõpsa siia"
 msgid "Close"
 msgstr "Sulge"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Lisa"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Manus..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Fail"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Abi"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Lisa"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Valikud"
@@ -18527,7 +18518,7 @@ msgstr "Laiendatud saatmisvalikute lisamine"
 
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
-msgstr "Muuda seekordne sündmus korduvaks"
+msgstr "Selle sündmuse muutmine korduvaks"
 
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
@@ -19340,6 +19331,11 @@ msgstr ""
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Lisa"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Ava fail"
@@ -19763,7 +19759,7 @@ msgstr "Ainult _ikoonid"
 
 #: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
-msgstr "_Kiirviide"
+msgstr "_Välkjuhend"
 
 #: ../ui/evolution.xml.h:48
 msgid "_Quit"
@@ -19909,7 +19905,7 @@ msgid "_Edit..."
 msgstr "_Redigeeri..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1840
+#: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -19974,19 +19970,14 @@ msgstr "Vaate liik"
 msgid "Type of view:"
 msgstr "Vaate liik:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Manuse automaatkuvamise soovitamine"
-
 #. 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "ETKNRLP"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20039,22 +20030,22 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3014
 msgid "Minimum width"
 msgstr "Vähim laius"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
 #: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3016
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum Width"
 msgstr "Vähim laius"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Jaotus"
 
@@ -20196,53 +20187,53 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laiendatud"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Kas laiendaja on laiendatud või mitte"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Laiendaja sildi tekst"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 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:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Sildividin"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Laiendaja suurus"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Laienduse noole suurus"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indikaatorivahe"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Ruum laiendaja noole ümber"
 
@@ -20304,15 +20295,15 @@ msgstr "Isiklike kirjete sünkroniseerimine"
 msgid "Sync Categories:"
 msgstr "Katekooriate sünkroniseerimine:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Empty message"
 msgstr "Tühi sõnum"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
 msgid "Reflow model"
 msgstr ""
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
 msgid "Column width"
 msgstr "Veeru laius"
 
@@ -20322,46 +20313,46 @@ msgstr "Veeru laius"
 msgid "Search"
 msgstr "Otsing"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Puhasta"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Otsingu tüüp"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Kirje ID"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "Alamkirje ID"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
-msgstr "_Otsi nüüd"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "_Otsing"
 
-#: ../widgets/misc/e-selection-model-array.c:547
+#: ../widgets/misc/e-selection-model-array.c:546
 #: ../widgets/table/e-tree-selection-model.c:811
 msgid "Cursor Row"
 msgstr "Kursori rida"
 
-#: ../widgets/misc/e-selection-model-array.c:554
+#: ../widgets/misc/e-selection-model-array.c:553
 #: ../widgets/table/e-tree-selection-model.c:818
 msgid "Cursor Column"
 msgstr "Kursori veerg"
@@ -20552,23 +20543,23 @@ msgstr "Fokusseeritud veerg"
 msgid "Unselected Column"
 msgstr "Valimata veerg"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1744
 msgid "Strikeout Column"
 msgstr "Läbikriipsutatud veerg"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1751
 msgid "Underline Column"
 msgstr "Allajoonitud veerg"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1758
 msgid "Bold Column"
 msgstr "Rasvane veerg"
 
-#: ../widgets/table/e-cell-text.c:1770
+#: ../widgets/table/e-cell-text.c:1765
 msgid "Color Column"
 msgstr "Värviline veerg"
 
-#: ../widgets/table/e-cell-text.c:1784
+#: ../widgets/table/e-cell-text.c:1779
 msgid "BG Color Column"
 msgstr "Taustavärviga veerg"
 
@@ -20616,7 +20607,6 @@ msgid "Sh_ow these fields in order:"
 msgstr "Välju _näidatakse sellest järjestuses:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Näidatavad väljad"
@@ -20690,14 +20680,14 @@ msgstr "_Näita neid välju järjestuses:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1805
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "DnD kood"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1819
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "Kogupäis"
 
@@ -20741,7 +20731,7 @@ msgstr "%s (%d kirjet)"
 #: ../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:2973 ../widgets/table/e-table-item.c:2974
+#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
 msgid "Alternating Row Colors"
 msgstr ""
 
@@ -20749,7 +20739,7 @@ msgstr ""
 #: ../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:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
 #: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr ""
@@ -20758,7 +20748,7 @@ msgstr ""
 #: ../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:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
 #: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr ""
@@ -20767,7 +20757,7 @@ msgstr ""
 #: ../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:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
 #: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr ""
@@ -20776,7 +20766,7 @@ msgstr ""
 #: ../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:3001 ../widgets/table/e-table-item.c:3002
+#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
 msgid "Cursor mode"
 msgstr "Kursorirežiim"
 
@@ -20784,7 +20774,7 @@ msgstr "Kursorirežiim"
 #: ../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:2966 ../widgets/table/e-table-item.c:2967
+#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
 msgid "Selection model"
 msgstr "Valikumudel"
 
@@ -20792,7 +20782,7 @@ msgstr "Valikumudel"
 #: ../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:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
 #: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
 #: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
@@ -20802,7 +20792,7 @@ msgstr "Pikkuse lävi"
 #: ../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:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
 #: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
 #: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
@@ -20863,31 +20853,31 @@ msgstr "Kohanda veerge..."
 msgid "Customize Current View..."
 msgstr "Kohanda käesolevat vaadet..."
 
-#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr ""
 
-#: ../widgets/table/e-table-header-item.c:1833
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sortimisandmed"
 
-#: ../widgets/table/e-table-header-item.c:1847
+#: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Puu"
 
-#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
+#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
 msgid "Table header"
 msgstr "Tabeli päis"
 
-#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
+#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
 msgid "Table model"
 msgstr "Tabeli mudel"
 
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
 msgid "Cursor row"
 msgstr "Kursori rida"
 
@@ -21051,340 +21041,3 @@ msgstr "Välksõnumikontekst"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr ""
-
-#~ msgid "(%ld seconds)"
-#~ msgstr "(%ld sekundit)"
-
-#~ msgid "(%d %s %d %s)"
-#~ msgstr "(%d %s %d %s)"
-
-#~ msgid "(%d %s)"
-#~ msgstr "(%d %s)"
-
-#~ msgid " %u second"
-#~ msgstr "%u sekund"
-
-#~ msgid " %u seconds"
-#~ msgstr "%u sekundit"
-
-#~ msgid " %u minute"
-#~ msgstr "%u minut"
-
-#~ msgid " %u minutes"
-#~ msgstr "%u minutit"
-
-#~ msgid "%u hour"
-#~ msgstr "%u tund"
-
-#~ msgid "%u hours"
-#~ msgstr "%u tundi"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Asukoht:"
-
-#~ msgid "(%d seconds)"
-#~ msgstr "(%d sekundit)"
-
-#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-#~ msgstr "Sinu sõnumit teemaga &quot;{0}&quot; ei toimetatud kohale."
-
-#~ msgid "_Insert"
-#~ msgstr "_Lisa"
-
-#~ 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."
-#~ msgstr ""
-#~ "See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
-#~ "ainult siis kui sa oled ebaturvalises keskkonnas. Näiteks kui sina ja "
-#~ "sinu LDAP server asuvad mõlemad tulemüüriga kaitstud võrgus, siis "
-#~ "Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus on juba "
-#~ "turvaline."
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "Evolution grupitarkvarakomplekt"
-
-#~ msgid "_Show animated images"
-#~ msgstr "A_nimeeritud piltide kuvamine"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Automaatsed kontaktid</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Kiirsuhtluse kontaktid</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Vastuolude otsing</span>"
-
-#~ msgid "Delete this Occurrence"
-#~ msgstr "Seekordse sündmuse kustutamine"
-
-#~ msgid "Addressbook"
-#~ msgstr "Aadressiraamat"
-
-#~ msgid "Task Table"
-#~ msgstr "Ülesannete tabel"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Eemaldamine lõpetatud"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "_Kontaktid..."
-
-#~ msgid "Memo Table"
-#~ msgstr "Märkmetabel"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Ajavööndi nupp"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Postikontode tabel"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Manuse nupp"
-
-#~ msgid "Toggle Attachment Bar"
-#~ msgstr "Manuseriba sisse- ja väljalülitamine"
-
-#~ msgid "Filters"
-#~ msgstr "Filtrid"
-
-#~ msgid "Message List"
-#~ msgstr "Sõnumiloend"
-
-#~ msgid "Alar_ms"
-#~ msgstr "Alar_mid"
-
-#~ msgid "_All day Event"
-#~ msgstr "Kestab kogu _päeva"
-
-#~ msgid "Previous Button"
-#~ msgstr "Eelmine nupp"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Tekstiline kuupäeva väli"
-
-#~ msgid "Date Button"
-#~ msgstr "Kuupäeva nupp"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "Aja valikukast"
-
-#~ msgid "Advanced..."
-#~ msgstr "Edasijõudnutele..."
-
-#~ msgid "_Advanced..."
-#~ msgstr "_Edasijõudnutele..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Vali sihtaadressiraamat."
-
-#~ msgid "(none)"
-#~ msgstr "(puudub)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Peamine e-post"
-
-#~ msgid "Select an Action"
-#~ msgstr "Vali tegevus"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Uue kontakti \"%s\" loomine"
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
-
-#~ msgid "Or_ganizer"
-#~ msgstr "Ko_rraldaja"
-
-#~ msgid "_Description:"
-#~ msgstr "_Kirjeldus:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gaadid</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Saatja:</b>"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "_Liigitamine"
-
-#~ msgid "_Group"
-#~ msgstr "_Grupp"
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "T_erminali kirjatüüp"
-
-#~ msgid "Evolution Settings"
-#~ msgstr "Evolutioni sätted"
-
-#~ msgid "_Select All"
-#~ msgstr "Vali _kõik"
-
-#~ msgid "Show Time _Zone"
-#~ msgstr "Näita _ajavööndit"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Evolutionist lähemalt..."
-
-#~ msgid "_Attachment Bar"
-#~ msgstr "_Manuseriba"
-
-#~ msgid "Server: %s, Type: %s"
-#~ msgstr "Server: %s, tüüp: %s"
-
-#~ msgid "Path: %s, Type: %s"
-#~ msgstr "Kataloog: %s, tüüp: %s"
-
-#~ msgid "Type: %s"
-#~ msgstr "Tüüp: %s  "
-
-#~ msgid "Sa junk-plugin"
-#~ msgstr "SA rämpspostiplugin"
-
-#~ msgid "Dismiss"
-#~ msgstr "Katkesta"
-
-#~ msgid "Dismiss All"
-#~ msgstr "Tühista kõik"
-
-#~ msgid "<b>Default Free/Busy Server</b>"
-#~ msgstr "<b>Vaikimisi vaba/hõivatud server</b>"
-
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>Üldine</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Ülesandeloend</b>"
-
-#~ msgid "<b>Time</b>"
-#~ msgstr "<b>Aeg</b>"
-
-#~ msgid "<b>Work Week</b>"
-#~ msgstr "<b>Töönädal</b>"
-
-#~ msgid "Calendar and Tasks Settings"
-#~ msgstr "Kalendri ja ülesannete sätted"
-
-#~ msgid "Color for overdue tasks"
-#~ msgstr "Tähtaja ületanud ülesannete värvus"
-
-#~ msgid "Color for tasks due today"
-#~ msgstr "Tänase tähtajaga ülesannete värvus"
-
-#~ msgid "_Publish Free/Busy Information"
-#~ msgstr "_Avalikusta vaba/hõivatud andmed"
-
-#~ msgid "%a %m/%d/%Y %I:%M %p"
-#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#~ msgid "%a %m/%d/%Y %H:%M"
-#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#~ msgid "%a %m/%d/%Y %I %p"
-#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#~ msgid "%a %m/%d/%Y %H"
-#~ msgstr "%a, %d.%m.%Y"
-
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H:%M:%S"
-#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#~ msgid "%m/%d/%Y %I:%M %p"
-#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H:%M"
-#~ msgstr "%a, %d.%m.%Y %H:%M:%S"
-
-#~ msgid "%m/%d/%Y %I %p"
-#~ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-
-#~ msgid "%m/%d/%Y %H"
-#~ msgstr "%d.%m.%Y"
-
-#~ msgid "%I:%M:%S %p"
-#~ msgstr "%I:%M:%S %p"
-
-#~ msgid "%H:%M:%S"
-#~ msgstr "%H:%M:%S"
-
-#~ msgid "%I %p"
-#~ msgstr "%I %p"
-
-#~ msgid "_Rule name:"
-#~ msgstr "_Reegli nimi:"
-
-#~ msgid "Execute actions"
-#~ msgstr "Tegevused täidetakse juhul, kui"
-
-#~ msgid "Execute Command..."
-#~ msgstr "Käsu käivitamine..."
-
-#~ msgid "Publish Free/Busy information for this calendar"
-#~ msgstr "Selle kalendri vaba/hõivatud teabe avalikustamine"
-
-#~ msgid "Customize My Evolution"
-#~ msgstr "Minu Evolutioni kohandamine"
-
-#~ msgid "Move"
-#~ msgstr "Tõsta"
-
-#~ msgid "_Send / Receive"
-#~ msgstr "_Saada / võta vastu"
-
-#~ msgid "Search Editor"
-#~ msgstr "Otsinguredaktor"
-
-#~ msgid "description of appointment"
-#~ msgstr "sündmuse kirjeldus"
-
-#~ msgid "Schedulin_g"
-#~ msgstr "_Plaanimine"
-
-#~ msgid "In_vitations"
-#~ msgstr "_Kutsed"
-
-#~ msgid "<b>Date and Time</b>"
-#~ msgstr "<b>Kuupäev ja kellaaeg</b>"
-
-#~ msgid "<b>Send Options</b>"
-#~ msgstr "<b>Saatmise valikud</b>"
-
-#~ msgid "This appointment has customized alarms"
-#~ msgstr "Sellel sündmusel on kohandatud alarmid"
-
-#~ msgid "Meetings and Tasks"
-#~ msgstr "Koosolekud ja ülesanded"
-
-#~ msgid ""
-#~ "The suggested filename extension of this filetype (%s) is unused in the "
-#~ "chosen filename. Do you want to continue?"
-#~ msgstr ""
-#~ "Selle failitüübi (%s) jaoks soovitatud failinime laiendit pole kasutatud. "
-#~ "Kas sa soovid jätkata?"
-
-#~ msgid "_Attachment Bar (drop attachments here)"
-#~ msgstr "_Manuseriba (tõsta manused siia)"
-
-#~ msgid "_Delegate To..."
-#~ msgstr "_Delegeerida..."
-
-#~ msgid "_Preview Pane"
-#~ msgstr "_Eelvaatepaan"
diff --git a/po/eu.po b/po/eu.po
index b5f433ea85..6324caa936 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-27 09:53+0100\n"
-"PO-Revision-Date: 2006-02-27 09:51+0100\n"
-"Last-Translator: Iñaki Larrañaga <dooteo@euskalgnu.org>\n"
+"POT-Creation-Date: 2006-05-10 18:41+0000\n"
+"PO-Revision-Date: 2006-05-10 18:43+0000\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
@@ -57,32 +57,32 @@ msgstr "Kontaktua: "
 msgid "evolution minicard"
 msgstr "evolution-en txarteltxoa"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Alarmak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Errepikapenak ditu."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Bilera bat da."
 
-#: ../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 "Egutegi-gertaera: laburpena %s da."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Egutegi-gertaera: ez du laburpenik."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "Egutegi-gertaeren ikuspegia"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Hartu fokua"
 
@@ -111,32 +111,32 @@ msgstr "Joan data jakin batera"
 msgid "a table to view and select the current time range"
 msgstr "taula uneko orduaren barrutia ikusteko eta hautatzeko"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Gertaera %d du."
 msgstr[1] "%d gertaera ditu."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ez du gertaerarik."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Lan-asteko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Eguneko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "Lan-asteko egutegi-ikuspegia "
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "Egun baten edo gehiagoren egutegi-ikuspegia"
 
@@ -212,21 +212,21 @@ msgstr "Joan botoia"
 msgid "Click here, you can find more events."
 msgstr "Egin klik gertaera gehiago bilatzeko."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Hileko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Asteko ikuspegia: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "Hileko egutegi-ikuspegia"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "Aste baten edo gehiagoren egutegi-ikuspegia"
 
@@ -403,10 +403,8 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution-en helbide-liburua ustekabean itxi da."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid ""
@@ -486,10 +484,8 @@ msgid ""
 msgstr "Kontaktuan aldaketak egin dituzu. Aldaketa hauek gordetzea nahi duzu?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
-"{0}(r)en kontaktuak ez dira eskuragarri egongo Evolution berriro abiatu arte."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgstr "{0}(r)en kontaktuak ez dira eskuragarri egongo Evolution berriro abiatu arte."
 
 #: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -543,9 +539,9 @@ msgstr "Konfiguratu osatze automatikoa hemen"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -647,8 +643,7 @@ msgstr "Sortu helbide-liburu berria"
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
-msgstr ""
-"Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
+msgstr "Huts egin du Helbide-liburuaren ezarpenak edo karpetak bertsio-berritzean."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
@@ -817,7 +812,7 @@ msgstr "Gorde VCard gisa..."
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktu-iturburuaren hautatzailea"
 
@@ -826,12 +821,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
@@ -870,13 +865,11 @@ msgstr ""
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
-"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa"
+msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 msgid "URI for the folder last used in the select names dialog."
-msgstr ""
-"Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
+msgstr "Izenak hautatzeko elkarrizketa-koadroan azkena erabilitako karpetaren URIa."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
@@ -958,8 +951,7 @@ msgid "Email address"
 msgstr "Helbide elektronikoa"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+msgid "Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
@@ -1197,12 +1189,9 @@ msgstr "txartel"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1461,7 +1450,7 @@ msgstr "Helbidea"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2470,7 +2459,7 @@ msgstr "Zerbitzua"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Kokalekua"
@@ -2534,15 +2523,15 @@ msgstr "Aldatuta"
 msgid "Contact Editor - %s"
 msgstr "Kontaktu-editorea - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2759
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Hautatu irudi bat kontaktu honentzat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2760
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Irudirik ez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3044
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2550,7 +2539,7 @@ msgstr ""
 "Kontaktu-data ez da baliozkoa:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "kontaktua ez da balizkoa."
 
@@ -2707,8 +2696,8 @@ msgstr "_Berehalako mezularitzako zerbitzua:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:224
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Kokalekua:"
 
@@ -2751,8 +2740,7 @@ msgstr "_Hautatu"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
+msgstr "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2879,7 +2867,7 @@ msgstr "Iturburua"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2892,7 +2880,7 @@ msgid "Save as VCard..."
 msgstr "Gorde VCard gisa..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3112,7 +3100,7 @@ msgstr "Irrati-telefonoa"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../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"
@@ -3151,7 +3139,7 @@ msgstr "Web gunea"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../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:656
@@ -3159,7 +3147,7 @@ msgstr "Web gunea"
 #: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Zabalera"
@@ -3167,14 +3155,14 @@ msgstr "Zabalera"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../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:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altuera"
@@ -3691,19 +3679,19 @@ msgstr "Evolution-eko CSV edo Tab inportatzailea"
 msgid "Importing ..."
 msgstr "Inportatzen..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP datuak trukatzeko formatua (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution-en LDIF inportatzailea"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Evolution-en Vcard inportatzailea"
 
@@ -3766,7 +3754,7 @@ msgstr "Formatua"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Goiburua"
@@ -3870,9 +3858,9 @@ msgstr "Itzaldura"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:226
-#: ../plugins/exchange-operations/exchange-contacts.c:207
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Tamaina:"
 
@@ -3912,8 +3900,7 @@ msgstr "Copyright (C) 2000, Ximian, Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr ""
-"Kontaktuak inprimatzeko estilo-editorearen trepeta probatu beharko luke honek"
+msgstr "Kontaktuak inprimatzeko estilo-editorearen trepeta probatu beharko luke honek"
 
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -3962,18 +3949,15 @@ msgid "Export in asynchronous mode"
 msgstr "Esportatu modu asinkronoan"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
-msgstr ""
-"Irteera-fitxategiko txartel-kopurua modu asinkronoan; tamaina lehenetsia: 100"
+msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgstr "Irteera-fitxategiko txartel-kopurua modu asinkronoan; tamaina lehenetsia: 100"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
 msgstr "KOPURUA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Komando-lerroko argumentuen errorea, idatzi --help erabilera ikusteko."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4029,8 +4013,7 @@ msgstr ""
 "berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Egunkariaren informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
@@ -4050,8 +4033,7 @@ msgstr ""
 "berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Hitzorduaren informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
@@ -4065,8 +4047,7 @@ msgstr ""
 "berreskuratu."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Bilera honen informazio guztia ezabatu egingo da eta ezin izango da "
 "berreskuratu."
@@ -4166,8 +4147,7 @@ msgstr ""
 "onartzeko aukera eskainiz."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Gonbiteak posta elektronikoz bidaliko zaie parte-hartzeile guztiei eta "
 "erantzutea baimenduko die."
@@ -4302,8 +4282,7 @@ msgstr ""
 
 #: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr ""
-"Partaide guztiei bertan behera uztearen jakinarazpena bidaltzea nahi duzu?"
+msgstr "Partaide guztiei bertan behera uztearen jakinarazpena bidaltzea nahi duzu?"
 
 #: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
@@ -4366,7 +4345,7 @@ msgid "_Save Changes"
 msgstr "_Gorde aldaketak"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Bidali"
 
@@ -4479,14 +4458,14 @@ msgid "Memos"
 msgstr "Zirkularrak"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Zereginak"
@@ -4505,9 +4484,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutu"
@@ -4640,67 +4616,34 @@ msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 msgid "invalid time"
 msgstr "baliogabeko ordua"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld segundo)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "bigarren"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "segundo igarotakoan"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr "segundo %u "
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr "minutu %u"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u minutu"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "ordu %d"
+msgstr[1] "%d ordu"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "ordu %u"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "minutu %d"
+msgstr[1] "%d minutu"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u ordu"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "segundo %d"
+msgstr[1] "%d segundo"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4723,10 +4666,8 @@ msgid "Calendars to run alarms for"
 msgstr "Alarmak exekutatzeko egutegiak - "
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Kolorea Marcus Bains-en linea ordu-barran marrazteko (hutsik lehenespenez)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4979,8 +4920,7 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Oroigarri lehenetsiaren unitateak (\"minutu\", \"ordu\" edo \"egun\")."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unitateak zereginak noiz ezkutatu zehazteko (\"minutu\", \"ordu\" edo \"egun"
 "\")."
@@ -5003,8 +4943,7 @@ msgstr "Hitzordua edo zeregina ezabatzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr ""
-"Hitzorduak eta zereginak betiko borratzean berrespena eskatuko den edo ez."
+msgstr "Hitzorduak eta zereginak betiko borratzean berrespena eskatuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
@@ -5021,8 +4960,7 @@ msgstr ""
 "ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Marcus Bains-en linea (uneko orduan) egutegian marraztuko den edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
@@ -5035,8 +4973,7 @@ msgstr "Hitzorduen oroigarri lehenetsi bat ezarriko den edo ez"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "RSPV eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5044,19 +4981,15 @@ msgstr "Kategoriak eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Araua eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Egoera eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Am/pm erabili beharrean orduak 24 orduko formatuan bistaratuko diren edo ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
@@ -5064,8 +4997,7 @@ msgstr "Ordu-zona eremua gertaeren/bileren editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
+msgstr "Mota eremua gertaeren/bileren/zereginen editorean erakutsiko den ala ez."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
@@ -5122,10 +5054,10 @@ msgstr "Inprimatu"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5387,7 +5319,7 @@ msgstr "minutu"
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Ekintza/Abiarazlea"
 
@@ -5463,8 +5395,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u eta %d aldagaiak helbide elektronikoko erabiltzaileagatik eta "
 "domeinugatik ordeztuko dira.</i>"
@@ -5505,7 +5436,7 @@ msgid "Display"
 msgstr "Bistaratu"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "'Libre/okupatuta"
@@ -5863,30 +5794,30 @@ msgstr "_Lekuz aldatu"
 msgid "Cancel _Drag"
 msgstr "Bertan behera _utzi arrastatzea"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "Eranskin <b>%d</b>"
 msgstr[1] "<b>%d</b> eranskin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Ezkutatu eranskin-_barra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Erakutsi eranskin-_barra"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5895,82 +5826,81 @@ msgstr "Erakutsi eranskin-_barra"
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propietateak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Gehitu eranskina..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Erakutsi eranskinak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Sakatu Zuriunea tekla eranskin-barra txandakatzeko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bilera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Esleitutako zeregina - %s "
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "eranskina"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
+msgstr "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa erabili!"
 
@@ -5996,8 +5926,7 @@ msgstr "Zeregina ezin izan da ezabatu, corba errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr ""
-"Egunkariko sarrera ezin izan da ezabatu, corba errore bat gertatu delako"
+msgstr "Egunkariko sarrera ezin izan da ezabatu, corba errore bat gertatu delako"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -6058,106 +5987,106 @@ msgid "Recurrence"
 msgstr "Errepikapena"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Gertaerak alarmak ditu."
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "_Egutegia:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegatuak"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "_Partaideak"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Hasiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Amaiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Gehitu "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ezin da '%s' egutegia ireki."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Hitzordua baino egun %d lehenago"
 msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Hitzordua baino ordu %d lehenago"
 msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Hitzordua baino minutu %d lehenago"
 msgstr[1] "Hitzordua baino %d minutu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Pertsonalizatu"
 
@@ -6166,7 +6095,7 @@ msgstr "Pertsonalizatu"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6295,14 +6224,14 @@ msgstr "Kidea"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6339,7 +6268,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Ezin dira zirkularrak ireki: '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Taldea:"
@@ -6397,10 +6326,8 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Zeregin errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
-"Egunkariko sarrera errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Egunkariko sarrera errepikatu bat aldatzen ari zara. Zer aldatu nahi duzu?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6440,6 +6367,15 @@ msgstr "-"
 msgid "first"
 msgstr "lehen"
 
+#. 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:998
+msgid "second"
+msgstr "bigarren"
+
 #. 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.
@@ -6584,7 +6520,7 @@ msgstr "<span weight=\"bold\">Egoera</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Eginda"
@@ -6660,11 +6596,11 @@ msgstr "_Zeregina"
 msgid "Task Details"
 msgstr "Zereginaren xehetasunak"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin dira hemengo zereginak ireki: '%s'."
@@ -6748,30 +6684,6 @@ msgid_plural "%d weeks"
 msgstr[0] "aste %d"
 msgstr[1] "%d aste"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "ordu %d"
-msgstr[1] "%d ordu"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "minutu %d"
-msgstr[1] "%d minutu"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "segundo %d"
-msgstr[1] "%d segundo"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
@@ -6833,7 +6745,7 @@ msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Egin klik %s irekitzeko"
@@ -6932,27 +6844,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Bai"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ez"
 
 #. 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:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6969,35 +6881,35 @@ msgstr "Errepikatua"
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Hautatu karpeta hautatutako eranskina gordetzeko..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "irudi_izengabea.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Ezarri _atzeko plano gisa"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Gorde hautatutakoa"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
@@ -7405,12 +7317,11 @@ msgstr "Pertsona ezezaguna"
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
-"<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
+msgstr "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7423,7 +7334,7 @@ msgstr "Oraingoz onartua"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7433,12 +7344,10 @@ msgstr "Ukatua"
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
-"Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
+msgstr "Bilera bertan behera utzi da, hala ere ezin izan da zure egutegietan aurkitu"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "Zeregina bertan behera utzi da, hala ere ezin izan da zure zereginen "
 "zerrendetan aurkitu"
@@ -7752,81 +7661,81 @@ msgid "Resources"
 msgstr "Baliabideak"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Indibiduala"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Taldea"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Baliabidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Gela"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Mahaiburua"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegatua"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Partaidea                         "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Egiten ari da"
 
 #. 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y.eko %Bren %da"
 
@@ -7835,7 +7744,7 @@ msgstr "%A, %Y.eko %Bren %da"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
 
@@ -7921,7 +7830,7 @@ msgstr "Egin klik zirkularra gehitzeko"
 msgid "Memo sort"
 msgstr "Zirkularren ordena"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7940,7 +7849,7 @@ msgstr "Zirkularrak kargatzen"
 msgid "Opening memos at %s"
 msgstr "%s - zirkularrak irekitzen"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
@@ -7949,20 +7858,20 @@ msgstr "Hautatutako objektuak ezabatzen..."
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Zereginak kargatzen"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
@@ -8161,8 +8070,7 @@ msgstr "Huts egin du zirkularrak bertsio-berritzean."
 #: ../calendar/gui/memos-component.c:871
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr ""
-"Ezin izan da '%s' zirkularren zerrenda ireki gertaerak eta bilerak sortzeko"
+msgstr "Ezin izan da '%s' zirkularren zerrenda ireki gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/memos-component.c:884
 msgid "There is no calendar available for creating memos"
@@ -8239,12 +8147,6 @@ msgstr "Ezin da `%s' egutegia migratu"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ezin dira `%s' zereginak migratu"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d segundo)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1."
@@ -8500,8 +8402,7 @@ msgstr "Huts egin du zereginak bertsio-berritzean."
 #: ../calendar/gui/tasks-component.c:877
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr ""
-"Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
+msgstr "Ezin izan da '%s' zereginen zerrenda ireki gertaerak eta bilerak sortzeko"
 
 #: ../calendar/gui/tasks-component.c:890
 msgid "There is no calendar available for creating tasks"
@@ -10154,7 +10055,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Eranskin-barra"
 
@@ -10264,8 +10165,7 @@ msgid "Insert Attachment"
 msgstr "Txertatu eranskina"
 
 #: ../composer/e-msg-composer.c:828
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
 "honentzat"
@@ -10351,11 +10251,10 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
+msgstr "&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
 
 #: ../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 "Arrazoia: &quot;{1}&quot;."
 
@@ -10415,8 +10314,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"'{0}' fitxategia ez da fitxategi arrunta eta ezin da mezu batean bidali."
+msgstr "'{0}' fitxategia ez da fitxategi arrunta eta ezin da mezu batean bidali."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
@@ -10472,11 +10370,11 @@ msgstr "_Gorde mezua"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Talde-lanerako suitea"
 
@@ -10646,7 +10544,7 @@ msgstr "Gainidatzi nahi duzu?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "&quot;{0}&quot; fitxategia badago lehendik."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Gainidatzi"
 
@@ -10814,7 +10712,7 @@ msgstr "Data falta da."
 msgid "Missing file name."
 msgstr "Fitxategi-izena falta da."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Izena falta da."
 
@@ -10886,6 +10784,10 @@ msgstr "lehenago"
 msgid "months"
 msgstr "hilabete"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "segundo igarotakoan"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "uneko ordua"
@@ -10915,16 +10817,14 @@ msgid "Composer Preferences"
 msgstr "Mezuak prestatzeko hobespenak"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
 "besteak beste."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
+msgstr "Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
@@ -11065,7 +10965,7 @@ msgstr "[lehenetsia]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Gaituta"
 
@@ -11094,7 +10994,7 @@ msgstr "Gehitu sinaduraren script-a"
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Birbidalitako mezua --------"
 
@@ -11429,7 +11329,7 @@ msgstr "Zirriborroa"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
@@ -11515,7 +11415,7 @@ msgstr "Kar_peta berria..."
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
@@ -11658,37 +11558,37 @@ msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Ezin da mezua eskuratu"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Kopiatu estekaren helbidea"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Helbidetik"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Helbidera"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik %s bidaltzeko"
@@ -11803,64 +11703,64 @@ msgstr "_Ikusi ziurtagiria"
 msgid "This certificate is not viewable"
 msgstr "Ziurtagiri hau ez da ikusteko modukoa"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Osatua: %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atzeratua:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ikusi barnean"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Doitu zabalera"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Erakutsi jatorrizko ta_maina"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Hautatu karpeta eranskin guztiak gordetzeko..."
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Gorde hautatutakoa..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "_Eranskin %d"
 msgstr[1] "%d _eranskin"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Gorde"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Gorde _denak"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Eranskinik ez"
 
@@ -11971,7 +11871,7 @@ msgstr "Berri-taldeak"
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 "Ezin izan da S/MIME mezua analizatu: errore ezezaguna"
 
@@ -11987,11 +11887,11 @@ msgstr "Enkriptatze-mota ez onartua multipart/enkriptatuarentzat"
 msgid "Unsupported signature format"
 msgstr "Sinadura-formatu ez onartua"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Errorea sinadura egiaztatzean"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Errore ezezaguna sinadura egiaztatzean"
 
@@ -12094,8 +11994,7 @@ msgstr "_Gehitu helbide-liburuan"
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr ""
-"Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
+msgstr "Biltegi honek ez du onartzen harpidetzarik, edo, bestela, desgaituta daude."
 
 #: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
@@ -12122,20 +12021,20 @@ msgstr "Ez erakutsi mezu hau berriro."
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mezua"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Gorde mezua..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Gehitu helbidea"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
@@ -12309,8 +12208,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
-msgstr ""
-"Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
+msgstr "Bonobo osagaien ikustaileentzat egiaztatu beharreko mime-moten zerrenda"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
@@ -12372,8 +12270,7 @@ msgstr "Mezuen leihoaren zabalera lehenetsia"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr ""
-"Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
+msgstr "Mezuak bistaratzeko estiloa (\"normala\", \"goiburu osoak\", \"iturburua\")"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -12400,10 +12297,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Abisatu erabiltzaileari, karpeta bat betiko borratu aurretik."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
-"Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgstr "Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
@@ -12415,8 +12310,7 @@ msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
-"Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
+msgstr "Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
@@ -12496,8 +12390,7 @@ msgstr "Terminaleko letra-tipoa"
 
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"Zakarrontzia hustu zen azken aldia, Garaiaren hasieratik iragandako egunetan."
+msgstr "Zakarrontzia hustu zen azken aldia, Garaiaren hasieratik iragandako egunetan."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
@@ -13393,8 +13286,7 @@ msgstr "_Mota:"
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
+msgstr "Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
 
 #: ../mail/mail-config.glade.h:143
 msgid ""
@@ -13895,8 +13787,7 @@ msgid "New Search Folder"
 msgstr "Bilaketa berrien karpeta"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "&quot;{1}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
 
 #: ../mail/mail.error.xml.h:2
@@ -13904,14 +13795,14 @@ 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 ""
 "Hutsik ez dagoen &quot;{1}&quot; karpeta badago lehendik.\n"
 "\n"
 "Karpeta honi ez ikusi egitea aukera dezakezu, gainidaztea, bere edukia "
-"eranstea edo irtetzea aukera dezakezu.\n"
+"eranstea edo irtetzea aukera dezakezu."
 
-#: ../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}?"
@@ -13919,13 +13810,13 @@ msgstr ""
 "&quot;{1}&quot;(e)k irakurragiria eskatu duen jakinarazpena. Bidali  "
 "irakurragiriaren jakinarazpena {0}(r)i?"
 
-#: ../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 "&quot;{0}&quot; izeneko karpeta bat badago. Erabili beste izen bat."
 
-#: ../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."
@@ -13933,24 +13824,23 @@ msgstr ""
 "Mezuaren Gaian lerro esanguratsu bat idaztean jasotzaileei zure mezuaren "
 "edukiari buruz argibideak ematen diezu."
 
-#: ../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 "Ziur zaude kontu hau eta dagokion proxy guztiak ezabatu nahi duzula?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
 
-#: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+#: ../mail/mail.error.xml.h:10
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ziur zaude kontu hau eta dagokion proxy guztiak ezabatu nahi duzula?"
 
-#: ../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 "Ziur zaude {0} mezuak aldi berean irekitzea nahi dituzula?"
 
-#: ../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?"
@@ -13958,7 +13848,7 @@ msgstr ""
 "Ziur zaude karpeta guztietako ezabatutako mezu guztiak betiko kendu nahi "
 "dituzula?"
 
-#: ../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;?"
@@ -13966,80 +13856,79 @@ msgstr ""
 "Ziur zaude &quot;{0}&quot; karpetan dauden ezabatutako mezuak betiko kendu "
 "nahi dituzula?"
 
-#: ../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 "Ziur zaude mezua HTML formatuan bidali nahi duzula?"
 
-#: ../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 "Ziur zaude mezua BCC hartzaileekin bakarrik bidali nahi duzula?"
 
-#: ../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 "Ziur zaude mezua gairik gabe bidali nahi duzula?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Arrazoia: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Arrazoia: &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Sinadura hutsa"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta birtuala gehitu"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)n kopiatu."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta sortu."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Ezin da sortu aldi baterako gordetzeko direktorioa."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Ezin izan da direktorioan gorde. Arrazoia: &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta ezabatu."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta ezabatu."
 
-#: ../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 ""
-"Ezin da &quot;{0}&quot; karpeta birtuala editatu, karpeta hori ez dagoelako."
+msgstr "Ezin da &quot;{0}&quot; karpeta birtuala editatu, karpeta hori ez dagoelako."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ezin da &quot;{0}&quot; karpeta &quot;{1}&quot;(e)ra eraman."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Ezin da ireki &quot;{1}&quot; iturburua."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Ezin da ireki &quot;{2}&quot; iturburua."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Ezin da ireki &quot;{2}&quot; helburua."
 
-#: ../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 "
@@ -14048,31 +13937,31 @@ msgstr ""
 "Ezin da &quot;{0}&quot; lizentzia-fitxategia irakurri instalazioko arazoa "
 "dela medio. Ezingo duzu hornitzaile hau erabili bere lizentzia onartu arte."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Ezin da izena aldatu: &quot;{0}&quot; --> &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 "Ezin da sistemako &quot;{0}&quot; karpeta izenez edo lekuz aldatu."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Ezin dira gorde kontuko aldaketak."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Ezin izan da &quot;{0}&quot; direktorioan gorde."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Ezin izan da &quot;{0}&quot; fitxategian gorde."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Ezin da sinaduraren &quot;{0}&quot; script-a ezarri."
 
-#: ../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."
@@ -14081,71 +13970,71 @@ msgstr ""
 "maiuskulaz eta minuskulaz ezberdinak izaten direla. Agian maiuskulak "
 "aktibatuta dituzu."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Ezin izan da sinadura-fitxategia gorde."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Ezabatu &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Kontua ezabatu nahi duzu?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Desegin aldaketak?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Ez ezabatu"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Ez desgaitu"
 
-#: ../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 "Eragiketa hau azpidirektorioetan egitea nahi duzu?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Mezu guztiak irakurritako gisa markatzea nahi dituzu?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Idatzi pasahitza."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Errorea iragazki-definizioak kargatzean."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Errorea eragiketa egitean."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Errorea: {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Fitxategia badago, baina ezin da gainidatzi."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Fitxategia badago, baina ez da fitxategi erregularra."
 
-#: ../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 "Jarraitzen baduzu, ezingo dituzu mezu hauek berreskuratu."
 
-#: ../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."
@@ -14153,11 +14042,11 @@ msgstr ""
 "Karpeta ezabatzen baduzu bere edukin eta azpikarpeta guztiak betiko ezabatu "
 "egingo dira."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Aurrera jarraituz gero, proxy-kontu guztiak betiko ezabatuko da."
 
-#: ../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."
@@ -14165,11 +14054,11 @@ msgstr ""
 "Aurrera jarraituz gero, kontuaren informazioa \n"
 "eta dagokion proxy-en informazio guztia betiko ezabatuko da."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Aurrera jarraituz gero, kontuaren informazioa betiko ezabatuko da."
 
-#: ../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."
@@ -14177,19 +14066,19 @@ msgstr ""
 "Irteten bazara, mezu hauek ez dira bidaliko harik eta Evolution berriro "
 "abiarazi arte."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ez ikusi egin"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Autentifikazio baliogabea"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Posta-iragazkiak automatikoki eguneratu dira."
 
-#: ../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 "
@@ -14201,35 +14090,35 @@ msgstr ""
 "zerrendatuko dira mezuan. Hori gerta ez dadin, gutxienez hartzaile bat "
 "zehaztu behar da Nori: edo Cc: hartzailean."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Markatu mezu guztiak irakurritako gisa"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Markatu mezuak irakurritako gisa hautatutako karpetan"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Karpeta falta da."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Ez da iturbururik hautatu"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Mezu gehiegi batera irekitzeak denbora nahikoa denbora hartuko du."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Egiaztatu kontuaren ezarpenak eta saiatu berriro."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Gaitu kontua edo bidali beste kontu bat erabiliz."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14237,7 +14126,7 @@ msgstr ""
 "Idatzi baliozko helbide elektroniko bat Nori: eremuan. Helbide elektronikoak "
 "bilatzeko, sarrera-koadroaren ondoko Nori: botoian klik egin dezakezu."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14249,51 +14138,51 @@ msgstr ""
 "{0}\n"
 "Bidali dena den?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Eman izen bakarra sinadura hau identifikatzeko."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Itxaron."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Arazoak &quot;{0}&quot; postontzi zaharretik migratzean."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Zerbitzaria kontsultatzen"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Zerbitzaria kontsultatzen onartutako autentifikazio-mekanismoak zerrenda "
 "eskuratzeko."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Erantzutea eskatu da."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Ziur zaude &quot;{0}&quot; karpeta (eta bere azpikarpeta guztiak) ezabatu "
 "nahi duzula?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Bilaketa-karpeta automatikoki eguneratu dira."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Bidali irakurragiria"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Ziurtagiria badago lehendik ere"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14301,7 +14190,7 @@ msgstr ""
 "Ximian Evolution-ek sistemako karpetak behar ditu ongi funtzionatzeko eta "
 "ezin ditu izenez aldatu, lekuz aldatu edo ezabatu."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14317,7 +14206,7 @@ msgstr ""
 "zerrendatuko dira mezuan. Hori gerta ez dadin, gutxienez hartzaile bat "
 "zehaztu behar da Nori: edo Cc: hartzailean. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14331,7 +14220,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "eta eguneratu egin dira."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14345,23 +14234,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "eta eguneratu egin dira."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Mezua kanpoko &quot;sendmail&quot; aplikazioaren bidez bidali da. Sendmail-"
-"ek honako errorearekin erantzun du: 67 egoera: mezua ez da bidali.\n"
-"Mezua Irteerako karpetan gorde da. Begiratu mezua erroreak aurkitzeko eta "
-"bidali berriro."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Script fitxategia existitzeaz gain exekutagarria izan behar du."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14370,7 +14247,7 @@ msgstr ""
 "joan Bilaketa-karpetaren editorera esplizitoki gehitzeko, beharrezkoa izanez "
 "gero."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14378,12 +14255,11 @@ msgstr ""
 "Mezu hau ezin da bidali, bidaltzeko hautatu duzun kontua ez dagoelako "
 "gaituta."
 
-#: ../mail/mail.error.xml.h:110
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:107
+msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Mezu hau ezin da bidali, ez diozulako hartzailerik zehaztu"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14391,21 +14267,21 @@ msgstr ""
 "Zerbitzari honek ez du onartzen mota honetako autentifikaziorik, eta "
 "beharbada ez du onartuko inolako autentifikaziorik."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Sinadura hau aldatu egin duzu, baina ez duzu gorde."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "Honek mezuak irakurritako gisa hautatutako karpetan"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Huts egin du GroupWise zerbitzariarekin konektatzean"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14413,39 +14289,39 @@ msgstr ""
 "Ezin da ireki kontu honen zirriborroen karpeta. Horren ordez sistemaren "
 "zirriborro-karpeta erabili nahi duzu?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Ezin da lizetzia-fitxategia irakurri."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Erabili _lehenetsia"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Bidali gabeko mezuak dituzu. Hala ere irten nahi duzu?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Bilaketa-karpetari izena eman behar diozu."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Karpeta bat zehaztu behar duzu."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14455,28 +14331,23 @@ msgstr ""
 "Karpetak banaka hauta ditzakezu, eta/edo karpeta lokal guztiak\n"
 "hautatu, edo urruneko karpeta guztiak, edo biak."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Huts egin du &quot;{0}&quot;zerbitzarian &quot;{0}&quot; gisa saioa hastean."
+msgstr "Huts egin du &quot;{0}&quot;zerbitzarian &quot;{0}&quot; gisa saioa hastean."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "&quot;{0}&quot; gaia duen mezua ezin izan da bidali."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "Era_ntsi"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Ez gorde"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Borratu betiko"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Ireki mezuak"
 
@@ -14547,7 +14418,7 @@ msgstr "%Y %b %d"
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -14722,8 +14593,7 @@ msgstr "Kontaktu automatikoak"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
 msgstr "_Automatikoki sortutako sarrerak helbide-liburuan mezuei erantzutean"
 
 #: ../plugins/bbdb/bbdb.c:475
@@ -14732,8 +14602,7 @@ msgstr "Berehalako mezularitzako kontaktuak"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Sinkronizatu aldizka kontaktuen datuak eta irudiak Gaim-eko lagunen "
 "zerrendatik"
@@ -14842,8 +14711,7 @@ msgstr "Eguraldi-egutegiak"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"Probako plugin-a menu-leihoa agertarazten duena gauzak arbelean kopiatzeko."
+msgstr "Probako plugin-a menu-leihoa agertarazten duena gauzak arbelean kopiatzeko."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
@@ -14858,8 +14726,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Begiratu Evolution posta-bezero lehenetsia den"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Evolution abiatzen den bakoitzean begiratu lehenespeneko posta-bezeroa den "
 "edo ez."
@@ -14995,24 +14862,24 @@ msgstr "Karpeten tamaina"
 msgid "Exchange Settings"
 msgstr "Exchange-ren ezarpenak"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URLa:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "A_utentifikatu"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Autentifikazio-mota: "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr " _Begiratu zein mota onartzen diren "
 
-#: ../plugins/exchange-operations/exchange-calendar.c:194
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15192,14 +15059,14 @@ msgstr "Exchange-ren karpeta-zuhaitza"
 msgid "Unsubscribe Folder..."
 msgstr "Kendu karpetaren harpidetza..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "\"%s\" karpetaren harpidetza kentzea nahi duzu?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" karpetaren harpidetza kentzen"
@@ -15468,8 +15335,7 @@ msgstr "Ziurtatu zerbitzari-izena ongi idatzita dagoela eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
-"Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
+msgstr "Ziurtatu erabiltzaile-izena eta pasahitza zuzenak direla eta saiatu berriro."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
 msgid "No Global Catalog server configured for this account."
@@ -15636,7 +15502,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Kendu karpeten harpidetza"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Egiaztapen-zerrenda"
 
@@ -15877,8 +15743,7 @@ msgstr "iCalendar formatua (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
-"Sinkronizatu hautatutako zeregina/egutegia/helbide-liburua Apple iPod-arekin"
+msgstr "Sinkronizatu hautatutako zeregina/egutegia/helbide-liburua Apple iPod-arekin"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16251,8 +16116,7 @@ msgstr "<b>%s</b>(e)k dagoen bilera batean sartu nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b>(e)k honako bileraren informazio berria jaso nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -16325,8 +16189,7 @@ msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du:"
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
-"<b>%s</b>(e)k honako zeregin-esleipenaren informazio berria jaso nahi du:"
+msgstr "<b>%s</b>(e)k honako zeregin-esleipenaren informazio berria jaso nahi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
@@ -16336,8 +16199,7 @@ msgstr "<b>%s</b>(e)k zeregin-esleipenari buruz honakoa erantzun du:"
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr ""
-"<b>%s</b>(e)k %s(e)n bidez honako zeregin-esleipena bertan behera utzi du:"
+msgstr "<b>%s</b>(e)k %s(e)n bidez honako zeregin-esleipena bertan behera utzi du:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
@@ -16458,10 +16320,8 @@ msgid "This meeting has been delegated"
 msgstr "Bilera hau delegatu egin da"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
-"Erantzun hau ez da uneko partaide batena.  Bidaltzailea partaide gisa gehitu?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgstr "Erantzun hau ez da uneko partaide batena.  Bidaltzailea partaide gisa gehitu?"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
 msgid "Proxy _Logout"
@@ -16494,8 +16354,7 @@ msgid "No store available"
 msgstr "Ez dago biltegi erabilgarririk."
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Urrunetik posta-datuak eskuratzeko CORBA interfazea inplementatzen duen "
 "plugin-a"
@@ -16847,7 +16706,7 @@ msgstr "Helbideak"
 msgid "_Publish Calendar Information"
 msgstr "_Argitaratu egutegiaren informazioa"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Ziur zaude URL hau kendu nahi duzula?"
 
@@ -17186,40 +17045,42 @@ msgid "Default window height"
 msgstr "Albo-panelaren altuera lehenetsia"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Leihoaren egoera lehenetsia"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Leihoaren zabalera lehenetsia"
 
-#: ../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 "Lehenespenez abioan erakutsi beharreko IDa edo aliasa."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Azken bertsio-berritutako konfigurazio-bertsioa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
-"Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
-
 #: ../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 "Lineaz kanpo erabiltzeko, diskora sinkronizatzeko karpeten bideen zerrenda"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Inprimagailuaren ezarpenak"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Albo-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Saltatu garapen-abisuaren elkarrizketa-koadroa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17227,19 +17088,19 @@ msgstr ""
 "Evolution-en konfigurazio-bertsioa, konfigurazio maila altuarekin/baxuarekin "
 "(\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Leiho nagusiaren altuera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Leiho nagusiaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Albo-panelaren zabalera lehenetsia, pixeletan."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17247,7 +17108,7 @@ msgstr ""
 "Azken bertsio-berritutako Evolution-en konfigurazio-bertsioa, konfigurazio "
 "maila altuarekin/baxuarekin (\"2.6.0\" adibidez)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17257,36 +17118,39 @@ msgstr ""
 "izan daiteke. \"Tresna-barra\" ezartzen bada botoien estiloa GNOMEko tresna-"
 "barraren ezarpenak zehaztuko du."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Tresna-barra ikusgai dago"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution lineaz kanpoko moduan abiarazi behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Leihoa maximizatu behar den edo ez."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Alboko barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Tresna-barra ikusgai izango den edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Garapen-abisuaren elkarrizketa-koadroa saltatu behar den edo ez"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Leihoko botoiak ikusgai egongo diren edo ez."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Leihoko botoi-estiloa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Leihoko botoiak ikusgai daude"
 
@@ -17405,39 +17269,37 @@ msgstr "Ezin izan da Bug Buddy exekutatu."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr ""
-"Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan egiteko."
+msgstr "Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan egiteko."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
-"Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan egiteko."
+msgstr "Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan egiteko."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
@@ -17485,8 +17347,7 @@ msgstr "Sortu probako elementu berria"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko. "
+msgstr "Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17523,7 +17384,7 @@ msgstr ""
 "inportatzeko prozesuan zehar gidatuko zaitu."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17559,7 +17420,7 @@ msgstr ""
 "Gogorik lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17567,35 +17428,35 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution taldea\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ez esan berriro"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Abiarazi Evolution zehaztutako osagaia aktibatuz"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Behartu Evolution 1.4etik migratzera"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desgaitu edozein plugin kargatzea."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17987,8 +17848,7 @@ msgstr "Fidatu ziurtagiri-emaile honetaz posta-erabiltzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr ""
-"Fidatu ziurtagiri-emaile honetaz software-garatzaileak identifikatzeko."
+msgstr "Fidatu ziurtagiri-emaile honetaz software-garatzaileak identifikatzeko."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
@@ -18007,15 +17867,12 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Identifikatzen zaituzten erakunde horien ziurtagiriak dituzu:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr ""
-"Ziurtagiri-emaileok identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
+msgid "You have certificates on file that identify these certificate authorities:"
+msgstr "Ziurtagiri-emaileok identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"Pertsona hauek identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
+msgstr "Pertsona hauek identifikatzen dituzten ziurtagiriak dituzu artxibatuta:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -18908,8 +18765,7 @@ msgid "Hide _Read Messages"
 msgstr "Ezkutatu _irakurritako mezuak"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ezkutatu ezabatutako mezuak, marratuta erakutsi beharrean"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -19792,8 +19648,7 @@ msgstr "Sortu karpeta hau erakusten duen leiho berri bat"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
+msgstr "Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -20072,7 +19927,7 @@ msgid "_Edit..."
 msgstr "E_ditatu..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20198,17 +20053,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../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:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Gutxieneko zabalera"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../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:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Gutxieneko zabalera"
 
@@ -20465,15 +20320,15 @@ msgstr "Sinkronizatu erregistro pribatuak:"
 msgid "Sync Categories:"
 msgstr "Sinkronizatu kategoriak:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Mezu _hutsa"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "Ordezte-modeloa"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Zutabe-zabalera"
 
@@ -20517,13 +20372,13 @@ msgstr "Testua"
 msgid "Find _Now"
 msgstr "Bilatu _orain"
 
-#: ../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 "Kurtsore-errenkada"
 
 #
-#: ../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 "Kurtsore-zutabea"
@@ -20716,25 +20571,25 @@ msgstr "Enfokatutako zutabea"
 msgid "Unselected Column"
 msgstr "Desautatutako zutabea"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Zutabe marratua"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Azpimarratu zutabea"
 
 #
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Zutabe lodia"
 
 #
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Zutabe koloreduna"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Atzeko planoaren koloreko zutabea"
 
@@ -20856,14 +20711,14 @@ msgstr "_Erakutsi eremuak ordenean:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kodea"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Goiburu osoak"
 
@@ -20907,7 +20762,7 @@ msgstr "%s (%%%d elementu)"
 #: ../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:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Errenkada-kolore txandakatuak"
 
@@ -20915,7 +20770,7 @@ msgstr "Errenkada-kolore txandakatuak"
 #: ../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:2979 ../widgets/table/e-table-item.c:2980
+#: ../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 "Marrazteko sareta horizontala"
@@ -20924,7 +20779,7 @@ msgstr "Marrazteko sareta horizontala"
 #: ../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:2986 ../widgets/table/e-table-item.c:2987
+#: ../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 "Marrazteko sareta bertikala"
@@ -20933,7 +20788,7 @@ msgstr "Marrazteko sareta bertikala"
 #: ../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:2993 ../widgets/table/e-table-item.c:2994
+#: ../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 "Marraztu fokua"
@@ -20942,7 +20797,7 @@ msgstr "Marraztu fokua"
 #: ../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:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Kurtsore-modua"
 
@@ -20950,7 +20805,7 @@ msgstr "Kurtsore-modua"
 #: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Hautapen modeloa"
 
@@ -20958,7 +20813,7 @@ msgstr "Hautapen modeloa"
 #: ../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:3007 ../widgets/table/e-table-item.c:3008
+#: ../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"
@@ -20968,7 +20823,7 @@ msgstr "Luzera-muga"
 #: ../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:3041 ../widgets/table/e-table-item.c:3042
+#: ../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"
@@ -21029,32 +20884,32 @@ msgstr "Eman formatu zutabeei..."
 msgid "Customize Current View..."
 msgstr "Pertsonalizatu uneko ikuspegia..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Letra-tipoak"
 
 #
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenatu informazioa"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Zuhaitza"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Taulako goiburua"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Taulako eredua"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Kurtsore-zutabea"
 
@@ -21218,3 +21073,4 @@ msgstr "BM testuingurua"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Kudeatu laster-leihoa"
+
diff --git a/po/fi.po b/po/fi.po
index 87d382c697..cdbc0ec3a5 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-04-10 21:06+0300\n"
-"PO-Revision-Date: 2006-04-10 21:10+0200\n"
+"POT-Creation-Date: 2006-05-22 07:15+0300\n"
+"PO-Revision-Date: 2006-05-22 07:16+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"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Evolutionin osoitekirja"
 
@@ -36,12 +36,12 @@ msgstr "Uusi yhteystieto"
 msgid "New Contact List"
 msgstr "Uusi yhteystietoluettelo"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "Valitussa osoitekirjassa %s on %d kortti"
-msgstr[1] "Valitussa osoitekirjassa %s on %d korttia"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "Valitussa osoitekirjassa on %d kortti"
+msgstr[1] "Valitussa osoitekirjassa on %d korttia"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -60,32 +60,32 @@ msgstr "Yhteystiedot: "
 msgid "evolution minicard"
 msgstr "Evolutionin minikortti"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Sisältää hälytyksiä."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Sisältää toistuvuuksia."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Sisältää kokouksen."
 
-#: ../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 "Kalenteritapahtuma, yhteenveto aiheesta: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenteritapahtuma, ei yhteenvetoa."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalenterinäkymän tapahtuma"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Ota kohdistin"
 
@@ -114,14 +114,14 @@ msgstr "Siirry päivään"
 msgid "a table to view and select the current time range"
 msgstr "taulukko, josta voi nähdä ja nykyisen aikaalueen"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "%d tapahtuma."
 msgstr[1] "%d tapahtumaa."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ei tapahtumia."
 
@@ -215,21 +215,21 @@ msgstr "Hyppäyspainike"
 msgid "Click here, you can find more events."
 msgstr "napsauta tästä, voit löytää lisää tapahtumia."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Kuukausinäkymä: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Työviikko: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "kalenterin kuukausinäkymä"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "kalenterinäkymä yhdelle tai useammalle viikolle"
 
@@ -800,10 +800,10 @@ msgstr "_Uusi osoitekirja"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../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"
@@ -828,12 +828,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Syötä salasana palvelulle %s (käyttäjä %s)"
@@ -1209,6 +1209,7 @@ msgstr "minuutti"
 #: ../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
@@ -2523,15 +2524,15 @@ msgstr "Muutettu"
 msgid "Contact Editor - %s"
 msgstr "Yhteystietojen muokkain - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle henkilölle"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2539,7 +2540,23 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "\"%s\" sisältää virheellistä muotoilua"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s\"%s\" sisältää virheellistä muotoilua"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s\"%s\" on tyhjä"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
@@ -2567,7 +2584,7 @@ msgstr "_Valitse osoitekirja"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Haluatko varmasti poistaa \n"
 "yhteystietolistan (%s)?"
@@ -2584,7 +2601,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Haluatko varmasti\n"
 "poistaa yhteystiedon (%s)?"
@@ -2696,8 +2713,8 @@ msgstr "_Pikaviestipalvelu:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:238
-#: ../plugins/exchange-operations/exchange-contacts.c:230
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Sijainti:"
 
@@ -2881,8 +2898,8 @@ msgstr "Tallenna VCardina..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Avaa"
@@ -2939,13 +2956,13 @@ msgstr "_Leikkaa"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopioi"
@@ -3751,7 +3768,7 @@ msgstr "Muoto"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Ylätunniste:"
@@ -3855,9 +3872,9 @@ msgstr "Varjostus"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:227
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Koko:"
 
@@ -4081,17 +4098,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../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 "Haluatko varmasti poistaa tämän päiväkirjamerkinnän?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Haluatko varmasti poistaa tämän tapaamisen?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "haluatko varmasti poistaa tämän tehtävän?"
 
@@ -4343,7 +4357,7 @@ msgid "_Save Changes"
 msgstr "_Tallenna muutokset"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Lähetä"
 
@@ -4463,8 +4477,8 @@ msgstr "Muistilaput"
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tehtävät"
@@ -4528,7 +4542,7 @@ msgstr "Torkkumisaika:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -5058,9 +5072,9 @@ msgstr "Tulosta"
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
-#: ../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:590
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5337,18 +5351,19 @@ msgstr "Hälytykset"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "_Ehdota liitteen automaattista näyttämistä"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Ehdota liitteen automaattista näyttämistä"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Liitteen ominaisuudet"
@@ -5357,19 +5372,19 @@ msgstr "Liitteen ominaisuudet"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Kuvaus:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME-tyyppi:"
@@ -5784,7 +5799,7 @@ msgstr[1] "%d liitettyä viestiä"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Siirrä"
 
@@ -5915,10 +5930,6 @@ msgstr "Kohdetta ei voi avata"
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Poistetaanko tämä kohta kaikkien muiden vastaanottajien kansioista?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Tapahtumaa ei voi poistaa corba-virheen takia"
@@ -6526,7 +6537,7 @@ msgstr "<span weight=\"bold\">Tila</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Valmis"
@@ -6751,7 +6762,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Napsauta avataksesi %s"
@@ -6834,7 +6845,7 @@ msgstr "Vapaa"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Varattu"
 
@@ -6850,15 +6861,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:773
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Kyllä"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ei"
@@ -6869,8 +6880,8 @@ msgstr "Ei"
 #: ../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:126 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6900,9 +6911,9 @@ msgstr "Valitse kansio, johon valitut liitteet tallennetaan..."
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
@@ -6969,25 +6980,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -6995,44 +7006,44 @@ msgstr "_Avaa www-sivu"
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "L_iitä"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Anna tehtäväksi"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Välitä iCalendar-muodossa"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Lisää tehtävä näpäyttämällä tästä"
@@ -7067,105 +7078,105 @@ msgstr "Aloituspäivä"
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Siirretään kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopioidaan kohteita"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Uusi _kokous"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Uusi _tehtävä"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Nykyinen näkymä"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Valitse _tämä päivä"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Valitse päiväys..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Kopioi kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kalenteriin..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegoi kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Vastaa"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Muuta tämä kerta _siirrettäväksi"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Järjestäjä: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Järjestäjä: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Sijainti: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Aika: %s %s"
@@ -7328,7 +7339,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7341,7 +7352,7 @@ msgstr "Alustavasti hyväksytty"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7668,63 +7679,63 @@ msgid "Resources"
 msgstr "Resurssit"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Henkilö"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Ryhmä"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resurssi"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:107 ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Huone"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Vapaaehoinen läsnäolija"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:142 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:780
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Alustava"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7735,14 +7746,14 @@ msgstr "Valtuutettu"
 msgid "Attendee                          "
 msgstr "Osallistuja                       "
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Työn alla"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:447
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7750,78 +7761,78 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Osanottajat..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Asetukset"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
@@ -10270,7 +10281,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;."
 
@@ -10387,11 +10398,11 @@ msgstr "_Tallenna viesti"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Ryhmätyöohjelmisto"
 
@@ -10563,7 +10574,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:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
@@ -10732,7 +10743,7 @@ msgstr "Päiväys puuttuu."
 msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
@@ -10876,7 +10887,7 @@ msgstr "Evolution sähköpostin muokkaimen asetukset"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution sähköpostin asetukset"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11020,14 +11031,14 @@ msgstr "Allekirjoitukset"
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11437,7 +11448,7 @@ msgstr "_Uusi kansio..."
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Tyhjennä roskakori"
 
@@ -11446,13 +11457,13 @@ msgstr "_Tyhjennä roskakori"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopioidaan %s paikkaan %s"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopioi"
 
@@ -11474,143 +11485,143 @@ msgstr "Luo uusi kansio"
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Merkitse _tärkeäksi"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Merkitse yhden_tekeväksi"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Luokittele _roskapostiksi"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Luokittele _ei-roskapostiksi"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "_Merkitse _edelleen lähetettäväksi..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Nimiö"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Hakunäkymä _aiheen perusteella"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Hakunäkymä _lähettäjän perusteella"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Hakunäkymä _vastaanottajien perusteella"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Hakunäkymä _listan perusteella"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Oletukset"
 
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Viestiä ei voida hakea"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Luo uusi hakunäkymä"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Tästä osoitteesta"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Osoitteeseen:"
 
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Napsauta lähettääksesi %s"
@@ -11898,7 +11909,7 @@ msgstr "Uutisryhmät"
 msgid "%s attachment"
 msgstr "Liite: %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 viestin tulkitseminen epäonnistui: tuntematon virhe"
 
@@ -11914,11 +11925,11 @@ msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Allekirjoituksen muoto ei ole tuettu"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Virhe tarkistettaessa allekirjoitusta"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
 
@@ -13834,13 +13845,13 @@ 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 ""
 "Kansio &quot;{1}&quot; on jo olemassa ja sisältää tietoja.\n"
 "\n"
-"Voit ohittaa tämän kansion, kirjoittaa yli, lisätä kansioon tai poistua.\n"
+"Voit ohittaa tämän kansion, kirjoittaa 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}?"
@@ -13848,13 +13859,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."
@@ -13862,33 +13873,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;?"
@@ -13897,82 +13908,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 "
@@ -13981,32 +13992,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."
@@ -14015,71 +14026,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 \"{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."
@@ -14087,11 +14098,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."
@@ -14099,11 +14110,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."
@@ -14111,19 +14122,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 "
@@ -14135,35 +14146,35 @@ 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 as read in the selected folder"
 msgstr "_Merkitse kaikki viestit luetuiksi valitussa kansiossa"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Kansio puuttuu."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Lähteitä ei ole valittuna."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 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:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Tarkista tilisi asetukset ja yritä uudestaan."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 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:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14171,7 +14182,7 @@ msgstr ""
 "Syötä kelvollinen sähköpostiosoite Vastaanottaja: kenttään. Voit etsiä "
 "sähköpostiosoitteita näpäyttämällä Vastaanottaja: painiketta kentän vieressä."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14183,47 +14194,47 @@ msgstr ""
 "\n"
 "Lähetetäänkö joka tapauksessa?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Anna allekirjoitukselle yksikäsitteinen nimi."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Odota, ole hyvä."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 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:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Kysytään palvelimelta"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Kysytään palvelimelta tuettuja tunnistautumismenetelmiä."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Kuittausta pyydetty."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 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:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Hakunäkymät päivitetty automaattisesti."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Lähetä kuittaus"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Allekirjoitus on jo olemassa"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14231,7 +14242,7 @@ msgstr ""
 "Järjestelmän kansioita tarvitaan, jotta Evolution toimii oikein, eikä niitä "
 "voida nimetä uudestaan, siirtää tai poistaa."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14248,7 +14259,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:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14262,7 +14273,7 @@ msgstr ""
 "   &quot;{0}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14276,23 +14287,11 @@ msgstr ""
 "   &quot;{1}&quot;\n"
 "ja ne on päivitetty."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Viestiä yritettiin lähettää ulkoisen &quot;sendmail&quot;-ohjelman avulla. "
-"Ohjelma palautti seuraavan virheen: status 67: viestiä ei lähetetty.\n"
-"Viestisi on tallennettu Lähtevät-kansioon. Tarkista viesti virheiden varalta "
-"ja yritä lähettää uudestaan."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Skriptitiedoston tulee olla olemassa ja suoritettavissa."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14300,7 +14299,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:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14308,12 +14307,12 @@ msgstr ""
 "Viestiä ei voida lähettää, koska viestin lähetykseen valitsemasi tili ei ole "
 "käytössä"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 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:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14321,11 +14320,11 @@ msgstr ""
 "Palvelin ei tue tämän tyyppistä tunnistautumista eikä välttämättä tue "
 "lainkaan tunnistautumista."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 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:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14333,11 +14332,11 @@ msgstr ""
 "Tämä toiminto merkitsee kaikki viestit valitussa kansiossa ja sen "
 "alikansioissa luetuiksi."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "GroupWise-palvelimeen ei saatu yhteyttä."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14345,40 +14344,40 @@ msgstr ""
 "Tämän sähköpostitilin luonnoskansiota ei voi avata. Haluatko käyttää "
 "luonnosten oletuskansiota sen sijaan?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Lisenssitiedostoa ei voi avata."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Käytä _oletuksia"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Käytä oletuskansiota luonnoksille?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 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:120
+#: ../mail/mail.error.xml.h:117
 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:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Hakunäkymälle täytyy antaa nimi."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Kansio täytyy valita."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14388,29 +14387,25 @@ msgstr ""
 "Valitse joko kansiot yksitellen, kaikki paikalliset tai etäkansiot, tai "
 "kaikki etä- ja paikalliset kansiot."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 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:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Viestiäsi aiheesta &quot;{0}&quot; ei lähetetty."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Lisää"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Hylkää muutokset"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Poista pysyvästi"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Avaa viestit"
 
@@ -14923,24 +14918,24 @@ msgstr "Kansioiden koko"
 msgid "Exchange Settings"
 msgstr "Exchangen asetukset"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "K_irjautuminen"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Kirjautumisen tyyppi"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "Tar_kista tuetut tyypit"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15567,7 +15562,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Peru kansioiden tilauksia"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Muistilista"
 
@@ -16383,10 +16378,10 @@ msgstr "Itip-muotoilija"
 #: ../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 ""
-"&quot;{0}&quot; on antanut kokouksen järjestettäväksi. Haluatko lisätä "
-"osallistujan &quot;{1}&quot;?"
+"&quot;{0}&quot; on valtuuttanut kokouksen. Haluatko lisätä valtuutetun &quot;"
+"{1}&quot; ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16902,7 +16897,7 @@ msgid "MIME Type"
 msgstr "MIME-tyyppi"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Tallenna"
 
@@ -17126,41 +17121,45 @@ msgid "Default window height"
 msgstr "Ikkunan oletuskorkeus"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Ikkunan oletustila"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
-#: ../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 "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Viimeksi päivitetty konfiguraation versio"
 
-#: ../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 ""
 "Lista poluista kansioihin, jotka synkronisoidaan kovalevylle yhteydettömään "
 "käyttöön"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Tulostimen asetukset"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Sivupaneeli on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17168,19 +17167,19 @@ msgstr ""
 "Evolutionin konfiguraatioversio, major/minor/configuration tasoilla "
 "(esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Pääikkunan oletuskorkeus pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Pääikkunan oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Sivupaneelin oletusleveys pikseleinä."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17188,7 +17187,7 @@ msgstr ""
 "Viimeisin päivitetty Evolutionin konfiguraatioversio, major/minor/"
 "configuration tasoilla (esimerkiksi \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17198,37 +17197,41 @@ msgstr ""
 "\"toolbar\". Jos \"toolbar\" on valittu, käytetään työkalupalkissa Gnomen "
 "asetusta."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Työkalupalkki on näkyvissä"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Käynnistetäänkö Evolution yhteydettömässä vai yhteydellisessä tilassa."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Onko ikkuna suurennettu."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Näytetäänkö sivupaneeli."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Näytetäänkö työkalupalkki."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Piilotetaanko varoitusikkuna Evolutionin kehitysversion käytöstä vai ei."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Näytetäänkö ikkunan napit."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Ikkunan painikkeiden tyyli"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Ikkunan napit näytetään"
 
@@ -17348,7 +17351,7 @@ msgstr "Bug buddya ei voi suorittaa."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Jarkko Ranta, 2000-2001\n"
@@ -17357,35 +17360,35 @@ msgstr ""
 "\n"
 "http://gnome.fi/"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Yhtedellinen tila"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Valitse yhteydetön tila"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution on yhteydellisessä tilassa. Napsauta tästä siirtyäksesi "
 "yhteydettömään tilaan."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution siirtyy yhteydettömään tilaan."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution on yhteydettömässä tilassa. Napsauta tästä siirtyäksesi "
 "yhteydelliseen tilaan."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Avaa %s"
@@ -17470,7 +17473,7 @@ msgstr ""
 "Evolutionin käyttöön."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17506,7 +17509,7 @@ msgstr ""
 "Toivomme että nautit kovan työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitystyöhön!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17514,35 +17517,35 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Älä kerro tätä uudestaan"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tuo tiedot väkisin uudestaan Evolution 1.4:stä"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Älä lataa mitään liitännäisiä."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18299,7 +18302,7 @@ msgid "Select All"
 msgstr "Valitse kaikki"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Valitse _kaikki"
@@ -18526,11 +18529,11 @@ msgstr "_Leikkaa valinta leikepöydälle"
 msgid "Paste from clipboard"
 msgstr "Liitä leikepöydältä"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Liitä tekstiä leikepöydältä"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Valitse kaikki teksti"
 
@@ -18565,31 +18568,30 @@ msgstr "Napsauta tästä näyttääksesi ohje"
 msgid "Close"
 msgstr "Sulje"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Li_sää"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Liite..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "O_hje"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Li_sää"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Vaihtoehdot"
@@ -19441,6 +19443,11 @@ msgstr "Pyydä lähettämään kuittaus, kun viestisi on luettu"
 msgid "HT_ML"
 msgstr "_HTML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Li_sää"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Avaa tiedosto"
@@ -20011,7 +20018,7 @@ msgid "_Edit..."
 msgstr "_Muokkaa..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20076,10 +20083,6 @@ msgstr "Näkymän tyyppi"
 msgid "Type of view:"
 msgstr "Näkymän tyyppi:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Ehdota liitteen automaattista näyttämistä"
-
 #. 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:416
@@ -20459,12 +20462,12 @@ msgstr "Teksti"
 msgid "Find _Now"
 msgstr "_Etsi nyt"
 
-#: ../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 "Kohdistimen rivi"
 
-#: ../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 "Kohdistimen sarake"
@@ -20795,14 +20798,14 @@ msgstr "_Näytä kentät järjestyksessä:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD-koodi"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Täysi otsake"
 
@@ -20968,17 +20971,17 @@ msgstr "Muotoile sarakkeet..."
 msgid "Customize Current View..."
 msgstr "Mukauta nykyistä näkymää..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Kirjasinjoukko"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Tietoja järjestyksestä"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21157,8 +21160,20 @@ msgstr "IM-konteksti"
 msgid "Handle Popup"
 msgstr "Kahvan ponnahdusikkuna"
 
-#~ msgid "_Insert"
-#~ msgstr "Li_sää"
+#~ 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 ""
+#~ "Viestiä yritettiin lähettää ulkoisen &quot;sendmail&quot;-ohjelman "
+#~ "avulla. Ohjelma palautti seuraavan virheen: status 67: viestiä ei "
+#~ "lähetetty.\n"
+#~ "Viestisi on tallennettu Lähtevät-kansioon. Tarkista viesti virheiden "
+#~ "varalta ja yritä lähettää uudestaan."
+
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Viestiäsi aiheesta &quot;{0}&quot; ei lähetetty."
 
 #~ msgid "(%ld seconds)"
 #~ msgstr "(%ld sekuntia)"
diff --git a/po/fr.po b/po/fr.po
index 78061c3b64..33fcbc4226 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,6 @@
 # French translation of evolution.
-# Copyright (C) 2000-2005 Free Software Foundation, Inc.
+# Copyright (C) 2000-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
-#
 # Vincent Renardias <vincent@debian.org>, 2000.
 # maintainer: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2005.
 # Jean-Noël Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>, 2001.
@@ -15,15 +14,17 @@
 # Vincent Carriere <carriere_vincent@yahoo.fr>, 2005.
 # Vincent Untz <vuntz@gnome.org>, 2005.
 # Stéphane Raimbault <stephane.raimbault@free.fr>, 2005-2006.
+# Robert-André Mauchin <zebob.m@gmail.com>, 2006.
+# Jonathan Ernst <jonathan@ernstfamily.ch>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.4.0\n"
+"Project-Id-Version: evolution 2.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 11:22+0100\n"
-"PO-Revision-Date: 2006-03-04 16:56+0100\n"
-"Last-Translator: Stéphane Raimbault <stephane.raimbault@free.fr>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"POT-Creation-Date: 2006-05-18 21:24+0200\n"
+"PO-Revision-Date: 2006-05-08 19:54+0200\n"
+"Last-Translator: Jonathan Ernst <jonathan@ernstfamily.ch>\n"
+"Language-Team: French <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,32 +70,32 @@ msgstr "Contact : "
 msgid "evolution minicard"
 msgstr "mini-carte d'Evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Il possède des alarmes."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Il possède des récurrences."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "C'est une réunion."
 
-#: ../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 "Événement du calendrier : le résumé est %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Événement du calendrier : il n'a pas de résumé."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vue des événements du calendrier"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Capturer le focus"
 
@@ -124,32 +125,32 @@ msgid "a table to view and select the current time range"
 msgstr ""
 "un tableau pour consulter et sélectionner l'intervalle de temps courant"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Il possède %d événement."
 msgstr[1] "Il possède %d événements."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Il ne possède pas d'événements."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vue hebdomadaire de travail : %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vue journalière : %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "vue du calendrier pour une semaine de travail"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "vue du calendrier pour un ou plusieurs jours"
 
@@ -225,21 +226,21 @@ msgstr "Bouton du saut"
 msgid "Click here, you can find more events."
 msgstr "Cliquez ici, vous pourrez trouver plus d'événements."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vue mensuelle : %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vue hebdomadaire : %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "vue du calendrier pour un mois"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "vue du calendrier pour une ou plusieurs semaines"
 
@@ -355,10 +356,10 @@ msgid ""
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
-"Vérifiez que votre mot de passe est orthographié correctement que vous "
+"Vérifiez que votre mot de passe est correctement orthographié et que vous "
 "utilisez une méthode de connexion supportée. Souvenez-vous que beaucoup de "
-"mot de passes sont sensibles à la casse : caps lock devrait peut-être être "
-"activé."
+"mots de passe sont sensibles à la casse ; le verrouillage majuscules est "
+"peut-être actif."
 
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
@@ -393,7 +394,7 @@ msgstr "Erreur lors de l'enregistrement de {0} vers {1} : {2}"
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
-msgstr "L'authentification sur le serveur LDAP a échoué"
+msgstr "L'authentification sur le serveur LDAP a échoué."
 
 #: ../addressbook/addressbook.error.xml.h:13
 msgid "GroupWise Address book creation:"
@@ -421,8 +422,8 @@ msgstr "Le carnet d'adresses d'Evolution a quitté de façon inattendue."
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"L'image que vous avez sélectionné est grande. Voulez-vous la redimensionnez "
-"avant de l'enregistrer ?"
+"L'image que vous avez sélectionnée est grande. Voulez-vous la redimensionner "
+"avant de l'enregistrer ?"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid ""
@@ -494,7 +495,7 @@ msgstr ""
 "Vous êtes connecté à un serveur GroupWise non supporté, ce qui peut "
 "engendrer des problèmes à l'utilisation d'Evolution. Pour de meilleurs "
 "résultats, il est recommandé de mettre à niveau votre serveur vers une "
-"version supportée."
+"version supportée"
 
 #: ../addressbook/addressbook.error.xml.h:31
 msgid ""
@@ -508,8 +509,8 @@ msgstr ""
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
-"Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'a pas "
-"été redémarré."
+"Vos contacts pour {0} ne seront plus disponibles tant que Evolution n'aura "
+"pas été redémarré."
 
 #: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -563,9 +564,9 @@ msgstr "Configurez la complétion automatique ici"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -599,7 +600,7 @@ msgstr "Composant de configuration des paramètres dossier d'Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Manage your S/MIME certificates here"
-msgstr "Gérer vos certificats S/MIME ici"
+msgstr "Gérez vos certificats S/MIME ici"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
@@ -705,7 +706,7 @@ msgstr "Carnet d'adresses"
 
 #: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
-msgstr "Information sur le serveur"
+msgstr "Informations sur le serveur"
 
 #: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
@@ -805,7 +806,7 @@ msgstr "Renommer le dossier"
 #: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
-msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »."
+msgstr "Les noms des dossiers ne peuvent pas contenir le caractère « / »"
 
 #: ../addressbook/gui/component/addressbook-view.c:445
 msgid "A Folder with this name already exists"
@@ -838,21 +839,21 @@ msgstr "Enregistrer comme VCard..."
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
-msgstr "Sélecteur de source des contacts "
+msgstr "Sélecteur de source des contacts"
 
 #: ../addressbook/gui/component/addressbook.c:99
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accès anonyme au serveur LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "L'authentification a échoué.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Saisissez le mot de passe pour %s (utilisateur %s)"
@@ -1040,8 +1041,8 @@ msgid ""
 "objectclass of the type \"person\"."
 msgstr ""
 "Le filtre de recherche défini le type des objects que vous recherchez. Si "
-"celui n'est pas modifié, la recherche par défaut sera effectuée sur la "
-"classe objet du type « personne »."
+"celui-ci n'est pas modifié, la recherche par défaut sera effectuée sur la "
+"classe objet du type « personne »."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1067,7 +1068,7 @@ msgid ""
 msgstr ""
 "Sélectionner cette option signifie que votre serveur ne supporte ni SSL ni "
 "TLS. Cela signifie que votre connexion ne sera pas sécurisée et que vous "
-"serez vulnérable aux exploits de sécurité."
+"serez vulnérable aux failles de sécurité."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1093,7 +1094,7 @@ msgid ""
 msgstr ""
 "La base de recherche est le nom distinctif (DN) de l'entrée où les "
 "recherches devront débuter. Si vous ne renseignez pas ce champ, la recherche "
-"débutera à la racine de l'arborescence du répertoire."
+"débutera à la racine de l'arborescence du dossier."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1215,12 +1216,9 @@ msgstr "cartes"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1403,7 +1401,7 @@ msgstr "_Libre/Occupé :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Home Page:"
-msgstr "_Site internet :"
+msgstr "_Site Web :"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Manager:"
@@ -1519,7 +1517,7 @@ msgstr "Anguilla"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antarctica"
-msgstr "Antartique"
+msgstr "Antarctique"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
@@ -1651,7 +1649,7 @@ msgstr "Îles Caïman"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
-msgstr "République Centre-Africaine"
+msgstr "République Centrafricaine"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
@@ -1767,7 +1765,7 @@ msgstr "Îles Malouines"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
-msgstr "Îles Feroe"
+msgstr "Îles Féroé"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
@@ -1843,7 +1841,7 @@ msgstr "Guatemala"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
-msgstr "Guernsey"
+msgstr "Guernesey"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
@@ -2395,7 +2393,7 @@ msgstr "Ukraine"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
-msgstr "Émirats Unis"
+msgstr "Émirats Arabes Unis"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
@@ -2552,15 +2550,15 @@ msgstr "Modifié"
 msgid "Contact Editor - %s"
 msgstr "Éditeur de contacts - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 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:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Pas d'image"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2568,7 +2566,23 @@ msgstr ""
 "La donnée sur le contact n'est pas valide :\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "« %s » a un format invalide"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s « %s » a un format invalude"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s « %s » est vide"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contact invalide"
 
@@ -2725,8 +2739,8 @@ msgstr "_Service d'IM :"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Emplacement :"
 
@@ -2875,7 +2889,7 @@ msgstr "Requête"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
-msgstr "Erreur d'obtention de l'affichage carnet"
+msgstr "Erreur d'obtention de l'affichage du carnet"
 
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 #: ../widgets/table/e-table-click-to-add.c:502
@@ -2898,7 +2912,7 @@ msgstr "Source"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2911,7 +2925,7 @@ msgid "Save as VCard..."
 msgstr "Enregistrer comme VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3131,7 +3145,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../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"
@@ -3309,7 +3323,7 @@ msgstr "Position"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
-msgstr "Vidéo conférence"
+msgstr "Visioconférence"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:365
 #: ../addressbook/gui/widgets/eab-contact-display.c:380
@@ -3343,7 +3357,7 @@ msgstr "Fonction"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
-msgstr "Site internet"
+msgstr "Page Web personnelle"
 
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
@@ -3359,7 +3373,7 @@ msgstr "Moteur de traitement occupé"
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
-msgstr "Dépôt Hors ligne"
+msgstr "Dépôt hors ligne"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
@@ -3453,8 +3467,8 @@ msgid ""
 "load the addressbook once in online mode to download its contents"
 msgstr ""
 "Nous sommes incapable d'ouvrir le carnet d'adresses. Cela signifie que le "
-"carnet n'est pas marqué pour une utilisation hors-ligne ou ne peut pas être "
-"téléchargé encore pour une consultation hors-ligne. Veuillez charger ce "
+"carnet n'est pas marqué pour une utilisation hors-ligne ou ne peut pas "
+"encore être téléchargé pour une consultation hors-ligne. Veuillez charger ce "
 "carnet d'adresses une fois en mode connecté pour télécharger son contenu."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
@@ -3715,19 +3729,19 @@ msgstr "Importateur Evolution CSV et Tab"
 msgid "Importing ..."
 msgstr "Importation..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Data Interchange Format (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Assistant d'importation LDIF d'Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Assistant d'importation VCard d'Evolution"
 
@@ -3790,7 +3804,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "En-tête"
@@ -3894,9 +3908,9 @@ msgstr "Ombrage"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Taille :"
 
@@ -3984,7 +3998,7 @@ msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Export in asynchronous mode"
-msgstr "Exporter en mode asynchrone "
+msgstr "Exporter en mode asynchrone"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
@@ -4045,7 +4059,7 @@ msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
 msgstr ""
-"Ajouter un résumé compréhensible permet de donner à vos destinataires un "
+"Ajouter un résumé compréhensible permet de donner à vos destinataires une "
 "idée sur le but de votre tâche."
 
 #: ../calendar/calendar.error.xml.h:3
@@ -4053,14 +4067,14 @@ msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
 msgstr ""
-"Toutes les informations sur ces journaux seront supprimées et ne pouront "
+"Toutes les informations sur ces journaux seront supprimées et ne pourront "
 "être restaurées."
 
 #: ../calendar/calendar.error.xml.h:4
 msgid ""
 "All information in this journal will be deleted and can not be restored."
 msgstr ""
-"Toutes les informations sur ce journal seront supprimées et ne pouront être "
+"Toutes les informations sur ce journal seront supprimées et ne pourront être "
 "restaurées."
 
 #: ../calendar/calendar.error.xml.h:5
@@ -4068,20 +4082,20 @@ msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
-"Toutes les informations sur ces rendez-vous seront supprimées et ne pouront "
+"Toutes les informations sur ces rendez-vous seront supprimées et ne pourront "
 "être restaurées."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
-"Toutes les informations sur ces tâches seront supprimées et ne pouront être "
+"Toutes les informations sur ces tâches seront supprimées et ne pourront être "
 "restaurées."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
-"Toutes les informations sur ce rendez-vous seront supprimées et ne pouront "
+"Toutes les informations sur ce rendez-vous seront supprimées et ne pourront "
 "être restaurées."
 
 #: ../calendar/calendar.error.xml.h:8
@@ -4089,21 +4103,21 @@ msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
 msgstr ""
-"Toutes les informations sur ce journal seront supprimées et ne pouront être "
+"Toutes les informations sur ce journal seront supprimées et ne pourront être "
 "restaurées."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr ""
-"Toutes les informations sur cette réunion seront supprimées et ne pouront "
+"Toutes les informations sur cette réunion seront supprimées et ne pourront "
 "être restaurées."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"Toutes les informations sur cette tâche seront supprimées et ne pouront être "
-"restaurées."
+"Toutes les informations sur cette tâche seront supprimées et ne pourront "
+"être restaurées."
 
 #: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
@@ -4179,7 +4193,7 @@ msgstr "Téléchargement en cours. Voulez-vous enregistrer ce rendez-vous ?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the task?"
-msgstr "Téléchargement en cours. Voulez-vous enregistrer la tâche ?"
+msgstr "Téléchargement en cours. Voulez-vous enregistrer la tâche ?"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Editor could not be loaded."
@@ -4383,13 +4397,13 @@ msgstr ""
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
-"Vos calendriers ne seront plus disponibles tant que Evolution n'a pas été "
+"Vos calendriers ne seront plus disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
-"Vos tâches ne seront plus disponibles tant que Evolution n'a pas été "
+"Vos tâches ne seront plus disponibles tant que Evolution n'aura pas été "
 "redémarré."
 
 #: ../calendar/calendar.error.xml.h:68
@@ -4407,7 +4421,7 @@ msgid "_Save Changes"
 msgstr "_Enregistrer les changements"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Envoyer"
 
@@ -4446,7 +4460,7 @@ msgstr ""
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
-msgstr "Impossible de lire les données de l'application « Mémo » du pilot."
+msgstr "Impossible de lire les données de l'application « Mémo » du pilot."
 
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
@@ -4528,9 +4542,9 @@ msgstr "Mémos"
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Tâches"
@@ -4549,9 +4563,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Service de notification d'alarme du calendrier d'Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
@@ -4604,7 +4615,7 @@ msgstr "_Durée du report :"
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
 #: ../ui/evolution.xml.h:40
 msgid "_Edit"
-msgstr "_Édition"
+msgstr "É_dition"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
 msgid "_Snooze"
@@ -4685,67 +4696,34 @@ msgstr "Impossible de créer la fabrique de services de notification d'alarme"
 msgid "invalid time"
 msgstr "Heure non valide"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld secondes)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "seconde"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "secondes"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u seconde"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u secondes"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u minute"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u minutes"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d heure"
+msgstr[1] "%d heures"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr " %u heure"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u heures"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d seconde"
+msgstr[1] "%d secondes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4758,7 +4736,8 @@ msgstr "Demander une confirmation pour la suppression des éléments"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr ""
-"Couleur des tâches qui sont dues aujourd'hui, dans le format « #rrggbb »."
+"Couleur des tâches qui sont à effectuer aujourd'hui, dans le format "
+"« #rrggbb »."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
@@ -4766,18 +4745,20 @@ msgstr "Couleur des tâches qui sont en retard, dans le format « #rrggbb »."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
-msgstr "Calendrier pour lequels lancer les alarmes"
+msgstr "Calendriers pour lesquels lancer les alarmes"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
-"Couleur pour dessiner la ligne Marcus Bains dans la barre de temps (vide par "
-"défaut)."
+"Couleur pour dessiner la ligne de l'heure courante (MBL) dans la barre de "
+"temps (vide par défaut)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "Couleur pour dessiner la ligne Marcus Bains dans l'affichage du jour."
+msgstr ""
+"Couleur pour dessiner la ligne de l'heure courante (MBL) dans l'affichage du "
+"jour."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
@@ -4858,15 +4839,15 @@ msgstr ""
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
-msgstr "Ligne Marcus Bains"
+msgstr "Ligne de l'heure courante (MBL)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
-msgstr "Couleur de la ligne Marcus Bains - Vue du jour"
+msgstr "Couleur de la ligne de l'heure courante (MBL) - Vue du jour"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "Couleur de la ligne Marcus Bains - Barre de temps"
+msgstr "Couleur de la ligne de l'heure courante (MBL) - Barre de temps"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
@@ -4992,7 +4973,7 @@ msgstr "Afficher les numéros de semaine dans le navigateur de dates"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
-msgstr "Couleurs des tâches dues aujourd'hui"
+msgstr "Couleurs des tâches à effectuer aujourd'hui"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
@@ -5050,7 +5031,7 @@ msgstr "Début de la semaine"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "Jour de début de la semaine, de dimanche (0) à samedi (6). "
+msgstr "Jour de début de la semaine, de dimanche (0) à samedi (6)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
@@ -5200,10 +5181,10 @@ msgstr "Imprimer"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5242,7 +5223,7 @@ msgstr "jours"
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
-msgstr "Sur internet"
+msgstr "Sur le Web"
 
 #: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
@@ -5584,7 +5565,7 @@ msgid "Display"
 msgstr "Affichage"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Libre/Occupé"
@@ -5953,30 +5934,30 @@ msgstr "_Déplacer"
 msgid "Cancel _Drag"
 msgstr "Annuler le _déplacement"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet."
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> fichier attaché"
-msgstr[1] "<b>%d</b> fichiers attachés"
+msgstr[0] "<b>%d</b> pièce jointe"
+msgstr[1] "<b>%d</b> pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Masquer la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Afficher la _barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5985,85 +5966,85 @@ msgstr "Afficher la _barre des pièces jointes"
 msgid "_Remove"
 msgstr "_Enlever"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "A_jouter une pièce jointe..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Afficher les pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Appuyez sur la barre espace pour basculer la barre des pièces jointes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Réunion - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tâche assignée - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "pièce jointe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Les changements apportés à cet élément peuvent être annulés en cas de "
 "réception d'une mise à jour."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
-msgstr "Impossible d'utiliser la version courante !"
+msgstr "Impossible d'utiliser la version actuelle !"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
@@ -6155,7 +6136,7 @@ msgstr "Récurrence"
 #: ../calendar/gui/dialogs/event-page.c:807
 #: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
-msgstr "Cet évènement possède des alarmes"
+msgstr "Cet événement possède des alarmes"
 
 #: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
@@ -6165,7 +6146,7 @@ msgstr "Cale_ndrier :"
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisateur :"
 
@@ -6179,14 +6160,14 @@ msgstr "Participa_nts"
 
 #: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
-msgstr "Évènement sans date de début"
+msgstr "Événement sans date de début"
 
 #: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
-msgstr "Évènement sans date de fin"
+msgstr "Événement sans date de fin"
 
 #: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
@@ -6204,25 +6185,25 @@ msgstr "L'heure de fin est erronée."
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "L'organisateur sélectionné n'a plus de compte."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Ajouter "
 
@@ -6390,14 +6371,14 @@ msgstr "Membre"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6434,7 +6415,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Impossible d'ouvrir les mémos dans « %s »."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Groupe :"
@@ -6542,6 +6523,15 @@ msgstr "le"
 msgid "first"
 msgstr "premier"
 
+#. 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:998
+msgid "second"
+msgstr "seconde"
+
 #. 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.
@@ -6632,7 +6622,7 @@ msgstr "<b>Récurrence</b>"
 #. '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 "Tou(te)s les"
+msgstr "Tous les"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6686,7 +6676,7 @@ msgstr "<span weight=\"bold\">État</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Achevée"
@@ -6762,11 +6752,11 @@ msgstr "_Tâche"
 msgid "Task Details"
 msgstr "Détails de la tâche"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
@@ -6850,30 +6840,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d heure"
-msgstr[1] "%d heures"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d seconde"
-msgstr[1] "%d secondes"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Action inconnue à exécuter"
@@ -6935,7 +6901,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
@@ -7034,27 +7000,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Oui"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
 
 #. 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:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7071,35 +7037,35 @@ msgstr "Récurrent"
 msgid "Assigned"
 msgstr "Attribué"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Choisir le dossier où enregistrer les pièces jointes sélectionnées..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "image_sansnom.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Enregistrer la sélection"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
@@ -7166,7 +7132,7 @@ msgstr "Enregistrer sous..."
 
 #: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
-msgstr "Ouvrir le _site internet"
+msgstr "Ouvrir le _site Web"
 
 #: ../calendar/gui/e-calendar-table.c:1177
 #: ../calendar/gui/e-calendar-view.c:1581
@@ -7331,25 +7297,25 @@ msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisateur : %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisateur : %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Lieu : %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Heure : %s %s"
@@ -7439,12 +7405,12 @@ msgstr " et "
 #: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
-msgstr "Le %s jour de"
+msgstr "Le %s jour de "
 
 #: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
-msgstr "Le %s %s de"
+msgstr "Le %s %s de "
 
 #: ../calendar/gui/e-itip-control.c:812
 #, c-format
@@ -7469,7 +7435,7 @@ msgstr[1] " un total de %d fois"
 
 #: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
-msgstr ", finissant le"
+msgstr ", finissant le "
 
 #: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
@@ -7514,7 +7480,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7527,7 +7493,7 @@ msgstr "Accepté provisoirement"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7862,81 +7828,81 @@ msgid "Resources"
 msgstr "Ressources"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuel"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Groupe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Salle"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Président"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participant attendu"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Non participant"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Nécessite une action"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Provisoire"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Délégué"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Participant                          "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En cours"
 
 #. 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7945,7 +7911,7 @@ msgstr "%A %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
@@ -7977,7 +7943,7 @@ msgstr "Afficher _seulement les heures de travail"
 
 #: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
-msgstr "Afficher _Zoomé arrière"
+msgstr "Afficher _Zoom arrière"
 
 #: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
@@ -8181,7 +8147,7 @@ msgstr "_Sélectionner aujourd'hui"
 #: ../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 "Un organisateur doit être configuré."
+msgstr "Un organisateur doit être défini."
 
 #: ../calendar/gui/itip-utils.c:448
 msgid "At least one attendee is necessary"
@@ -8354,12 +8320,6 @@ msgstr "Impossible de migrer le calendrier « %s »"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossible de migrer les tâches dans '%s'"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d secondes)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1"
@@ -10270,7 +10230,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barre des pièces jointes"
 
@@ -10475,7 +10435,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} »."
 
@@ -10512,7 +10472,7 @@ msgstr "Impossible d'enregistrer le fichier de sauvegarde automatique « {0} �
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr "Les répertoires ne peuvent pas être joints à des messages."
+msgstr "Les dossiers ne peuvent pas être joints à des messages."
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
@@ -10520,7 +10480,7 @@ msgstr "Voulez-vous récupérer les messages inachevés ?"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "Téléchargement en cours. Voulez-vous envoyer le courriel ?"
+msgstr "Téléchargement en cours. Voulez-vous envoyer le courriel ?"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
@@ -10548,9 +10508,9 @@ 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 ""
-"Pour joindre le contenu de ce répertoire vous devez soit joindre les "
-"fichiers qu'il contient un à un, soit créer une archive à partir du "
-"répertoire et la joindre."
+"Pour joindre le contenu de ce dossier vous devez soit joindre les fichiers "
+"qu'il contient un à un, soit créer une archive à partir du dossier et la "
+"joindre."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
@@ -10598,11 +10558,11 @@ msgstr "_Enregistrer le message"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Suite de travail collaboratif"
 
@@ -10774,7 +10734,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:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "É_craser"
 
@@ -10942,7 +10902,7 @@ msgstr "Date manquante"
 msgid "Missing file name."
 msgstr "Nom de fichier manquant"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Nom manquant."
 
@@ -11008,12 +10968,16 @@ msgstr "une date relative à la date actuelle"
 
 #: ../filter/filter.glade.h:13
 msgid "ago"
-msgstr "passé(e)s"
+msgstr "écoulé(e)s"
 
 #: ../filter/filter.glade.h:17
 msgid "months"
 msgstr "mois"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "secondes"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "la date actuelle"
@@ -11227,14 +11191,14 @@ msgstr "Signatures"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. 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:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11430,7 +11394,7 @@ msgstr "Destinataires"
 
 #: ../mail/em-filter-i18n.h:49
 msgid "Regex Match"
-msgstr "Regex correspond"
+msgstr "Correspondance Regex"
 
 #: ../mail/em-filter-i18n.h:50
 msgid "Replied to"
@@ -11558,7 +11522,7 @@ msgstr "Brouillons"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Boîte de réception"
 
@@ -11622,7 +11586,7 @@ msgstr "Examen des dossiers dans « %s »"
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:52
 msgid "_View"
-msgstr "Afficha_ge"
+msgstr "_Affichage"
 
 #: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
@@ -11645,7 +11609,7 @@ msgstr "_Nouveau dossier..."
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Vider la corbeille"
 
@@ -11737,7 +11701,7 @@ msgstr "Marquer pour _donner suite..."
 
 #: ../mail/em-folder-view.c:1105
 msgid "_Label"
-msgstr "_Intitulé"
+msgstr "_Étiquette"
 
 #: ../mail/em-folder-view.c:1106
 msgid "_None"
@@ -11788,37 +11752,37 @@ msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Défaut"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Impossible de récupérer le message"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Créer un nouveau dossier de _recherche"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_De cette adresse"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_À cette adresse"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %s"
@@ -11900,8 +11864,8 @@ msgid ""
 "message in a practical amount of time."
 msgstr ""
 "Ce message est chiffré, mais avec un algorithme de chiffrement faible. Il "
-"sera difficile, mais pas impossible, pour un étranger de voir le contenu de "
-"ce message dans une période de temps raisonnable."
+"sera difficile, mais pas impossible, pour une tierce personne de voir le "
+"contenu de ce message dans une période de temps raisonnable."
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
@@ -11912,8 +11876,8 @@ msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
-"Ce message est chiffré. Il sera difficile pour un extérieur de voir le "
-"contenu de ce message."
+"Ce message est chiffré. Il sera difficile pour une tierce personne de voir "
+"le contenu de ce message."
 
 #: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
@@ -11926,8 +11890,8 @@ msgid ""
 "practical amount of time."
 msgstr ""
 "Ce message est chiffré avec un algorithme de chiffrement fort. Il sera "
-"vraiment difficile, pour un étranger, de voir le contenu de ce message dans "
-"une période de temps raisonnable."
+"vraiment difficile, pour une tierce personne, de voir le contenu de ce "
+"message dans une période de temps raisonnable."
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -12076,7 +12040,7 @@ msgstr "Cci"
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
-msgstr "Logiciel de messagerie"
+msgstr "Client de messagerie"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1615
@@ -12105,7 +12069,7 @@ msgstr "Groupes de discussion"
 msgid "%s attachment"
 msgstr "pièce jointe %s"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 "Impossible d'analyser le message S/MIME : erreur inconnue"
 
@@ -12121,11 +12085,11 @@ msgstr "Type de chiffrement non supporté pour multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Format de signature non supporté"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Erreur lors de la vérification de la signature"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Erreur inconnue de la vérification de la signature"
 
@@ -12152,8 +12116,8 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"L'emplacement et la hiérarchie des dossiers des boîtes à lettres ont changés "
-"depuis Evolution 1.x.\n"
+"L'emplacement et la hiérarchie des dossiers des boîtes aux lettres ont "
+"changés depuis Evolution 1.x.\n"
 "\n"
 "Veuillez patienter pendant qu'Evolution migre vos dossiers..."
 
@@ -12184,8 +12148,8 @@ msgstr ""
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
-"Impossible de créer un répertoire pour les données POP3 restées sur le "
-"serveur « %s » : %s"
+"Impossible de créer un dossier pour les données POP3 restées sur le serveur "
+"« %s » : %s"
 
 #: ../mail/em-migrate.c:2106
 #, c-format
@@ -12197,14 +12161,14 @@ msgstr ""
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
-"La création du répertoire de stockage de courriel local « %s » a échoué : %s"
+"La création du dossier de stockage de courriel local « %s » a échoué : %s"
 
 #: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
-"Impossible de créer les répertoires de stockage de courriel local sur « %"
-"s » : %s"
+"Impossible de créer les dossiers de stockage de courriel local sur « %s » : %"
+"s"
 
 #: ../mail/em-migrate.c:2731
 msgid ""
@@ -12266,20 +12230,20 @@ msgstr "Ne plus afficher ce message."
 msgid "Message Filters"
 msgstr "Filtres de message"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "message"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -12310,7 +12274,7 @@ msgstr "Couleur de surbrillance des citations"
 
 #: ../mail/evolution-mail.schemas.in.in.h:5
 msgid "Citation highlight color."
-msgstr "Couler de surbrillance des citations."
+msgstr "Couleur de surbrillance des citations."
 
 #: ../mail/evolution-mail.schemas.in.in.h:6
 msgid "Composer Window default height"
@@ -12405,7 +12369,7 @@ 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 ""
-"Si un utilisateur essaye d'ouvrir 10 message ou plus en une seule fois, lui "
+"Si un utilisateur essaye d'ouvrir 10 messages ou plus en une seule fois, lui "
 "demander si c'est réellement ce qu'il désire."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
@@ -12441,8 +12405,8 @@ msgid ""
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 "Liste des comptes connus par le client de messagerie d'Evolution. Cette "
-"liste contient des chaînes désignant les noms des sous-répertoires relatifs "
-"à /apps/evolution/mail/accounts."
+"liste contient des chaînes désignant les noms des sous-dossiers relatifs à /"
+"apps/evolution/mail/accounts."
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
@@ -12488,7 +12452,7 @@ msgstr "Enregistrer les actions des filtres"
 #: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr ""
-"Enregistrer les actions des filtres dans le fichier de journal spécifié."
+"Enregistre les actions des filtres dans le fichier de journal spécifié."
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
@@ -12585,8 +12549,8 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
-"Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
-"Cc définis."
+"Demander lors de l'envoi de messages où seuls des destinataires sans À ou Cc "
+"définis."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
@@ -12648,11 +12612,11 @@ msgstr "Correction orthographique en ligne"
 
 #: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
-msgstr "Hauteur par défaut du dialogue d'abonnements"
+msgstr "Hauteur par défaut de la fenêtre d'abonnements"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
-msgstr "Largeur par défaut du dialogue d'abonnements"
+msgstr "Largeur par défaut de la fenêtre d'abonnements"
 
 #: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
@@ -12661,11 +12625,11 @@ msgstr "Police du terminal"
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
-"La dernière fois que la corbeille a été vidée, en jours depuis l'epoch."
+"La dernière fois que la corbeille a été vidée, en jours depuis l'époque."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
-msgstr "Les polices de terminal pour l'affichage des mails"
+msgstr "Les polices de terminal pour l'affichage des messages"
 
 #: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
@@ -12680,9 +12644,9 @@ msgid ""
 "mail view."
 msgstr ""
 "Cette clé doit contenir une liste de structures XML spécifiant les en-têtes "
-"personnalisées, et s'ils doivent être affichés. Le format de structure XML "
-"est &lt;header enabled&gt; - activé si l'en-tête est affichée dans la vue du "
-"courriel."
+"personnalisées, et si elles doivent être affichées. Le format de structure "
+"XML est &lt;header enabled&gt; - activé si l'en-tête est affichée dans la "
+"vue du courriel."
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
@@ -12794,7 +12758,7 @@ msgstr "Assistant d'importation Elm d'Evolution"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
-msgstr "Importation des boîtes à lettres de Elm."
+msgstr "Importation des boîtes aux lettres de Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:83
 #: ../mail/importers/evolution-outlook-importer.c:136
@@ -12830,7 +12794,7 @@ msgstr "Veuillez patienter"
 #: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
-msgstr "Importation des boîtes à lettres"
+msgstr "Importation des boîtes aux lettres"
 
 #: ../mail/importers/mail-importer.c:376
 #, c-format
@@ -12928,7 +12892,7 @@ msgstr "Assistant d'importation Pine d'Evolution"
 
 #: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
-msgstr "Importation des boîtes à lettres de Pine."
+msgstr "Importation des boîtes aux lettres de Pine."
 
 #: ../mail/mail-autofilter.c:79
 #, c-format
@@ -13394,7 +13358,7 @@ msgstr "En-têtes des messages"
 
 #: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
-msgstr "Emplacement de la boîte à lettres"
+msgstr "Emplacement de la boîte aux lettres"
 
 #: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
@@ -13600,7 +13564,7 @@ msgid ""
 msgstr ""
 "Bienvenue dans l'assistant de configuration de messagerie d'Evolution.\n"
 "\n"
-"Cliquez sur « Suivant » pour commencer."
+"Cliquez sur « Suivant » pour commencer. "
 
 #: ../mail/mail-config.glade.h:155
 msgid "_Add Signature"
@@ -14022,7 +13986,7 @@ msgstr "Nom :"
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "Impossible de créer le répertoire de spool « %s » : %s"
+msgstr "Impossible de créer le dossier spool « %s » : %s"
 
 #: ../mail/mail-tools.c:150
 #, c-format
@@ -14077,22 +14041,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 ""
 "Un dossier non vide existe déjà sur « {1} ».\n"
 "\n"
 "Vous pouvez choisir d'ignorer ce dossier, d'écraser ou d'ajouter son "
-"contenu, ou de quitter.\n"
+"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}?"
 msgstr ""
 "Un accusé de réception a été demandé pour la lecture de « {1} ». Voulez-vous "
-"envoyer l'accusé de réception à {0} ?"
+"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."
@@ -14100,7 +14064,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."
@@ -14108,24 +14072,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?"
@@ -14133,7 +14097,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;?"
@@ -14141,82 +14105,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 répertoire de sauvegarde temporaire."
+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 répertoire de sauvegarde parce que « {1} »"
+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} » puisque il n'existe pas."
+"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 "
@@ -14226,104 +14190,104 @@ 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 répertoire « {0} »."
+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."
 msgstr ""
 "Vérifiez que votre mot de passe est orthographié correctement. Souvenez-vous "
-"que beaucoup de mots de passe sont sensibles à la casse ; le vérouillage des "
-"majuscules a peut-être été activé."
+"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."
@@ -14331,12 +14295,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."
@@ -14344,13 +14308,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."
@@ -14358,19 +14322,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 invalide"
 
-#: ../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 "
@@ -14379,50 +14343,49 @@ msgid ""
 msgstr ""
 "De nombreux systèmes de messagerie électronique ajoutent un champ "
 "« Apparently-To » aux messages qui ont uniquement des destinataires Cci. Ce "
-"champ, s'il est ajouté, ce champ listera tous les destinataires de votre "
-"message. Pour éviter cela, vous devriez ajouter au moins un destinataire À : "
-"ou Cc :"
+"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 as read in the selected folder"
 msgstr "Marquer tous les messages dans le dossier sélectionné comme lus"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Dossier manquant."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Aucune source n'a été sélectionnée."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 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:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Vérifiez les paramètres de votre compte et essayez à nouveau."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 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:76
+#: ../mail/mail.error.xml.h:75
 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 ""
-"Saisissez une adresse électronique valide dans le champ À :. Vous pouvez "
-"rechercher des adresses électroniques en cliquant sur le bouton À : à côté "
+"Saisissez une adresse électronique valide dans le champ À :. Vous pouvez "
+"rechercher des adresses électroniques en cliquant sur le bouton À : à côté "
 "de la boîte de saisie."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14434,49 +14397,49 @@ msgstr ""
 "{0}\n"
 "Envoyer quand même ?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Fournissez un nom unique pour identifier la signature."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Veuillez patienter."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 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:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Interrogation du serveur"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 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:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Accusé de réception demandé."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 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:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
-msgstr "Dossiers de recherche automatiquements mis à jours."
+msgstr "Dossiers de recherche automatiquement mis à jour."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Envoyer un accusé de réception"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Signature déjà existante"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14484,7 +14447,7 @@ msgstr ""
 "Les dossiers système sont nécessaires pour que Ximian Evolution fonctionne "
 "correctement, et ne peuvent être renommés, déplacés ou supprimés."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14501,7 +14464,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:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14515,7 +14478,7 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mis à jour."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14529,23 +14492,11 @@ msgstr ""
 "    « {1} »\n"
 "et ont été mises à jour."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Ce message a été envoyé à l'aide de l'application externe « sendmail ». "
-"Sendmail a reporté l'erreur suivante, état 67 : courriel non envoyé.\n"
-"Ce message est stocké dans le dossier Boîte d'envoi. Vérifiez que le message "
-"ne contient pas d'erreur et envoyez le à nouveau."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 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:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14554,7 +14505,7 @@ msgstr ""
 "si nécessaire, allez dans l'éditeur de dossiers de recherche\n"
 "pour l'ajouter explicitement."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14562,14 +14513,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:110
+#: ../mail/mail.error.xml.h:107
 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:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14577,11 +14528,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:112
+#: ../mail/mail.error.xml.h:109
 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:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14589,11 +14540,11 @@ msgstr ""
 "Marque tous les messages dans le dossier sélectionné, et ses sous-dossiers, "
 "comme lus."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossible de se connecter au serveur GroupWise."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14601,41 +14552,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:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Impossible de lire le fichier de licence."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Utiliser le _défaut"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Utiliser le dossier Brouillons par défaut ?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 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:120
+#: ../mail/mail.error.xml.h:117
 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:121
+#: ../mail/mail.error.xml.h:118
 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:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Vous devez nommer ce dossier de recherche."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Vous devez indiquer un dossier."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14645,28 +14596,24 @@ 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:126
+#: ../mail/mail.error.xml.h:123
 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:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Votre message, dont le sujet est « {0} », n'a pas été délivré."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "A_jouter"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "Aban_donner les modifications"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "Ne_ttoyer"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Ouvrir les messages"
 
@@ -14737,7 +14684,7 @@ msgstr "%d %b %Y"
 msgid "Messages"
 msgstr "Messages"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
@@ -14868,11 +14815,11 @@ msgstr "_Redémarrer Evolution après la restauration"
 
 #: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
-msgstr "Sauvegarder le répertoire d'Evolution"
+msgstr "Sauvegarder le dossier d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
-msgstr "Restaurer le répertoire d'Evolution"
+msgstr "Restaurer le dossier d'Evolution"
 
 #: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
@@ -15064,11 +15011,11 @@ msgstr ""
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "Client de messagerie par défaut"
+msgstr "Client de messagerie par défaut "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Voulez-vous faire d'Evolution votre client de messagerie par défaut ?"
+msgstr "Voulez-vous faire d'Evolution votre client de messagerie par défaut ?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
@@ -15190,24 +15137,24 @@ msgstr "Taille des dossiers"
 msgid "Exchange Settings"
 msgstr "Paramètres d'Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "URL _OWA :"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "S'a_uthentifier"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Type d'authentification"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
-msgstr "_Vérifier les types supportés "
+msgstr "_Vérifier les types supportés"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15392,14 +15339,14 @@ msgstr "Arborescence des dossiers Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Se désabonner du dossier..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Voulez-vous vraiment vous désabonner du dossier « %s » ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Se désabonner du dossier « %s »"
@@ -15566,7 +15513,7 @@ msgstr "Impossible d'obtenir les permissions du dossier pour les délégués."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not find Exchange Web Storage System."
-msgstr "Impossible de trouver le système de stockage web Exchange."
+msgstr "Impossible de trouver le système de stockage Web Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
 msgid "Could not locate server {0}."
@@ -15795,8 +15742,8 @@ msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"Votre utilisation actuelle est {0} Kio. Essayez de libérer un peu d'espace en "
-"supprimant quelques courriels."
+"Votre utilisation actuelle est {0} Kio. Essayez de libérer un peu d'espace "
+"en supprimant quelques courriels."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
@@ -15848,24 +15795,24 @@ msgstr "Désabonnement au dossier « %s »"
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
 msgstr ""
-"Autorise la désinscription de dossiers de courriel dans l'arborescence des "
+"Autorise la désabonnement de dossiers de courriel dans l'arborescence des "
 "dossiers du menu contextuel."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Se désabonner des dossiers"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Liste de contrôle"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "Groupwise Account Setup"
-msgstr "Configuration d'un compte Groupwise"
+msgstr "Configuration d'un compte GroupWise"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "Paramètres de pourriel"
+msgstr "Paramètres du pourriel"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
@@ -15902,7 +15849,7 @@ msgstr "_Liste des pourriels"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
-msgstr "Ajouter les options d'envoi au messages groupwise"
+msgstr "Ajouter les options d'envoi au messages GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
@@ -15912,11 +15859,11 @@ msgstr "Options d'envoi"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
 msgid "A plugin for the features in Groupwise accounts."
-msgstr "Un greffon pour les fonctionnalités des comptes Groupwise."
+msgstr "Un greffon pour les fonctionnalités des comptes GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
-msgstr "Fonctionnalités de Groupwise"
+msgstr "Fonctionnalités de GroupWise"
 
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
@@ -16031,11 +15978,11 @@ msgstr "_Identification sur le proxy..."
 #: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
-"L'onglet proxy sera accessible seulement quand le compte sera en ligne."
+"L'onglet proxy sera accessible seulement lorsque le compte sera en ligne."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "L'onglet proxy sera accessible seulement quand le compte sera actif."
+msgstr "L'onglet proxy sera accessible seulement lorsque le compte sera actif."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -16111,27 +16058,27 @@ msgstr "Synchronisation avec l'iPod"
 
 #: ../plugins/ipod-sync/sync.c:158
 msgid "No output directory!"
-msgstr "Aucun répertoire de sortie"
+msgstr "Aucun répertoire de sortie !"
 
 #: ../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 ""
-"Le répertoire de sortie n'a pas été trouvé sur l'iPod. Veuillez-vous assurer "
-"que l'iPod a été configuré correctement et essayez à nouveau."
+"Le répertoire de sortie n'a pas été trouvé sur l'iPod ! Veuillez-vous "
+"assurer que l'iPod a été configuré correctement et essayez à nouveau."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
-msgstr "Impossible d'exporter les données."
+msgstr "Impossible d'exporter les données !"
 
 #: ../plugins/ipod-sync/sync.c:203
 msgid "Exporting data failed."
-msgstr "Impossible d'exporter les données."
+msgstr "L'export des données a échoué."
 
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
-msgstr "Impossible d'ouvrir le carnet d'adresses."
+msgstr "Impossible d'ouvrir le carnet d'adresses !"
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
@@ -16141,7 +16088,7 @@ msgstr ""
 
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
-msgstr "Impossible d'ouvrir le calendrier/tâche."
+msgstr "Impossible d'ouvrir le calendrier/tâche !"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
@@ -16514,7 +16461,7 @@ msgstr "<b>%s</b> a proposé les changements suivants à la réunion :"
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr ""
-"<b>%s</b> par l'intermédaire de %s a refusé les changements suivants à la "
+"<b>%s</b> par l'intermédiaire de %s a refusé les changements suivants à la "
 "réunion :"
 
 #: ../plugins/itip-formatter/itip-view.c:385
@@ -16811,8 +16758,8 @@ msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
 msgstr ""
-"Fournit les actions communes aux listes de diffusion (subscribe, "
-"unsubscribe, etc)."
+"Fournit les actions communes aux listes de diffusion (abonnement, "
+"désabonnement, etc)."
 
 #: ../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
@@ -16879,10 +16826,10 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"L'action ne peut pas être effectué. Cela signifie que l'en-tête pour cette "
+"L'action ne peut pas être effectuée. Cela signifie que l'en-tête pour cette "
 "action ne contient pas d'actions que nous pouvons traiter.\n"
 "\n"
-"En-tête : {0}"
+"En-tête : {0}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
 msgid ""
@@ -16890,7 +16837,7 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
-"L'en-tête de ce message est malformé et ne peut pas être traité.\n"
+"L'en-tête de ce message est non conforme et ne peut pas être traité.\n"
 "\n"
 "En-tête : {1}"
 
@@ -16938,7 +16885,7 @@ msgstr "S'inscrire à la liste de diffusion à laquelle le message appartient"
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr ""
-"Se désinscrire de la liste de diffusion à laquelle le message appartient"
+"Se désabonner de la liste de diffusion à laquelle le message appartient"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -16950,7 +16897,7 @@ msgstr "Marquer tous les me_ssages comme lus"
 
 #: ../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 "Utilisé pour marqué tous les messages d'un dossier comme lu"
+msgstr "Utilisé pour marquer tous les messages d'un dossier comme lu"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -17083,11 +17030,11 @@ msgstr "Profiler d'Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
 msgid "Writes a log of profiling data events."
-msgstr "Écrit un historique de données des évènements tracés."
+msgstr "Écrit un historique de données des événements tracés."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Allows calendars to be published to the web"
-msgstr "Autorise les calendriers a être publiés sur le web"
+msgstr "Autorise les calendriers a être publiés sur le Web"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
@@ -17155,7 +17102,7 @@ msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
-msgstr "_Type de service : "
+msgstr "_Type de service :"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
@@ -17375,7 +17322,7 @@ msgstr ""
 "connecter Evolution à vos comptes de messagerie et d'importer les fichiers "
 "provenant d'autres applications.\n"
 "\n"
-"Veuillez cliquer sur le bouton « Suivant » pour continuer."
+"Veuillez cliquer sur le bouton « Suivant » pour continuer. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
 #: ../shell/e-shell-importer.c:147
@@ -17399,7 +17346,7 @@ msgstr "Indique si le fil de discussion doit référer au sujet."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
-msgstr "Enfilage selon le sujet"
+msgstr "Enfilade selon le sujet"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
@@ -17443,41 +17390,45 @@ msgid "Default window height"
 msgstr "Hauteur par défaut de la fenêtre"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "État par défaut de la fenêtre"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Largeur par défaut de la fenêtre"
 
-#: ../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 "ID ou alias du composant à afficher par défaut au démarrage."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Dernière configuration de version d'Evolution mise à jour"
 
-#: ../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 ""
 "Liste des chemins des dossiers à synchroniser sur le disque pour "
 "l'utilisation hors-ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
-msgstr "Paramétrage de l'imprimante"
+msgstr "Paramètres de l'imprimante"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Le panneau latéral est visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Ignorer les dialogues d'avertissement de développement"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Démarrer en mode hors ligne"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17485,19 +17436,19 @@ msgstr ""
 "La configuration de la version d'Evolution, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Hauteur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Largeur par défaut de la fenêtre principale, en pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Largeur par défaut du panneau latéral, en pixels"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17505,7 +17456,7 @@ msgstr ""
 "La dernière version d'Evolution mise à jour, avec les niveaux /major/minor/"
 "configuration (par ex. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17516,40 +17467,44 @@ msgstr ""
 "« toolbar » est choisi, le style des boutons est fixé par le réglage GNOME "
 "de la barre d'outils."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
-msgstr "Barre d'outil visible"
+msgstr "Barre d'outils visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indique si Evolution doit démarrer en mode hors-ligne plutôt qu'en mode "
 "connecté."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Indique si la fenêtre doit être maximisée."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Indique si le panneau latéral doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indique si la barre d'outil doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indique si les dialogues d'avertissement de la version de développement "
 "d'Evolution sont ignorés."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indique si la fenêtre de boutons doit être visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Style des boutons de la fenêtre"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Les boutons de la fenêtre sont visibles"
 
@@ -17668,7 +17623,7 @@ msgstr "Bug buddy ne peut pas être exécuté."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Mainteneur :\n"
@@ -17686,37 +17641,39 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com> pour Novell(tm)\n"
 "Vincent Carriere <carriere_vincent@yahoo.fr>\n"
 "Vincent Untz <vuntz@gnome.org>\n"
-"Stéphane Raimbault <stephane.raimbault@free.fr>"
+"Stéphane Raimbault <stephane.raimbault@free.fr>\n"
+"Robert-André Mauchin <zebob.m@gmail.com>\n"
+"Jonathan Ernst <jonathan@ernstfamily.ch>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "Travailler _en ligne"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Travailler _hors ligne"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "Evolution est actuellement en ligne. Cliquez sur ce bouton pour travailler "
 "hors ligne."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution est en train de passer hors ligne."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "Evolution est actuellement hors ligne. Cliquez sur ce bouton pour travailler "
 "en ligne."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Changer pour %s"
@@ -17764,7 +17721,7 @@ msgstr "Créer une nouveau élément de test"
 
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Cliquez sur « Importer » pour commencer à importer le fichier."
+msgstr "Cliquez sur « Importer » pour commencer à importer le fichier. "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -17801,7 +17758,7 @@ msgstr ""
 "d'importation de fichiers externes dans Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17835,12 +17792,12 @@ msgstr ""
 "\n"
 "Si vous découvrez des anomalies, veuillez nous les rapporter sur\n"
 "bugzilla.gnome.org. Ce produit est fournit sans aucune garantie et\n"
-"n'est pas destiné à des individus sujets à de violents accès de colère !\n"
+"n'est pas destiné à des individus sujets à de violents accès de colère.\n"
 "\n"
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17848,35 +17805,35 @@ msgstr ""
 "Merci,\n"
 "L'équipe d'Evolution\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ne plus afficher le message"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcer la remigration depuis Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
-msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
+msgstr "Envoyer la sortie de débogage de tous les composants vers un fichier."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Désactiver le chargement des extensions."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17929,7 +17886,7 @@ msgid ""
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
 msgstr ""
-"Le contenu intégral du répertoire « evolution » est sur le point d'être "
+"Le contenu intégral du dossier « evolution » est sur le point d'être "
 "définitivement supprimé.\n"
 "\n"
 "Il est conseillé que vous vérifiez manuellement que tous vos courriels, "
@@ -17952,9 +17909,9 @@ msgstr ""
 "La version précédente d'Evolution stockait les données à un emplacement "
 "différent.\n"
 "\n"
-"Si vous choisissez de supprimer ces données, le contenu intégral du "
-"répertoire « evolution » sera définitivement supprimé. Si vous choisissez de "
-"conserver ces données, alors vous pourrez supprimer manuellement le contenu "
+"Si vous choisissez de supprimer ces données, le contenu intégral du dossier "
+"« evolution » sera définitivement supprimé. Si vous choisissez de conserver "
+"ces données, alors vous pourrez supprimer manuellement le contenu "
 "d'« evolution » à votre convenance.\n"
 
 #: ../shell/shell.error.xml.h:19
@@ -17969,11 +17926,11 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Mettre à jour vos données et vos paramètres nécessite plus de {0} d'espace "
+"Mettre à jour vos données et vos paramètres nécessite jusqu'à {0} d'espace "
 "disque, mais vous disposez actuellement de seulement {1} disponibles.\n"
 "\n"
-"Vous devez libérer d'avantage d'espace dans votre répertoire personnel avant "
-"de pouvoir continuer."
+"Vous devez libérer d'avantage d'espace dans votre dossier personnel avant de "
+"pouvoir continuer."
 
 #: ../shell/shell.error.xml.h:23
 msgid ""
@@ -17984,7 +17941,7 @@ msgstr ""
 "Votre configuration système ne correspond pas à votre configuration "
 "d'Evolution.\n"
 "\n"
-"Cliquez sur aide pour les détails."
+"Cliquez sur aide pour les détails"
 
 #: ../shell/shell.error.xml.h:26
 msgid ""
@@ -18044,7 +18001,7 @@ msgid ""
 msgstr ""
 "Parce que vous faites confiance à l'autorité de certification qui a émis ce "
 "certificat alors vous faites confiance en l'authenticité de ce certificat à "
-"moins que quelque chose indique le contraire ici"
+"moins que quelque chose n'indique le contraire ici"
 
 #: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
@@ -18054,7 +18011,7 @@ msgid ""
 msgstr ""
 "Parce que vous ne faites pas confiance à l'autorité de certification qui a "
 "émis ce certificat alors vous ne faites pas confiance en l'authenticité de "
-"ce certificat à moins que quelque chose indique le contraire ici"
+"ce certificat à moins que quelque chose n'indique le contraire ici"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
@@ -18185,7 +18142,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 "Avant de croire cette autorité de certification (AC) pour quoique ce soit, "
-"vous devriez vérifie son certificat et sa politique est ses procédures (si "
+"vous devriez vérifier son certificat, sa politique et ses procédures (si "
 "elles sont disponibles)."
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
@@ -18286,7 +18243,7 @@ msgstr "Faire confiance à ce CA pour identifier les développeurs de logiciel."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr "Faire confiance à ce CA pour identifier les sites web."
+msgstr "Faire confiance à ce CA pour identifier les sites Web."
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
@@ -18721,7 +18678,7 @@ msgstr "_Déplacer le contact vers..."
 
 #: ../ui/evolution-addressbook.xml.h:54
 msgid "_Move Folder Contacts To"
-msgstr "_Déplacer le dossier de contacts vers..."
+msgstr "_Déplacer le dossier de contacts vers"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
@@ -18937,11 +18894,11 @@ msgstr "_Fichier"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
-msgstr "_Aide"
+msgstr "Aid_e"
 
 #: ../ui/evolution-editor.xml.h:20
 msgid "_Insert"
-msgstr "_Insérer"
+msgstr "_Insertion"
 
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
@@ -18972,7 +18929,7 @@ msgstr "Classer comme public"
 
 #: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
-msgstr "Cliquez ici pour définir ou annuler les alarmes de cet évènement"
+msgstr "Cliquez ici pour définir ou annuler les alarmes de cet événement"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
@@ -20150,7 +20107,7 @@ msgstr "Envoyer / _Recevoir"
 
 #: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
-msgstr "Envoie les courriels en attente et récupére les nouveaux"
+msgstr "Envoie les courriels en attente et récupère les nouveaux"
 
 #: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
@@ -20182,7 +20139,7 @@ msgstr "Soumettre un _rapport d'anomalie"
 
 #: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
-msgstr "Soumettre un rapport d'anomalie en utilisant Bug Buddy."
+msgstr "Soumettre un rapport d'anomalie en utilisant Bug Buddy"
 
 #: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
@@ -20282,7 +20239,7 @@ msgstr "Vue hebdomadaire de _travail"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As _Sent Folder"
-msgstr "Comme dossier _Envoyés"
+msgstr "Comme dossier _Envoyé"
 
 #: ../views/mail/galview.xml.h:2
 msgid "By S_tatus"
@@ -20373,11 +20330,11 @@ msgid "_Edit..."
 msgstr "Édit_er..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
-msgstr "Table"
+msgstr "Tableau"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 msgid "Instance"
@@ -20428,7 +20385,7 @@ msgstr "Définir une nouvelle vue"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:2
 msgid "Name of new view:"
-msgstr "Nom de la nouvelle vue :"
+msgstr "Nom de la nouvelle vue :"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
 msgid "Type of View"
@@ -20436,7 +20393,7 @@ msgstr "Type de la vue"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
-msgstr "Type de la vue :"
+msgstr "Type de la vue :"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
@@ -20528,7 +20485,7 @@ msgstr "La date doit être dans le format : %s"
 
 #: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "La pourcentage doit être compris entre 0 et 100 inclus."
+msgstr "La pourcentage doit être compris entre 0 et 100 inclus"
 
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
@@ -20611,7 +20568,7 @@ msgstr "Codage des caractères"
 
 #: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
-msgstr "Saisissez le jeu de caractères à utiliser."
+msgstr "Saisissez le jeu de caractères à utiliser"
 
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
@@ -20820,12 +20777,12 @@ msgstr "Texte"
 msgid "Find _Now"
 msgstr "Rechercher _maintenant"
 
-#: ../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 "Rangée de curseurs"
 
-#: ../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 "Colonne de curseurs"
@@ -20984,15 +20941,15 @@ msgstr "Cliquez ici pour aller à l'URL"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
-msgstr "Editer la liste maître des catégories "
+msgstr "Éditer la liste maître des catégories..."
 
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "Item(s) belong to these _categories:"
-msgstr "Éléments appartenant à ces _catégories :"
+msgstr "Éléments appartenant à ces _catégories :"
 
 #: ../widgets/misc/gal-categories.glade.h:4
 msgid "_Available Categories:"
-msgstr "_Catégories disponibles :"
+msgstr "_Catégories disponibles :"
 
 #: ../widgets/misc/gal-categories.glade.h:5
 msgid "categories"
@@ -21079,7 +21036,7 @@ msgstr "_Monter"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
 msgid "Sh_ow these fields in order:"
-msgstr "A_fficher ces champs dans l'ordre :"
+msgstr "A_fficher ces champs dans l'ordre :"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
@@ -21156,14 +21113,14 @@ msgstr "_Afficher ces champs dans l'ordre :"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Code Glisser/Déposer"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "En-tête complet"
 
@@ -21180,22 +21137,28 @@ msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr ""
-"Pour ajouter une colonne à votre table, glissez là\n"
+"Pour ajouter une colonne à votre table, glissez-la\n"
 "à l'emplacement où elle doit apparaître."
 
-#: ../widgets/table/e-table-group-container.c:345
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:346
+#, c-format
 msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
-msgstr[0] "%s : %s (%d élément)"
-msgstr[1] "%s : %s (%d élément)"
+msgstr "%s : %s (%d élément)"
+
+#: ../widgets/table/e-table-group-container.c:347
+#, c-format
+msgid "%s : %s (%d items)"
+msgstr "%s : %s (%d éléments)"
 
-#: ../widgets/table/e-table-group-container.c:351
-#, fuzzy, c-format
+#: ../widgets/table/e-table-group-container.c:352
+#, c-format
 msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d élément)"
-msgstr[1] "%s (%d élément)"
+msgstr "%s (%d élément)"
+
+#: ../widgets/table/e-table-group-container.c:353
+#, c-format
+msgid "%s (%d items)"
+msgstr "%s (%d éléments)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -21297,7 +21260,7 @@ msgstr "Grouper par ce champ"
 
 #: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
-msgstr "Grouper par cette boîte"
+msgstr "Grouper par boîte"
 
 #: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
@@ -21323,17 +21286,17 @@ msgstr "Format des colonnes..."
 msgid "Customize Current View..."
 msgstr "Personnaliser la vue en cours..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Jeu de police"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Info de tri"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21511,9 +21474,3 @@ msgstr "Contexte des méthodes de saisie"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Poignée du menu contextuel"
-
-#~ msgid "%s : %s (%d items)"
-#~ msgstr "%s : %s (%d éléments)"
-
-#~ msgid "%s (%d items)"
-#~ msgstr "%s (%d éléments)"
diff --git a/po/gl.po b/po/gl.po
index 1d41d3f28e..d041699757 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -40,8 +40,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-21 22:13+0200\n"
-"PO-Revision-Date: 2006-05-21 22:20+0200\n"
+"POT-Creation-Date: 2006-05-19 09:57+0200\n"
+"PO-Revision-Date: 2006-05-19 09:58+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"
@@ -52,7 +52,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "libro de enderezos de evolution"
 
@@ -66,12 +66,12 @@ msgstr "Novo Contacto"
 msgid "New Contact List"
 msgstr "Nova Lista de Contactos"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "o cartafol de libretas de enderezos %s ten %d tarxeta"
-msgstr[1] "o cartafol de libretas de enderezos %s ten %d tarxetas"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "o cartafol de libretas de enderezos ten %d tarxeta"
+msgstr[1] "o cartafol de libretas de enderezos ten %d tarxetas"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -90,32 +90,32 @@ msgstr "Contactos: "
 msgid "evolution minicard"
 msgstr "minitarxeta de evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Ten alarmas."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Ten recorrencias."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "É unha xuntanza."
 
-#: ../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 "Evento de calendario: O resumo é %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 "Evento de calendario: Sen resumo."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "vista de eventos do calendario"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Obter o foco"
 
@@ -186,10 +186,8 @@ msgstr "%A, %d de %b de %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
@@ -220,10 +218,8 @@ msgstr "%d de %b de %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -580,7 +576,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:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -643,7 +639,7 @@ msgstr "Neste computador"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Persoal"
 
@@ -703,9 +699,9 @@ msgstr "Copiar o contido do libro localmente para operación desconectada"
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
@@ -746,12 +742,12 @@ msgid "Address Book Properties"
 msgstr "Propiedades do libro de enderezos"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
@@ -827,34 +823,34 @@ msgstr "Os nomes de cartafoles non poden conter o carácter '/'"
 msgid "A Folder with this name already exists"
 msgstr "Un cartafol con este nome xa existe"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Novo Libro de Enderezos"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../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 "_Borrar"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Gardar como VCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Selector de orixe de contactos"
 
@@ -863,7 +859,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accedendo ao servidor LDAP anonimamente"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticar.\n"
 
@@ -914,7 +910,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI para o cartafol usado por última vez no diálogo de selección de nomes."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Posición vertical do panel"
 
@@ -1243,6 +1239,7 @@ msgstr "minutos"
 #: ../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
@@ -1292,7 +1289,7 @@ msgstr "<b>Traballo</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
@@ -1349,7 +1346,7 @@ msgstr "Teléfono"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Traballo"
@@ -1377,8 +1374,10 @@ msgid "_Calendar:"
 msgstr "_Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Categorías..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorías"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1465,8 +1464,8 @@ msgid "_Zip/Postal Code:"
 msgstr "_Código Postal: "
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Enderezo"
 
@@ -2460,7 +2459,7 @@ msgstr "Cimbabue"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Nome:"
@@ -2471,7 +2470,7 @@ msgstr "Mensaxería instantánea AOL"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2481,7 +2480,7 @@ msgstr "Mensaxería Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2511,17 +2510,17 @@ msgid "Other"
 msgstr "Outro"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2555,15 +2554,15 @@ msgstr "Modificado"
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2571,23 +2570,23 @@ msgstr ""
 "Os datos do contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ten un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ten un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' está baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2615,9 +2614,9 @@ msgstr "_Seleccione o Libro de Enderezos"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
-"Está seguro de que quere\n"
+"¿Está seguro de que quere\n"
 "borrar a lista de contactos (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
@@ -2632,9 +2631,9 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
-"Está seguro de que quere\n"
+"¿Está seguro de que quere\n"
 "borrar o contacto (%s)?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
@@ -2743,7 +2742,6 @@ msgid "_IM Service:"
 msgstr "Servizo M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2930,8 +2928,8 @@ msgstr "Gardar como VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Abrir"
@@ -2988,13 +2986,13 @@ msgstr "Cor_tar"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:986 ../mail/em-folder-view.c:1082
-#: ../mail/message-list.c:1742 ../ui/evolution-addressbook.xml.h:46
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
@@ -3055,7 +3053,7 @@ msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Correo Electrónico"
@@ -3105,7 +3103,7 @@ msgid "Manager"
 msgstr "Xefe"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
@@ -3114,7 +3112,7 @@ msgid "Nickname"
 msgstr "Alcume"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Nota"
 
@@ -3123,7 +3121,7 @@ msgid "Office"
 msgstr "Oficina"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organización"
 
@@ -3301,83 +3299,65 @@ msgstr "Seleccionado"
 msgid "Has Cursor"
 msgstr "Ten cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Abrir Ligazón no Navegador"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2464
-msgid "_Copy Link Location"
-msgstr "_Copiar Localización da Ligazón"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Enviar unha mensaxe nova a ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Copiar enderezo de _correo-e"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(mapa)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Listar Membros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Posición"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Video Conferencing"
 msgstr "Videoconferencia"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
 msgid "WWW"
 msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
 msgid "Blog"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "persoal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Páxina persoal"
 
@@ -3766,12 +3746,12 @@ msgstr "Importador de VCard de Evolution"
 msgid "Print envelope"
 msgstr "Imprimir sobre"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimi-los contactos"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3924,7 +3904,7 @@ msgstr "Sombreado"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4145,17 +4125,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Seguro que quere borrar esta cita?"
 
 #: ../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 "Seguro que quere borrar esta entrada do diario?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Seguro que quere borrar esta xuntanza?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Seguro que quere borrar esta tarefa?"
 
@@ -4431,8 +4408,8 @@ msgstr "Dividir acontecementos de días múltiples:"
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Non se puido iniciar o servidor evolution-data-server"
 
@@ -4471,7 +4448,7 @@ msgid "Calendar and Tasks"
 msgstr "Calendario e Tarefas"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Calendarios"
 
@@ -4521,7 +4498,7 @@ msgstr "Notas"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4573,8 +4550,8 @@ msgstr "Citas"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1609
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4590,7 +4567,7 @@ msgstr "_Pospoñer o aviso:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4607,31 +4584,32 @@ msgstr "_Pospoñer"
 msgid "location of appointment"
 msgstr "lugar da cita"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Non hai resumo dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1454
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Non hai información do lugar dispoñible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1523
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ten %d alarmas."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1689
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1693
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4643,7 +4621,7 @@ msgstr ""
 "configurado para enviar unha mensaxe de correo-e. No seu lugar\n"
 "Evolution amosará un diálogo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1721
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4660,7 +4638,7 @@ msgstr ""
 "\n"
 "Está seguro de quere executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1735
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo sobre este programa."
 
@@ -4760,106 +4738,94 @@ msgid "Default reminder value"
 msgstr "Valor predeterminado do recordatorio"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Degradado de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Transparencia de eventos"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "URLs do servidor de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "URL do modelo de dispoñibilidade"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Degradado dos eventos nas vistas de calendario."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Agocha-las tarefas completadas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Agochar unidades da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Agochar o valor da tarefa"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Posición horizontal do panel"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora na que remata a xornada laboral, en formato de vintecatro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "Hora á que comeza a xornada laboral, en formato de vintecatro horas, de 0 a "
 "23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Os intervalos de tempo amosados nas vistas diarias e semanais, en minutos."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Hora da última alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lista de URLs do servidor para publicación de dispoñibilidade."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Liña de Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Cor da liña de Marcus Bains - Vista de día"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Cor da liña de Marcus Bains - Barra de tempo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuto no que remata a xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuto no que comeza a xornada laboral, de 0 a 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Posición do panel horizontal da vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Posición do panel vertical na vista mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Número de unidades para determinar un recordatorio predeterminado."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Número de unidades para determinar cándo agochar tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas fora de prazo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4867,7 +4833,7 @@ msgstr ""
 "Posición do panel horizontal, entre a vista e a datas do navegador do "
 "calendario e a lista de tarefas cando non está na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4875,7 +4841,7 @@ msgstr ""
 "Posición do panel horizontal, entre a vista e o navegador de datas do "
 "calendario e a lista de tarefas na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4883,7 +4849,7 @@ msgstr ""
 "Posición do panel vertical, entre a lista de tarefas e o panel de vista "
 "previa de tarefas, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4891,7 +4857,7 @@ msgstr ""
 "Posición do panel vertical, entre a vista e o navegador do calendario e a "
 "lista de tarefas na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4899,65 +4865,65 @@ msgstr ""
 "Posición do panel vertical, entre a vista e o navegador de datas do "
 "calendario e a lista de tarefas cando non está na vista mensual, en píxeles."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programas que se permite que sexan executados polas alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Amosar o campo Rol no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Amosar os prazos finais das citas nas vistas semanal e mensual"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Amosar o campo categorías no editor de eventos/xuntanzas/tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Amosar o visor da alarma nunha bandexa de notificación"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Amosar o campo estado no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Amosar o panel de \"Vista previa\""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Amosar o panel de \"Vista previa\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Amosar o campo fuso horario no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Amosa-los números das semanas no navegador de datas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Posición do panel vertical de tarefas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4967,7 +4933,7 @@ msgstr ""
 "reemprázase pola parte de usuario do enderezo de correo e %d reemprázase "
 "polo dominio."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4976,61 +4942,55 @@ msgstr ""
 "calendario, coma unha localización sen traslación da base de datos de "
 "franxas horarias Olsen, como en \"America/New York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Divisións horarias"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "A hora na que a última alarma sonou, en time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr "Transparencia dos eventos nas vistas de calendario (Un valor entre 0 e 10, opaco por defecto)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Formato de hora en vintecatro horas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para o recordatorio predeterminado, \"minutes\", \"hours\" ou \"days"
 "\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Unidades para determinar cándo agochar tarefas, \"minutes\", \"hours\" or "
 "\"days\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Comezo da semana"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "O día no que comeza a semana, desde o Domingo (0) ata o Sábado (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Indica se se debe usar ou non a bandexa de notificación para amosar alarmas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Indica se se debe pedir confirmación ao borrar unha cita ou tarefa."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Indica se se debe pedir confirmación ao compactar citas ou tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5038,77 +4998,77 @@ msgstr ""
 "Indica se se deben comprimir os fins de semana, o cal pon ao Sábado e ao "
 "Domingo no mesmo espazo que un día laborabel."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr ""
 "Indica se se debe amosar a hora de finalización dos acontecementos nas "
 "vistas semanais e mensuais."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Indica se debe debuxar a liña Marcus Bains (liña á hora actual) no "
 "calendario."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Indica se debe agochar as tarefas rematadas na vista de tarefas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Indica se debe establecer un recordatorio predeterminado para as citas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo RSVP no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Indica se debe amosar o campo categorías no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo rol no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo estado no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr ""
 "Indica se debe amosar as horas en formato de vintecatro horas en vez de usar "
 "am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Indica se debe amosar o campo fuso horario no editor de eventos/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Indica se debe amosar o campo tipo no editor de eventos/tarefas/xuntanzas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Indica se debe amosar os números da semana no navegador de datas."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Días laborables"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Hora de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Minuto de finalización da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Hora de comezo da xornada laboral"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Minuto de comezo da xornada laboral"
 
@@ -5141,7 +5101,7 @@ msgstr "Imprimir"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5210,59 +5170,59 @@ msgstr "Fallou ao actualizar calendarios."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Non se puido abrir o calendario '%s' para crear acontecementos e xuntanzas"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Non hai un calendario dispoñible para crear acontecementos e xuntanzas"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Selector de orixe do calendario"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nova xuntanza"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "X_untanza"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Crea unha solicitude de reunión nova"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cita para todo o día nova"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "_Cita para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Crea unha cita nova para todo o día"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
@@ -5423,18 +5383,19 @@ msgstr "Alarmas"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "_Suxerir que se amose o anexo automaticamente"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Suxerir que se amose o anexo automaticamente"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro(s)"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Propiedades de adxuntos"
@@ -5443,19 +5404,19 @@ msgstr "Propiedades de adxuntos"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Descrición:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Nome do ficheiro:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Tipo MIME:"
@@ -5519,7 +5480,7 @@ msgid "Display"
 msgstr "Amosar"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Dispoñibilidade"
@@ -5617,7 +5578,7 @@ msgid "Thursday"
 msgstr "Xoves"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
@@ -5707,43 +5668,43 @@ msgid "before every appointment"
 msgstr "antes de cada cita"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Cop_iar o contido do calendario localmente para operación desconectada"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Copiar o contido do calendario localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Cop_iar o contido da lista de tarefas localmente para operación desconectada"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Copiar o contido da lista de tarefas localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Copia_r o contido da lista de notas localmente para operación desconectada"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Copiar o contido da lista de notas localmente para operación desconectada"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Lista de notas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propiedades do calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Novo calendario"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propiedades de lista de tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nova Lista de Notas"
@@ -5867,13 +5828,13 @@ msgstr[0] "Mensaxe adxunta"
 msgstr[1] "%d mensaxes adxuntas"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
@@ -5893,7 +5854,7 @@ msgid "Hide Attachment _Bar"
 msgstr "Agochar _barra de adxuntos"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Amosar _barra de adxuntos"
 
@@ -5911,7 +5872,7 @@ msgstr "Elimina_r"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propiedades"
@@ -5922,70 +5883,70 @@ msgstr "_Propiedades"
 msgid "_Add attachment..."
 msgstr "_Engadir anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1469
-#: ../mail/em-format-html-display.c:2068
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Amosar adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Prema a tecla de espazo para cambiar a barra de adxuntos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2077
-#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/comp-editor.c:2126
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Xuntanza - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2085
-#: ../calendar/gui/dialogs/comp-editor.c:2128
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2089
-#: ../calendar/gui/dialogs/comp-editor.c:2132
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa asignada - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2147
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2655
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
-#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:399
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2744
-#: ../calendar/gui/dialogs/comp-editor.c:2798
-#: ../calendar/gui/dialogs/comp-editor.c:2822
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Os trocos efectuados a este elemento poden descartarse se chega unha "
 "actualización por correo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Imposible usar a versión actual!"
 
@@ -6001,10 +5962,6 @@ msgstr "Non se puido abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é de só lectura"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Borrar este elmentos de tódolos outros buzóns?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento non se puido borrar debido a un erro de corba"
@@ -6066,11 +6023,11 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "_Cita"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Recorrencia"
@@ -6086,7 +6043,7 @@ msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6237,12 +6194,16 @@ msgstr "D_escrición:"
 msgid "Event Description"
 msgstr "Descrición do evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Lugar:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Alarma"
 
@@ -6318,7 +6279,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -6605,14 +6566,14 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Completada"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
@@ -6627,14 +6588,14 @@ msgstr "En Progreso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
@@ -6830,7 +6791,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador descoñecido"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2827
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -6913,7 +6874,7 @@ msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupado"
 
@@ -6927,17 +6888,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Si"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Non"
@@ -6948,21 +6909,21 @@ msgstr "Non"
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Recorrendo"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Asignada"
 
@@ -6970,7 +6931,7 @@ msgstr "Asignada"
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1916
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
 
@@ -6979,9 +6940,9 @@ msgstr "Seleccione o cartafol onde gardar os adxuntos seleccionados..."
 msgid "untitled_image.%s"
 msgstr "imaxe_sen-título.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
@@ -7048,25 +7009,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Borrando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Actualizando obxectos"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir páxina _web"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7074,44 +7035,44 @@ msgstr "Abrir páxina _web"
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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 "Co_rtar"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Pegar"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Asignar Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Remitir como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas seleccionadas como Completas"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
@@ -7146,105 +7107,105 @@ msgstr "Data de Inicio"
 msgid "Task sort"
 msgstr "Ordenamento das tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Movendo elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando elementos"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nova _xuntanza"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Vista Actual"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Seleccionar _hoxe"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Seleccionar data..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar a un calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendario..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Concertar Xuntanza..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Remitir como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta Ocorrencia _Movible"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2182
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2186
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2202 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Localización: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2233
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -7274,7 +7235,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
@@ -7285,21 +7246,19 @@ msgstr "%02i divisións de minuto"
 #. 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7410,7 +7369,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7423,7 +7382,7 @@ msgstr "Aceptado provisionalmente"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7756,63 +7715,63 @@ msgid "Resources"
 msgstr "Recursos"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Cuarto"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Presidencia"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Precisa dunha Acción"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 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/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7823,14 +7782,14 @@ msgstr "Delegado"
 msgid "Attendee                          "
 msgstr "Participante                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "En Progreso"
 
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -7838,78 +7797,78 @@ msgstr "%A, %d de %B de %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sen Información"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Par_ticipantes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pcións"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Amosar _só as horas de traballo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Amozar sen _ampliación"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Actualizar dispoñibilidade"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Tódalas persoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Tódalas _persoas e un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Persoas _requiridas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Persoas requiridas e _un recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
@@ -7977,8 +7936,7 @@ msgstr "Seleccionar Fuso Horario"
 #. 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d de %b"
 
@@ -8542,7 +8500,7 @@ msgstr "L_ista de Tarefas"
 msgid "Create a new task list"
 msgstr "Crear unha nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8554,11 +8512,11 @@ msgstr ""
 "\n"
 "Eliminar realmente estas tarefas?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir tarefas"
 
@@ -10153,7 +10111,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra de adxuntos"
 
@@ -10174,15 +10132,15 @@ msgstr "Non se pode adxuntar o ficheiro %s: %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Non se pode adxuntar o ficheiro %s: non é un ficheiro regular"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Destino onde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Prema aquí para o libro de enderezos"
 
@@ -10193,45 +10151,45 @@ msgstr "Prema aquí para o libro de enderezos"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:622
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "_Responder-A:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:629
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:636
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-msg-composer-hdrs.c:645
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:649
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirán unha copia da mensaxe"
 
-#: ../composer/e-msg-composer-hdrs.c:653
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10242,15 +10200,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Prema aquí para seleccionar os cartafoles nos que publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:672
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar en:"
 
@@ -10467,7 +10425,7 @@ msgstr "_Gardar Mensaxe"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10715,23 +10673,23 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione unha hora coa que comparar"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Escolla un ficheiro"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Tarefas pendentes"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Máis tarde"
@@ -10951,7 +10909,7 @@ msgstr "Control de configuración do redactor de correo de Evolution"
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11248,7 +11206,7 @@ msgstr "Spam"
 msgid "Junk Test"
 msgstr "Proba de spam"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -11324,7 +11282,7 @@ msgstr "Executar o programa"
 msgid "Score"
 msgstr "Puntuación"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Autor"
 
@@ -11358,7 +11316,7 @@ msgstr "Parar o Procesamento"
 
 #: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11442,48 +11400,48 @@ msgstr "Enviado"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Árbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando cartafol %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non se pode deixar a(s) mensaxe(s) no almacén de nivel superior"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11491,28 +11449,28 @@ msgstr "Examinando os cartafoles en \"%s\""
 msgid "_View"
 msgstr "_Vista"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Abrir nunha _Nova Fiestra"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Novo Cartafol..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Baleirar Lixo"
 
@@ -11521,13 +11479,13 @@ msgstr "_Baleirar Lixo"
 msgid "Copying `%s' to `%s'"
 msgstr "Copiando `%s' a `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "C_opiar"
 
@@ -11549,154 +11507,158 @@ msgstr "Crear cartafol"
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Marcar coma _non Lida"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "_Marcar coma Non Importante"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marcar como _spam"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _non spam"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguemento..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Ningún"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "M_arcar como completado"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Cartafol de busca según o a_sunto"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Cartafol de busca según o re_mitente"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Cartafol de busca según os des_tinatarios"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Cartafol de busca según a _lista de correo"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: ../mail/em-folder-view.c:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Non se puido obter a mensaxe"
 
-#: ../mail/em-folder-view.c:2466
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Copiar Localización da Ligazón"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Crear cartafol de _busca"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_A este enderezo"
 
-#: ../mail/em-folder-view.c:2822
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar correo a %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: ../mail/em-format-html-display.c:759 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: ../mail/em-format-html-display.c:759
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11704,11 +11666,11 @@ msgstr ""
 "Esta mensaxe non está asinada. Non hai garantía de que a mensaxe sexa "
 "auténtica."
 
-#: ../mail/em-format-html-display.c:760 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Sinatura válida"
 
-#: ../mail/em-format-html-display.c:760
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11716,11 +11678,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:761 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Sinatura inválida"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11728,11 +11690,11 @@ msgstr ""
 "A sinatura desta mensaxe non se pode verificar, puido haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Sinatura válida, non se pode verificar o remitente"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11740,11 +11702,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:768 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11752,11 +11714,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:769 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: ../mail/em-format-html-display.c:769
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11766,11 +11728,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:770 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: ../mail/em-format-html-display.c:770
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11778,11 +11740,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:771 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Cifrado, forte"
 
-#: ../mail/em-format-html-display.c:771
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11791,72 +11753,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:872 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:887
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Este certificado non é visible"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1174
 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:1185
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1185
 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:1248
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: ../mail/em-format-html-display.c:1249
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Agochar"
 
-#: ../mail/em-format-html-display.c:1250
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Axustar ao ancho"
 
-#: ../mail/em-format-html-display.c:1251
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Amosar tamaño _orixinal"
 
-#: ../mail/em-format-html-display.c:1670 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Adxunto"
 
-#: ../mail/em-format-html-display.c:1877
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Seleccione o cartafol onde gardar todos os adxuntos..."
 
-#: ../mail/em-format-html-display.c:1924
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Gardar seleccionados..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1991
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ad_xunto"
 msgstr[1] "%d ad_xuntos"
 
-#: ../mail/em-format-html-display.c:1998 ../mail/em-format-html-display.c:2074
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "G_ardar"
 
-#: ../mail/em-format-html-display.c:2009
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "G_ardar todo"
 
-#: ../mail/em-format-html-display.c:2070
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sen adxunto"
 
@@ -11920,7 +11882,7 @@ msgstr "Responder-A"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
@@ -11936,7 +11898,7 @@ msgstr "Bcc"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:999
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Transporte"
 
@@ -12007,7 +11969,7 @@ msgstr "Unha vez por semana"
 msgid "Once per month"
 msgstr "Unha vez por mes"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12019,47 +11981,47 @@ msgstr ""
 "\n"
 "Agarde mentras Evolution migra seus cartafoles..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non se puido crear o cartafol novo: `%s': %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Non se puido copiar o cartafol `%s' a `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Non se puido buscar buzóns existentes en `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non se puido abrir os datos antigos POP keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non se puido crear o directorio de datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Non se puideron copiar os datos POP3 keep-on-server `%s': %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Fallou ao crear o almacén de correo local `%s': %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Non se puideron crear os cartafoles de correo local en `%s': %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12076,6 +12038,10 @@ msgstr "_Responder ao remitente"
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Abrir Ligazón no Navegador"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Enviar unha mensaxe nova a..."
@@ -12232,30 +12198,18 @@ msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Habilitar modo cursor, para que poida ver un cursor cando lea correo."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
-msgid "Enable or disable type ahead search feature"
-msgstr "Activa ou desactiva a característica de busca ao teclear"
-
-#: ../mail/evolution-mail.schemas.in.in.h:25
-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 "Activa a característica de busca na barra para que poida iniciar unha busca interactiva tecleando o texto. O uso é para que poida atopar facilmente un cartafol nesa barra lateral tan só tecleando o nome do cartafol e a selección salta automaticamente a ese cartafol."
-
-#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Enable/disable caret mode"
 msgstr "Habilitar/deshabilitar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Altura do panel de lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Altura do panel de lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12263,7 +12217,7 @@ msgstr ""
 "Se o usuario tenta abrir 10 ou máis mensaxes ao mesmo tempo, preguntar ao "
 "usuario se quere realmente facelo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12274,23 +12228,23 @@ msgstr ""
 "de compoñentes bonobo na base de datos de Gnome pode empregarse para amosar "
 "o contido."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Última vez que se baleirou o lixo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas e súas cores asociadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lista de contas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12299,11 +12253,11 @@ msgstr ""
 "contén cadeas nomeando subdirectorios relativos a /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista de cabeceiras personalizadas e se están activadas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12311,19 +12265,19 @@ msgstr ""
 "Lista de etiquetas coñecidas para o compoñente de correo de Evolution. A "
 "lista contén cadeas co nome:cor onde cor usa a codificación hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de compoñentes bonobo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nomes de protocolos coa cal a licencia foi aceptada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Cargar imaxes para mensaxes HTML sobre http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12333,183 +12287,183 @@ msgstr ""
 "Nunca cargar imaxes desde a rede 1 - Cargar imaxes se o remitente está no "
 "libro de enderezos 2 - Sempre cargar imaxes desde a rede"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Rexistrar accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar accións de filtrado no ficheiro de rexistro especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para rexistrar as accións de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto despois do tempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto despois do tempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuais na \"Vista preliminar\" da mensaxe"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuais na \"Vista preliminar\" da mensaxe."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Altura predeterminada da fiestra de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Anchura predeterminada da fiestra de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Estilo de visualización mensaxe (\"normal\", \"cabeceiras completas\", "
 "\"fonte\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre o baleirado do lixo á saída"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tempo mínimo entre o baleira do lixo á saída, en días."
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Ficheiro de son novo para notificar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Tipo novo de notificación de correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Preguntar se o asunto está en branco"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar ao usuario cando tente compactar un cartafol."
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar ao usuario cando tente enviar unha mensaxe sen un asunto."
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Preguntar cando o usuario compacta"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cando o usuario só enche o campo Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Preguntar cando o usuario tente abrir dez ou máis mensaxes á vez"
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Preguntar ao enviar mensaxes en HTML a contactos que non os queiran."
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Preguntar cando o usuario tente enviar unha mensaxe sen destinatarios Para "
 "ou CC."
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cando o usuario tente enviar HTML non desexado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Recoñecer ligazóns no texto e reemprazalas."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recoñecer emoticóns no texto e reemprazalos con imaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Executar a proba de spam no correo entrante"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML por omisión"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Enviar correo en HTML por omisión."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Amosar animacións"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Amosar imaxes animadas como animacións."
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Amosar mensaxes borradas (riscadas) na lista de mensaxes."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Amosar mensaxes borradas na lista de mensaxes"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Reproducir un ficheiro de son cando chegue correo novo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 "Especificar o tipo de notificación de correo novo que o usuario desexa "
 "empregar."
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en liña"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada do diálogo de subscripción"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Fonte da terminal"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "A última vez que se baleirou o lixo, en días desde a época."
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "A fonte de terminal para amosar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "A letra de anchura variable para amosar correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12521,99 +12475,99 @@ msgstr ""
 "estructura XML é &lt;header enabled&gt; - establece activado se a cabeceira "
 "débese amosar na vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Lista de mensaxes por fíos."
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Lista de Mensaxes por Fíos"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de Mensaxes por Fíos basadas no asunto"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Temporización para marcar unha mensaxe como vista"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Temporización para marcar unha mensaxe como vista."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Cadena UID para a conta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Usar o demonio e cliente de Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Usar o demonio e cliente de Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Usar fontes personalizadas"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Usar fontes personalizadas para amosar o correo"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Usar só as probas de spam local."
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa só as probas de spam local (sen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Fonte de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "O elemento do menú Ver/Cco está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "O elemento do menú Ver/Cco está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "O elemento do menú Ver/Cc está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "O elemento do menú Ver/Cc está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "O elemento do menú Ver/Desde está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "O elemento do menú Ver/Desde está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "O elemento do menú Ver/Publicar está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "O elemento do menú Ver/Publicar está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "O elemento do menú Ver/Responder está marcado"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "O elemento do menú Ver/Responder está marcado."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12652,7 +12606,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de cartafoles en formato buzón de Berkeley"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
@@ -12660,7 +12614,7 @@ msgstr "Importando `%s'"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
@@ -13822,26 +13776,17 @@ msgstr "Agardando..."
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Introduza o contrasinal para %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Introduza o contrasinal"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Introduza o seu contrasinal"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
@@ -14485,74 +14430,74 @@ msgstr "_Compactar"
 msgid "_Open Messages"
 msgstr "_Abrir Mensaxes"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Non vista"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Vista"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Máis alta"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "A máis alta"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -14580,7 +14525,7 @@ msgstr "Ubicación orixinal"
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Tamaño"
@@ -14851,6 +14796,10 @@ msgstr ""
 "Un complemento de proba que demostra un menú emerxente que lle permite "
 "copiar cousas ao portapapeis."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Copiar enderezo de _correo-e"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Ferramenta de copia"
@@ -15328,10 +15277,10 @@ msgstr "Non se poden amosar os cartafoles."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"Os cambios ás opcións da conta Exchange \"{0}\" só terán lugar despois de saír e "
+"Os cambios da configuración da conta Exchange terán lugar despois de saír e "
 "reiniciar Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
@@ -15491,8 +15440,8 @@ msgid "Password successfully changed."
 msgstr "Contrasinal cambiado correctamente."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Por favor, reinicie Evolution para que poidan ter efecto os trocos"
+msgid "Please restart Evolution"
+msgstr "Por favor, reinicie Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15871,12 +15820,12 @@ msgid "Select Calendar"
 msgstr "Seleccionar calendario"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -16453,7 +16402,7 @@ msgstr "Formatador iTip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegou a xuntanza. Quere engadir ao delegado &quot;{1}"
 "&quot; ?"
@@ -16969,12 +16918,12 @@ msgstr "Gardar todos os adxuntos"
 msgid "Select save base name"
 msgstr "Seleccionar un nome base para gardar"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Tipo MIME"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gardar"
 
@@ -17134,18 +17083,18 @@ msgstr ""
 "Por favor prema o botón \"Adiante\" para continuar."
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a información que quere importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando Datos."
 
@@ -17200,7 +17149,7 @@ msgstr "Altura predeterminada da fiestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
-msgstr "Estado predeterminado da fiestra"
+msgstr "Estado predeterminada da fiestra"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
@@ -17232,15 +17181,11 @@ msgstr "A barra lateral é visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar o diálogo de advertencia de desenrolo"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "A barra de estado é visible"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17248,19 +17193,19 @@ msgstr ""
 "A versión de configuración de Evolution, co nivel de configuración maior/"
 "menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Altura predeterminada da fiestra principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "A anchura predeterminada da fiestra principal, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "A anchura predeterminada para a barra lateral, en píxeles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17268,7 +17213,7 @@ msgstr ""
 "A última versión actualizada da configuración de Evolution, con nivel de "
 "configuración maior/menor (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17278,47 +17223,43 @@ msgstr ""
 "\"toolbar\".Se se selecciona \"toolbar\", o estilo dos botóns determinarase "
 "pola configuración da barra de ferramentas de Gnome."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas é visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Indica se Evolution iniciarase en modo desconectado en vez de en modo "
 "conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Indica ou non se a fiestra debería estar maximizada."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Indica se a barra lateral debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Indica se a barra de estado debería ser visible."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Indica se a barra de ferramentas debería ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Indica se se salta o diálogo de advertencia nas versión de desenvolvemento "
 "de Evolution."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Indica se os botóns da fiestra deberían ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Estilo dos botóns de fiestra"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Os botóns da fiestra son visibles"
 
@@ -17339,11 +17280,11 @@ msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
 msgid "(Untitled)"
 msgstr "(Sen título)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Escolla o tipo de importador a executar:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17357,11 +17298,11 @@ msgstr ""
 "Pode seleccionar \"Automático\" se non o sabe, e Evolution tentará "
 "averigualo."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Escolla o destino desta importación"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17373,23 +17314,23 @@ msgstr ""
 "configuración que se poida importar. Se quere intentalo de novo, prema\n"
 "o botón \"Atrás\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "Nome do _ficheiro:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos e configuración de programas _antigos"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Importar un úni_co ficheiro"
 
@@ -17550,7 +17491,7 @@ msgstr ""
 "ficheiros externos a Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17587,7 +17528,7 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17595,39 +17536,35 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando o compoñente especificado"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Forzar o peche de todos os compoñentes de Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza a reemigración desde Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Desactiva a carga de calquer complemento."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- O cliente de correo e PIM de Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18397,7 +18334,7 @@ msgid "Select All"
 msgstr "Seleccionar Todo"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
@@ -18528,7 +18465,6 @@ msgid "Month"
 msgstr "Mes"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Seguinte"
 
@@ -18537,7 +18473,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Previsualiza a axenda que se vai imprimir"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
@@ -18625,11 +18561,11 @@ msgstr "Cortar a selección ao portarretallos"
 msgid "Paste from clipboard"
 msgstr "Pega do portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Pegar texto desde o portarretallos"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
 
@@ -18664,31 +18600,30 @@ msgstr "Prema aquí para ver a axuda dispoñible"
 msgid "Close"
 msgstr "Pechar"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nserir"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Anexo..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "A_xuda"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Inserir"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opcións"
@@ -18786,11 +18721,6 @@ msgstr "Conmuta cando se deben amosar as horas como ocupadas"
 msgid "_Alarms"
 msgstr "_Alarmas"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorías"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19541,6 +19471,11 @@ msgstr "Obter unha notificación de entrega cando se lea a súa mensaxe"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nserir"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Abrir un ficheiro"
@@ -20177,19 +20112,14 @@ msgstr "Tipo de vista"
 msgid "Type of view:"
 msgstr "Tipo de vista:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Suxerir que se amose o anexo automaticamente"
-
 #. 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B de %Y"
 
@@ -20257,7 +20187,7 @@ msgid "Minimum Width"
 msgstr "Ancho mínimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Espaciado"
 
@@ -20399,23 +20329,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expandido"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Indica se o expansor está ou non expandido"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Texto da etiqueta do expansor"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Usar subraiado"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20423,31 +20353,31 @@ msgstr ""
 "Se se establece, un subraiado no texto indica que o seguinte carácter "
 "debería usarse para a combinación de teclas mnemotécnica"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Espazo para poñer entre a etiqueta e o descendente"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Etiqueta do widget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Un widget para amosar en lugar da etiqueta usual do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamaño do expansor"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamaño da frecha do expansor"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicador de espazo"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Espaciado arredor da frecha do expansor"
 
@@ -20528,39 +20458,39 @@ msgstr "Anchura de columna"
 msgid "Search"
 msgstr "Procurar"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Buscar Agora"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de busca"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID de elemento"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID de subelemento"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
-msgstr "Buscar a_gora"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "Buscar _Agora"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
diff --git a/po/gu.po b/po/gu.po
index efd614e9f8..b52d6a010d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,11 +1,12 @@
+# translation of evolution.gnome-2-14.gu.po to Gujarati
 # translation of evolution.HEAD.gu.po to Gujarati
 # Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.gu\n"
+"Project-Id-Version: evolution.gnome-2-14.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-26 06:04+0200\n"
-"PO-Revision-Date: 2006-05-26 10:03+0530\n"
+"POT-Creation-Date: 2006-04-25 04:28+0200\n"
+"PO-Revision-Date: 2006-04-25 09:22+0530\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -43,16 +44,10 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "ઈવોલ્યુશન સરનામા પુસ્તિકા"
 
@@ -66,12 +61,12 @@ msgstr "નવો સંપર્ક"
 msgid "New Contact List"
 msgstr "નવી સંપર્ક યાદી"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડ છે"
-msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડર %s ને %d કાર્ડો છે"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડરને %d કાર્ડ છે"
+msgstr[1] "વર્તમાન સરનામા પુસ્તિકા ફોલ્ડરને %d કાર્ડો છે"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -90,32 +85,32 @@ msgstr "સંપર્ક: "
 msgid "evolution minicard"
 msgstr "ઈવોલ્યુશન નાનો પત્ર"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
 msgstr "તેની પાસે એલાર્મો છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:238
 msgid "It has recurrences."
 msgstr "તેને ખૂબ વારાઓ છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:241
 msgid "It is a meeting."
 msgstr "તે મંત્રણા છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:276
+#: ../a11y/calendar/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "કેલેન્ડર ઘટના: %s સાર છે."
 
-#: ../a11y/calendar/ea-cal-view-event.c:278
+#: ../a11y/calendar/ea-cal-view-event.c:249
 msgid "Calendar Event: It has no summary."
 msgstr "કેલેન્ડર ઘટના: તેને કોઈ સાર નથી."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:268
 msgid "calendar view event"
 msgstr "કેલેન્ડર ઘટના જુઓ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
 msgstr "ફોકસ મેળવો"
 
@@ -144,14 +139,14 @@ msgstr "તારીખે જાઓ"
 msgid "a table to view and select the current time range"
 msgstr "વર્તમાન સમય વિસ્તાર જોવા અને પસંદ કરવા માટેનું કોષ્ટક"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "તેની પાસે %d ઘટના છે."
 msgstr[1] "તેની પાસે %d ઘટનાઓ છે."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "તેની પાસે કોઈ ઘટનાઓ નથી."
 
@@ -186,10 +181,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -220,10 +213,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -249,21 +240,21 @@ msgstr "કૂદો બટન"
 msgid "Click here, you can find more events."
 msgstr "અંહિ ક્લિક કરો, તમે વધુ ઘટનાઓ શોધી શકો છો."
 
-#: ../a11y/calendar/ea-week-view.c:157
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "મહિનાનો દેખાવ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:161
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "અઠવાડિયાનો દેખાવ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "મહિના માટે કેલેન્ડર દેખાવ"
 
-#: ../a11y/calendar/ea-week-view.c:194
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "એક અથવા વધુ અઠવાડિયાઓ માટે કેલેન્ડર દેખાવ"
 
@@ -569,7 +560,7 @@ msgstr "આપોઆપ સંપૂર્ણ અંહિ રુપરેખા
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -632,7 +623,7 @@ msgstr "આ કમ્પ્યુટરમાં"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "ખાનગી"
 
@@ -692,9 +683,9 @@ msgstr "ઓફલાઈન ક્રિયાઓ માટે બુકના �
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
@@ -735,12 +726,12 @@ msgid "Address Book Properties"
 msgstr "સરનામાપોથીના ગુણધર્મો"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "રુપાંતરિત કરી રહ્યા છીએ..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' ને રુપાંતરિત કરી રહ્યા છીએ:"
@@ -815,35 +806,34 @@ msgstr "ફોલ્ડર નામો '/' સમાવી શકતા નથ�
 msgid "A Folder with this name already exists"
 msgstr "આ નામ સાથેનું ફોલ્ડર પહેલાથી જ હાજર છે"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "નવી સરનામા પુસ્તિકા (_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1096
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../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 "કાઢી નાંખો (_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Vcard તરીકે સંગ્રહો..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "ગુણધર્મો (_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "સંપર્ક સ્રોત પસંદ કરનાર"
 
@@ -852,7 +842,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "અજાણી રીતે LDAP સર્વર વાપરી રહ્યા છીએ"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "સત્તાધિકરણ કરવામાં નિષ્ફળ.\n"
 
@@ -899,7 +889,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "નામ પસંદ કરો સંવાદમાં છેલ્લે વપરાયેલ ફોલ્ડર માટેની URI."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "ઊભી તકતીની સ્થિતિ"
 
@@ -1224,6 +1214,7 @@ msgstr "મિનિટો"
 #: ../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
@@ -1273,13 +1264,13 @@ msgstr "<b>કાર્ય</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1330,7 +1321,7 @@ msgstr "ટેલિફોન"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "કાર્ય"
@@ -1358,8 +1349,10 @@ msgid "_Calendar:"
 msgstr "કેલેન્ડર (_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "વર્ગો (_C)..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "વર્ગો (_C)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1446,8 +1439,8 @@ msgid "_Zip/Postal Code:"
 msgstr "ઝીપ/પોસ્ટલ કોડ (_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "સરનામું"
 
@@ -1455,7 +1448,7 @@ msgstr "સરનામું"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../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
@@ -2441,7 +2434,7 @@ msgstr "ઝિમ્બાબ્વે"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "નામ"
@@ -2452,7 +2445,7 @@ msgstr "AOL તુરંત સંદેશાવાહક"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "જેબર"
 
@@ -2462,7 +2455,7 @@ msgstr "યાહુ મેસેન્જર"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2492,17 +2485,17 @@ msgid "Other"
 msgstr "બીજા"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "યાહુ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "જૂથ પ્રમાણે"
 
@@ -2536,15 +2529,15 @@ msgstr "બદલાયેલ"
 msgid "Contact Editor - %s"
 msgstr "સંપર્ક સંપાદક - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "મહેરબાની કરીને આ સંપર્ક માટે ચિત્ર પસંદ કરો"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "કોઈ ચિત્ર નથી"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2552,23 +2545,7 @@ msgstr ""
 "સંપર્ક માહિતી અયોગ્ય છે:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
-#, c-format
-msgid "'%s' has an invalid format"
-msgstr "'%s' નું બંધારણ અયોગ્ય છે"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
-#, c-format
-msgid "%s'%s' has an invalid format"
-msgstr "%s'%s' નું બંધારણ અયોગ્ય છે"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
-#, c-format
-msgid "%s'%s' is empty"
-msgstr "%s'%s' ખાલી છે"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "અયોગ્ય સંપર્ક."
 
@@ -2580,15 +2557,15 @@ msgstr "સંપર્ક ઝડપી-ઉમેરો"
 msgid "_Edit Full"
 msgstr "સંપૂર્ણ ફેરફાર કરો (_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "પુરૂં નામ (_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
 msgstr "ઈ-મેઈલ (_m)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 
@@ -2596,10 +2573,10 @@ msgstr "સરનામા પુસ્તિકા પસંદ કરો (_S)"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "શું તમે ખરેખર સંપર્ક યાદી (%s)\n"
-"કાઢી નાંખવા માંગો છો?"
+"કાઢી નાંખવા માંગો છો ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
@@ -2613,10 +2590,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "શું તમે ખરેખર સંપર્ક (%s)\n"
-"કાઢી નાંખવા માંગો છો?"
+"કાઢી નાંખવા માંગો છો ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
@@ -2724,7 +2701,6 @@ msgid "_IM Service:"
 msgstr "_IM સેવા:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2740,7 +2716,7 @@ 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:874
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "સંપર્ક યાદી સંપાદક"
 
@@ -2772,7 +2748,7 @@ msgstr "પસંદ કરો (_S)"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "નીચેની યાદીમાંથી સંપર્ક ખેંચી લો અથવા ઈ-મેઈલ સરનામુ લખો (_T):"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../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
@@ -2781,15 +2757,15 @@ msgstr "નીચેની યાદીમાંથી સંપર્ક ખે
 msgid "Book"
 msgstr "ચોપડી"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "એ નવી યાદી છે"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:747
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "સભ્યો (_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "સંપર્ક સભ્યોની યાદી"
 
@@ -2910,9 +2886,9 @@ msgid "Save as VCard..."
 msgstr "VCard તરીકે સંગ્રહો..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1241
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "ખોલો (_O)"
@@ -2969,15 +2945,14 @@ msgstr "કાપો (_t)"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1249
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3124 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1082 ../mail/message-list.c:1742
-#: ../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
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "નકલ કરો (_C)"
 
@@ -3037,7 +3012,7 @@ msgid "Company Phone"
 msgstr "સંસ્થાનો ફોન"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "ઈ-મેઈલ"
@@ -3087,7 +3062,7 @@ msgid "Manager"
 msgstr "વ્યવસ્થાપક"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "મોબાઈલ ફોન"
 
@@ -3096,7 +3071,7 @@ msgid "Nickname"
 msgstr "ખોટું નામ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "નોંધ"
 
@@ -3105,7 +3080,7 @@ msgid "Office"
 msgstr "ઓફિસ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "સંસ્થા"
 
@@ -3283,89 +3258,68 @@ msgstr "પસંદ કરેલ"
 msgid "Has Cursor"
 msgstr "ને કર્સર"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2467
-msgid "_Copy Link Location"
-msgstr "કડીની જગ્યાની નકલ કરો (_C)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "નવો સંદેશો આના પ્રતિ મોકલો (_S) ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "ઈમેઈલ સરનામાની નકલ કરો (_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(નકશો)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "નકશો"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "સભ્યોની યાદી"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "ઈ-મેઈલ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "જગ્યા"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "વિડીયો સંવાદ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "વિડિયો મંત્રણા"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "ફોન"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "ફેક્સ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "કામ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "ઘર પાનું"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
-msgstr "વેબ લોગ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "બ્લોગ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "ખાનગી"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "કામનું શીર્ષક"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "ઘર પાનું"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "બ્લોગ"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3552,7 +3506,7 @@ msgid "Error adding list"
 msgstr "યાદી ઉમેરવામાં ભૂલ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "સંપર્ક ઉમેરવામાં ભૂલ"
 
@@ -3569,7 +3523,7 @@ msgid "Error removing list"
 msgstr "યાદી કાઢી નાંખવામાં ભૂલ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "સંપર્ક કાઢી નાંખવામાં ભૂલ"
 
@@ -3604,57 +3558,57 @@ 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:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "સંપર્ક"
 msgstr[1] "સંપર્કો"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "સરનામા પુસ્તિકા પસંદ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "યાદી"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "ને સંપર્ક ખસેડો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "સંપર્કની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "સંપર્કોને અંહિ ખસેડો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "સંપર્કોની નકલ અંહિ કરો"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "ઘણાબધા VCards"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "%s માટે VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "સંપર્ક જાણકારી"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s માટે સંપર્ક જાણકારી"
@@ -3749,12 +3703,12 @@ msgstr "ઈવોલ્યુશન VCard આયાત કરનાર"
 msgid "Print envelope"
 msgstr "કવર છાપો"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "સંપર્કો છાપો"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "સંપર્ક છાપો"
 
@@ -3907,7 +3861,7 @@ msgstr "છાયા"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4120,17 +4074,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "શું તમે ખરેખર આ મુલાકાત કાઢી નાંખવા માંગો છો?"
 
 #: ../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:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "શું તમે ખરેખર આ મંત્રણા કાઢી નાંખવા માંગો છો?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "શું તમે ખરેખર આ બાબત કાઢી નાંખવા માંગો છો?"
 
@@ -4383,8 +4334,8 @@ msgstr "ઘણા બધા દિવસોની બાબતો છુટી �
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "ઈવોલ્યુશન-માહિતી-સર્વર ચાલુ કરી શકાયુ નહિં"
 
@@ -4423,7 +4374,7 @@ msgid "Calendar and Tasks"
 msgstr "કેલેન્ડર અને બાબતો"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "કેલેન્ડરો"
 
@@ -4473,7 +4424,7 @@ msgstr "મેમો"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4496,13 +4447,13 @@ msgstr "બાબતો (_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "ઈવોલ્યુશન કેલેન્ડર એલાર્મ સૂચન સેવા"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "મિનિટ"
 msgstr[1] "મિનિટો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4514,7 +4465,7 @@ msgid_plural "hours"
 msgstr[0] "કલાકો"
 msgstr[1] "કલાકો"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "શરૂઆતનો સમય"
 
@@ -4525,8 +4476,8 @@ msgstr "મુલાકાતો"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1618
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4542,7 +4493,7 @@ msgstr "પુનરાવર્તન સમય (_t):"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4559,31 +4510,32 @@ msgstr "પુનરાવર્તન (_S)"
 msgid "location of appointment"
 msgstr "મુલાકાતનું સ્થાન"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "કોઈ સાર ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "કોઈ વર્ણન ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "કોઈ જગ્યા જાણકારી ઉપલબ્ધ નથી."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "તમારી પાસે %d એલાર્મો છે"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "ચેતવણી"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4595,7 +4547,7 @@ msgstr ""
 "ઈ-મેઈલ મોકલવા સાથે રુપરેખાંકિત થયો નથી. ઈવોલ્યુશન\n"
 "સામાન્ય રીમાઈન્ડર સાથે સંવાદ બોક્સ પ્રદર્શિત થશે."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4612,7 +4564,7 @@ msgstr ""
 "\n"
 "શું તમે ખરેખર આ કાર્યક્રમ ચલાવવા માંગો છો?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "મને આ કાર્યક્રમ વિશે ફરીથી પૂછશો નહિં."
 
@@ -4712,102 +4664,90 @@ msgid "Default reminder value"
 msgstr "મૂળભુત યાદ અપાવનાર કિંમતો"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "ઘટના ઢાળ"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "ઘટના પારદર્શકતા"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "મુક્ત/વ્યસ્ત સર્વર URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "મુક્ત/વ્યસ્ત ટેમ્પલેટ URL"
 
-#: ../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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "પછી પૂર્ણ થયેલ બાબતો છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "બાબત એકમો છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "બાબત કિંમત છુપાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "આડી તકતીની સ્થિતિ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "કામ કરવાના દિવસનો અંત થાય તે કલાક, ચોવીસ કલાકના બંધારણમાં, ૦ થી ૨૩."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારનો કલાક, ચોવીસ કલાકના બંધારણમાં, ૦ થી ૨૩."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "દિવસ અને કામના અઠવાડિયા દેખાવોમાં બતાવાયેલ અંતરાલો, મિનિટોમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "છેલ્લો એલાર્મ સમય"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "મુક્ત/વ્યસ્ત પ્રકાશનો માટેની સર્વર URL ની યાદી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "માર્કસ બેઈન્સ લીટી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "માર્કસ બેઈન્સ લીટી રંગ - દિવસ દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "માર્કસ બેઈન્સ લીટી રંગ - ટાઈમ બાર"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારની મિનિટ, ૦ થી ૫૯."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારની મિનિટ, ૦ થી ૫૯"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "આડી તકતીની સ્થિતિમાં મહિનાનો દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "ઊભી તકતીની સ્થિતિમાં મહિનાનો દેખાવ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "મૂળભૂત યાદ અપાવનાર માટે નક્કી કરવાના એકમોની સંખ્યા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "ક્યારે બાબતો છુપાવવી તે નક્કી કરવા માટેના એકમોની સંખ્યા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "પછીની બાબતોનો રંગ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4815,7 +4755,7 @@ msgstr ""
 "આડી તકતીની સ્થિતિ, તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે જ્યારે મહિના દેખાવમાં ના "
 "હોય ત્યારે, પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4823,13 +4763,13 @@ msgstr ""
 "આડી તકતીની સ્થિતિ, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે મહિના દેખાવમાં, "
 "પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 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:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4837,7 +4777,7 @@ msgstr ""
 "ઊભી તકતીની સ્થિતિ, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીના વચ્ચે મહિના દેખાવમાં, "
 "પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -4845,65 +4785,65 @@ msgstr ""
 "ઊભી તકતીનું સ્થાન, દેખાવ અને તારીખ શોધક કેલેન્ડર અને બાબત યાદીની વચ્ચે જ્યારે મહિના "
 "દેખાવમાં નહિં હોય, પિક્સેલમાં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "કાર્યક્રમો કે જે એલાર્મો દ્વારા ચલાવવા માટે પરવાનગી અપાયેલ છે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં RSVP ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ભૂમિકા ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "અઠવાડિયા અને મહિના દેખાવોમાં મુલાકાત અંત સમયો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં વર્ગો ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "સૂચન ટ્રેમાં ડિસ્પ્લે એલાર્મો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "\"પૂર્વદર્શન\" તકતી બતાવો."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ટાઈમઝોન ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં લખો ક્ષેત્ર બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "તારીખ શોધકમાં અઠવાડિયા નંબરો બતાવો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "આજ સુધીની બાબતો રંગ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "બાબતો ઊભી તકતીની સ્થિતિ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4912,7 +4852,7 @@ msgstr ""
 "મુક્ત/વ્યસ્ત માહિતી ફોલબેક તરીકે વાપરવાની URL ટેમ્પલેટ, %u એ મેઈલ સરનામાના વપરાશકર્તા "
 "ભાગથી બદલાઈ જશે અને %d એ ડોમેઈન દ્વારા બદલાઈ જશે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4920,57 +4860,51 @@ msgstr ""
 "કેલેન્ડરમાં તારીખો અને સમયો માટે વાપરવાનો મૂળભુત ટાઈમઝોન, \"અમેરિકા/ન્યુ યોર્ક\" જેવી "
 "જગ્યા જેવી બિનભાષાંતરિક ઓલ્સન ટાઈમઝોન ડેટાબેઝની જેમ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "સમયની વહેંચણી"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "છેલ્લે એલાર્મ ચાલ્યું ત્યારનો સમય, time_t માં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "ટાઈમઝોન"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr "કેલેન્ડર દૃશ્યોમાં ઘટનાઓની પારદર્શકતા (૦ અને ૧૦ વચ્ચેની કિંમત, મૂળભૂત રીતે અપારદર્શક)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "ચોવીસ કલાક સમય બંધારણ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "મૂળભુત યાદ અપાવનાર માટેના એકમો, \"મિનિટો\", \"કલાકો\" અથવા \"દિવસો\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "ક્યારે બાબતો છુપાવવી તે નક્કી કરવાનો એકમ, \"મિનિટો\", \"કલાકો\" અથવા \"દિવસો\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "અઠવાડિયાની શરૂઆત"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "અઠવાડિયું શરૂ થાય તે દિવસ, રવિવાર (૦) થી શનિવાર (૬)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "પ્રદર્શિત એલાર્મો માટે શું સૂચક ટ્રે વાપરવી કે નહિં."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "જ્યારે મુલાકાત અથવા બાબત કાઢી રહ્યા હોય ત્યારે શું ખાતરી માટે પૂછવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "જ્યારે મુલાકાતો અને બાબતો સંપૂર્ણપણે દૂર કરી રહ્યા હોય ત્યારે શું ખાતરી માટે પૂછવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -4978,71 +4912,71 @@ msgstr ""
 "શું મહિના દેખાવમાં અઠવાડિયાના અંતિમ દિવસો સંકોચવા, કે જે શનિવાર અને રવિવારને એક દિવસની "
 "જગ્યામાં મૂકે."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 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:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 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:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "બાબતોના દેખાવમાં શું પૂર્ણ થયેલ બાબતો છુપાવવી."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "શું મુલાકાતો માટે મૂળભુત યાદ અપાવનાર સુયોજિત કરવું."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં RSVP ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "શું ઘટના/મંત્રણા સંપાદકમાં વર્ગો ક્ષેત્ર બતાવવું"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ભૂમિકા ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પરિસ્થિતિ ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "શું સમયને am/pm ની જગ્યાએ ચોવીસ કલાકના બંધારણમાં બતાવવા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં ટાઈમઝોન ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "શું ઘટના/ક્રિયા/મંત્રણા સંપાદકમાં પ્રકાર ક્ષેત્ર બતાવવું કે નહિં"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "શું તારીખ શોધકમાં અઠવાડિયા નંબરો બતાવવા."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "કામ કરવાના દિવસો"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારનો કલાક"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "કામ કરવાનો દિવસ અંત થાય ત્યારની મિનિટ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારનો કલાક"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "કામ કરવાનો દિવસ શરૂ થાય ત્યારની મિનિટ"
 
@@ -5075,7 +5009,7 @@ msgstr "છાપો"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5143,59 +5077,59 @@ msgstr "કેલેન્ડરો સુધારવામાં નિષ્�
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "ઘટનાઓ અને મંત્રણાઓ બનાવવા માટે કેલેન્ડર '%s' ખોલવા માટે અસમર્થ"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "ત્યાં ઘટનાઓ અને મંત્રણાઓ બનાવવા ામટે કોઈ કેલેન્ડર ઉપલબ્ધ નથી"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "કેલેન્ડર સ્રોત પસંદ કરનાર"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "નવી મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "મુલાકાત (_A)"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "નવી મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "નવી મંત્રણા"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "મંત્રણા (_e)"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "નવી મંત્રણા મંજૂરી બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "બધા દિવસની મુલાકાત (_p)"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "નવી બધા દિવસની મુલાકાત બનાવો"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "કેલેન્ડર (_n)"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "નવું કેલેન્ડર બનાવો"
 
@@ -5353,21 +5287,22 @@ msgstr "ઉમેરો (_d)"
 msgid "Alarms"
 msgstr "એલાર્મ"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../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:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
-msgid "_Suggest automatic display of attachment"
-msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો (_S)"
+#: ../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"
+msgstr "જોડાણનું આપોઆપ પ્રદર્શન સૂચવો"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "ફાઈલો જોડો"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "જોડાણના ગુણધર્મો"
@@ -5376,19 +5311,19 @@ msgstr "જોડાણના ગુણધર્મો"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../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:3
+#: ../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:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME પ્રકાર:"
@@ -5451,7 +5386,7 @@ msgid "Display"
 msgstr "ડિસ્પ્લે"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "મુક્ત/વ્યસ્ત"
@@ -5549,7 +5484,7 @@ msgid "Thursday"
 msgstr "ગુરુવાર"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "ટાઈમ ઝોન (_z):"
 
@@ -5639,43 +5574,44 @@ msgid "before every appointment"
 msgstr "દરેક મુલાકાત પહેલા"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "ઓફલાઈન ક્રિયા માટે કેલેન્ડરના સમાવિષ્ટોની નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે બાબત યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "ઓફલાઈન પ્રક્રિયાઓ માટે યાદીના સમાવિષ્ટો સ્થાનીકપણે નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિક રીતે નકલ કરો (_y)"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "ઓફલાઈન પ્રક્રિયા માટે મેમો યાદી સમાવિષ્ટોની સ્થાનિકપણે નકલ કરો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "રંગ (_o):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "બાબતોની યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "મેમો યાદી"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "કેલેન્ડર ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "નવું કેલેન્ડર"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "બાબત યાદી ગુણધર્મો"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "નવી મેમો યાદી"
 
@@ -5782,29 +5718,29 @@ msgstr " (કારણે "
 msgid "Due "
 msgstr "કારણે "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, 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 ../composer/e-msg-composer.c:2866
-#: ../composer/e-msg-composer.c:3061
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "જોડાયેલ સંદેશો"
 msgstr[1] "%d જોડાયેલ સંદેશાઓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3125
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "ખસેડો (_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3127
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ખેંચવાનું રદ કરો (_D)"
 
@@ -5812,7 +5748,7 @@ msgstr "ખેંચવાનું રદ કરો (_D)"
 msgid "Could not update object"
 msgstr "ઓબ્જેક્ટ સુધારી શક્યા નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5824,97 +5760,97 @@ msgid "Hide Attachment _Bar"
 msgstr "જોડાણ પટ્ટી છુપાવો (_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3623
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "દૂર કરો (_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3624 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "ગુણધર્મો (_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3626
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "જોડાણ ઉમેરો (_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "જોડાણો બતાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "જોડાણ પટ્ટી બદલવા માટે સ્પેસ કી દબાવો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "મુલાકાતમાં ફેરફાર કરો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "મંત્રણા - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "મુલાકાત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "સોંપાયેલ બાબત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "બાબત - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "જર્નલ પ્રવેશ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "કોઈ સાર નથી"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:399
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "જોડાણ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2764
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "આ વસ્તુમાં કરેલા ફેરફારો રદ કરાશે જો સુધારો થાય તો"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "વર્તમાન આવૃત્તિ વાપરવા માટે અસમર્થ!"
 
@@ -5930,10 +5866,6 @@ 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 "શું બાકીના બધા મેળવનારાઓના મેઈલબોક્સમાંથી આ વસ્તુને કાઢી નાંખવી છે (_D)?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "કોર્બા ભૂલને કારણે ઘટના કાઢી શકાય નહિં"
@@ -5995,11 +5927,11 @@ msgstr "ને ડિલિગેટ:"
 msgid "Enter Delegate"
 msgstr "ડિલિગેટ દાખલ કરો"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "મુલાકાત (_m)"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "વળતર"
@@ -6015,7 +5947,7 @@ msgid "Cale_ndar:"
 msgstr "કેલેન્ડર (_n):"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6117,7 +6049,7 @@ msgstr "વૈવિધ્યપૂર્ણ"
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
@@ -6166,12 +6098,16 @@ msgstr "વર્ણન (_e):"
 msgid "Event Description"
 msgstr "ઘટના વર્ણન"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "સ્થળ (_i):"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "સાર (_m):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "એલાર્મ (_A)"
 
@@ -6247,7 +6183,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "સ્થિતિ"
 
@@ -6534,14 +6470,14 @@ msgstr "<span weight=\"bold\">સ્થિતિ</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../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:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "ઊંચુ"
 
@@ -6556,14 +6492,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:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 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:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "સામાન્ય"
 
@@ -6759,7 +6695,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:2832
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ખોલવા માટે ક્લિક કરો"
@@ -6842,7 +6778,7 @@ msgstr "મુક્ત"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "વ્યસ્ત"
 
@@ -6856,17 +6792,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "હા"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ના"
@@ -6877,21 +6813,21 @@ msgstr "ના"
 #: ../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:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "વળતર"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "સોંપેલ"
 
@@ -6899,7 +6835,7 @@ msgstr "સોંપેલ"
 msgid "Save As..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1939
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "પસંદિત જોડાણો સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
@@ -6908,9 +6844,9 @@ msgstr "પસંદિત જોડાણો સંગ્રહવા માટ
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1243
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "આ રીતે સંગ્રહો (_S)..."
 
@@ -6977,25 +6913,25 @@ msgstr "૧૦૦%"
 msgid "Deleting selected objects"
 msgstr "પસંદ કરેલા ઓબ્જેક્ટો કાઢી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "ઓબ્જેક્ટો સુધારી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-table.c:1105
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "આ રીતે સંગ્રહો..."
 
-#: ../calendar/gui/e-calendar-table.c:1242 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "વેબ પાનું ખોલો (_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1244
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7003,44 +6939,44 @@ msgstr "વેબ પાનું ખોલો (_W)"
 msgid "_Print..."
 msgstr "છાપો (_P)..."
 
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "કાપો (_u)"
 
-#: ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "ચોંટાડો (_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1254 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "બાબત સોંપો (_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1255 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)"
 
-#: ../calendar/gui/e-calendar-table.c:1256
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1257
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "પસંદ કરેલ બાબતોને પૂર્ણ થયેલ હોય એમ ચિહ્નિત કરો (_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1262
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "પસંદ કરેલ બાબતોને કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1495
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "બાબત ઉમેરવા માટે ક્લિક કરો"
@@ -7075,105 +7011,105 @@ msgstr "શરુઆતની તારીખ"
 msgid "Task sort"
 msgstr "બાબતો ક્રમમાં ગોઠવો"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "વસ્તુઓ ખસેડી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "વસ્તુઓની નકલ કરી રહ્યા છીએ"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "નવી મુલાકાત (_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "નવી બધા દિવસની ઘટના (_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "નવી મંત્રણા (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "નવી બાબત (_T)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "વર્તમાન દેખાવ (_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "આજનો દિવસ પસંદ કરો (_d)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "તારીખ પસંદ કરો (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "કેલેન્ડરમાં નકલ કરો (_y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "કેલેન્ડરમાં ખસેડો (_v)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "પ્રતિનિધી મંત્રણા (_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "સમયક્રમ મંત્રણા (_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar તરીકે આગળ ધપાવો (_F)..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "પ્રત્યુત્તર (_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "બધાને વળતો જવાબ આપો (_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "આ વારાને ખસેડાય તેવો બનાવો (_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "આ વારો કાઢી નાંખો (_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "બધા વારાઓ કાઢી નાંખો (_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "આયોજક: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "આયોજક: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "સ્થળ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "સમય: %s %s"
@@ -7203,7 +7139,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i મિનિટ ભાગલાઓ"
@@ -7214,21 +7150,19 @@ 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "સવાર"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "સાંજ"
@@ -7337,7 +7271,7 @@ msgstr "<br> મહેરબાની કરીને નીચેની જા�
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7350,7 +7284,7 @@ msgstr "ભાર મૂકીને સ્વીકારાયેલ છે"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7675,63 +7609,63 @@ msgid "Resources"
 msgstr "સ્રોતો"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "અંગત"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "સ્રોત"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ખંડ"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "ખુરશી"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "જરુરી સ્પર્ધક"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "વૈકલ્પિક સ્પર્ધક"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "સ્પર્ધક નથી"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "ક્રિયા જરુરી છે"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 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/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7742,14 +7676,14 @@ msgstr "ડિલિગેટ થયેલ"
 msgid "Attendee                          "
 msgstr "સભાજન                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7757,86 +7691,86 @@ msgstr "%A, %B %d, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ઓફિસની બહાર"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "કોઈ જાણકારી નથી"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "સભાજનો (_t)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "વિકલ્પો (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "માત્ર કામ કરવાના કલાકો બતાવો (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "નાનું કરેલ બતાવો (_z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "સુધારો મુક્ત/વ્યસ્ત (_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "આપોઆપ લઈ લો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "બધા લોકો અને સ્રોતો (_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "બધા લોકો અને એક સ્રોત (_p)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "જરુરી લોકો (_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "જરુરી લોકો અને એક સ્રોત (_o)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "શરુઆતનો સમય (_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "અંતિમ સમય (_E):"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "પસંદ કરેલ મેમો કાઢી નાંખો (_D)"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "મેમો ઉમેરવા માટે ક્લિક કરો"
 
@@ -7896,8 +7830,7 @@ 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8046,9 +7979,22 @@ msgstr "iCalendar જાણકારી"
 msgid "You must be an attendee of the event."
 msgstr "તમે ઘટનાના સભાસદ હોવા જ જોઈએ."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "નવી મેમો યાદી (_N)"
+#: ../calendar/gui/memos-component.c:451 ../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 "નકલ કરો"
+
+#: ../calendar/gui/memos-component.c:452 ../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 "કાઢી નાખો"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "ગુણધર્મો..."
 
 #: ../calendar/gui/memos-component.c:526
 #, c-format
@@ -8446,7 +8392,7 @@ msgstr "બાબત યાદી (_i)"
 msgid "Create a new task list"
 msgstr "નવી બાબત યાદી બનાવો"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8458,11 +8404,11 @@ msgstr ""
 "\n"
 "શું ખરેખર આ બાબતો કાઢી નાંખવા માંગો છો?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "મને ફરી વાર પૂછશો નહિં."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "બાબતો છાપો"
 
@@ -10057,7 +10003,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "જોડાણ પટ્ટી"
 
@@ -10066,27 +10012,27 @@ msgstr "જોડાણ પટ્ટી"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:444 ../widgets/misc/e-attachment.c:462
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, 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:246 ../widgets/misc/e-attachment.c:453
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "ફાઈલ %s જોડી શકતા નથી: નિયમિત ફાઈલ નથી"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "અંતિમ મુકામ મોકલી રહ્યા છીએ"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "સંદેશાઓ મોકલવા માટે ફોલ્ડર પસંદ કરો."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "સરનામાપોથી માટે અંહિ ક્લિક કરો"
 
@@ -10097,45 +10043,45 @@ msgstr "સરનામાપોથી માટે અંહિ ક્લિક
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "પ્રતિ-પ્રત્યુત્તર આપો (_R):"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "તરફથી (_o):"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "વિષય (_u):"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "પ્રતિ (_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "સંદેશાના મેળવનારાઓ દાખલ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "આને પણ (_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સંદેશાની કાર્બન નકલ મેળવે"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "આને પણ ખબર વિના (_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10144,15 +10090,15 @@ msgstr "સરનામાઓ દાખલ કરો કે જેઓ પણ સ
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "ને પોસ્ટ કરો (_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "અંહિ પોસ્ટ કરવા માટે ફોલ્ડરો પસંદ કરો"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "ને પોસ્ટ કરો:"
 
@@ -10160,7 +10106,7 @@ msgstr "ને પોસ્ટ કરો:"
 msgid "A_ttach"
 msgstr "જોડો (_t)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "જોડાણ ઉમેરો"
 
@@ -10174,12 +10120,12 @@ msgid ""
 "account"
 msgstr "જતા સંદેશાઓને એનક્રિપ્ટ કરી શકતા નથી: આ ખાતા માટે કોઈ એનક્રિપ્શન પ્રમાણપત્ર નથી"
 
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "જોડાણપટ્ટી છુપાવો (_A)"
 
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3869
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "જોડાણ પટ્ટી બતાવો (_A)"
 
@@ -10205,21 +10151,21 @@ msgstr "શીર્ષક વગરનો સંદેશો"
 msgid "Open File"
 msgstr "ફાઈલ ખોલો"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../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:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "સહી (_g):"
 
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3751
-#: ../composer/e-msg-composer.c:3754
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "સંદેશો બનાવો"
 
-#: ../composer/e-msg-composer.c:4978
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10363,7 +10309,7 @@ msgstr "સંદેશો સંગ્રહો (_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ઈવોલ્યુશન"
 
@@ -10483,7 +10429,7 @@ msgid ""
 "do?"
 msgstr "ક્યારે તમે વાંચવાની રસીદની માંગણી સાથે ઈ-મેઈલ મેળવવા માંગો છો, ઈવોલ્યુશન શું કરશે?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10491,7 +10437,7 @@ msgstr ""
 "એ નામની ફાઈલ પહેલાથી જ હાજર છે.\n"
 "શું તેના ઉપર ફરીથી લખવું છે?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "શું તેના ઉપર ફરીથી લખવું છે?"
 
@@ -10607,23 +10553,23 @@ 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:289
 msgid "Choose a file"
 msgstr "ફાઈલ પસંદ કરો"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "મહત્વનું"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "કરવાનું"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "પછી"
@@ -10673,11 +10619,11 @@ msgid "Include threads"
 msgstr "થ્રેડો સમાવે છે"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "આવતા"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "જતા"
 
@@ -10773,7 +10719,7 @@ msgstr "પહેલાં"
 msgid "months"
 msgstr "મહિનાઓ"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "સેકન્ડો"
 
@@ -10841,7 +10787,7 @@ msgstr "ઈવોલ્યુશન મેઈલ કમ્પોઝર રુપ
 msgid "Evolution Mail preferences control"
 msgstr "ઈવોલ્યુશન મેઈલ પસંદગીઓ નિયંત્રણ"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -10965,7 +10911,7 @@ msgid "Protocol"
 msgstr "પ્રોટોકોલ"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "નામ વિનાનું"
 
@@ -11041,12 +10987,6 @@ 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 "કાઢી નંખાયેલ છે"
@@ -11144,7 +11084,7 @@ msgstr "નકામુ"
 msgid "Junk Test"
 msgstr "બગડેલ ચકાસણી"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "લેબલ"
 
@@ -11220,7 +11160,7 @@ msgstr "કાર્યક્રમ ચલાવો"
 msgid "Score"
 msgstr "સ્કોર"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "મોકલનાર"
 
@@ -11252,9 +11192,9 @@ msgstr "ની સાથે શરુ થાય છે"
 msgid "Stop Processing"
 msgstr "પ્રક્રિયા કરવાનું બંધ કરો"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11338,48 +11278,48 @@ msgstr "મોકલાયેલ"
 msgid "Loading..."
 msgstr "લાવી રહ્યા છીએ..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "મેઈલ ફોલ્ડર વૃક્ષ"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "ફોલ્ડર %s ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "ફોલ્ડર %s નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "સંદેશાઓ ફોલ્ડર %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "ઉચ્ચ સ્તરના સંગ્રહસ્થાનમાં સંદેશાઓ મૂકી શકતા નથી"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "આ ફોલ્ડરમાં ખસેડો (_M)"
 
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" માં ફોલ્ડરો ચકાસી રહ્યા છીએ"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11387,28 +11327,28 @@ msgstr "\"%s\" માં ફોલ્ડરો ચકાસી રહ્યા �
 msgid "_View"
 msgstr "દેખાવ (_V)"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "નવી વિન્ડોમાં ખોલો (_N)"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "નકલ કરો (_C)..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "ખસેડો (_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "નવું ફોલ્ડર (_N)..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "નામ બદલો (_R)..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "કચરાપેટી ખાલી કરો (_E)"
 
@@ -11417,13 +11357,13 @@ msgstr "કચરાપેટી ખાલી કરો (_E)"
 msgid "Copying `%s' to `%s'"
 msgstr "`%s' ને `%s' માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../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:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "નકલ કરો (_o)"
 
@@ -11445,208 +11385,208 @@ msgstr "ફોલ્ડર બનાવો"
 msgid "Specify where to create the folder:"
 msgstr "સ્પષ્ટ કરો કે ક્યાં ફોલ્ડર બનાવવું છે:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "મોકલનારને વળતો જવાબ આપો (_R)"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../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:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "નવા સંદેશાઓમાં ફેરફાર કરો (_E)..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "કાઢી નંહિ (_n)"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "ફોલ્ડરમાં ખસેડો (_M)..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "આ ફોલ્ડરમાં નકલ કરો (_C)..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "વાંચ્યુ હોય એમ નિશાનિત કરો (_k)"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "નહિં વાંચેલ છે એમ ચિહ્નિત કરો (_U)"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "મહત્વનું એમ નિશાનિત કરો (_I)"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "મહત્વનું નથી એમ નિશાનિત કરો (_M)"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "બગડેલ છે એમ નિશાનિત કરો (_J)"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "બગડેલ નથી એમ નિશાનિત કરો (_N)"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "અનુસરણ માટેનું ચિહ્ન (_w)..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "લેબલ (_L)"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "કંઈ નહિં (_N)"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "નિશાની પૂર્ણ થયેલ છે (_g)"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "નિશાની સાફ કરો (_e)"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "સંદેશામાંથી નિયમ બનાવો (_t)"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "વિષયમાંથી ફોલ્ડર શોધો (_S)"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "મોકલનારમાંથી ફોલ્ડર શોધો (_n)"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "મેળવનારમાંથી ફોલ્ડર શોધો (_R)"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "મેઈલિંગ યાદીમાંથી ફોલ્ડર શોધો (_L)"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "વિષય પર ગાળો (_j)"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "મોકલનાર પર ગાળો (_d)"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "મેળવનારા પર ગાળો (_c)"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "મેઈલીંગ યાદી પર ગાળો (_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "મૂળભુત"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2111
 #: ../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:2271
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "સંદેશો પાછો મેળવવા સમર્થ નથી"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2460
+msgid "_Copy Link Location"
+msgstr "કડીની જગ્યાની નકલ કરો (_C)"
+
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "શોધ ફોલ્ડર બનાવો (_S)"
 
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "આ સરનામા તરફથી (_F)"
 
-#: ../mail/em-folder-view.c:2471
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "આ સરનામા પ્રતિ (_T)"
 
-#: ../mail/em-folder-view.c:2825
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "મેઈલ %s કરવા માટે ક્લિક કરો"
 
-#: ../mail/em-folder-view.c:2830
-msgid "Click to hide/unhide addresses"
-msgstr "સરનામાઓ છુપાવવા/બતાવવા માટે ક્લિક કરો"
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "બંધબેસતા: %d"
 
-#: ../mail/em-format-html-display.c:781 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "સહી કરેલ નથી"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "સંદેશો સહી કરેલ નથી. સંદેશો યોગ્ય હોય એની કોઈ ગેરંટી નથી."
 
-#: ../mail/em-format-html-display.c:782 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "માન્ય સહી"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 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:783 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "અયોગ્ય સહી"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "આ સંદેશાની આ સહી ચકાસાયેલ નથી, તે પરિવહન દરમ્યાન બદલી દેવાયેલ છે."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "માન્ય સહી, મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 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:790 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "એનક્રિપ્ટ થયેલ નથી"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "સંદેશો એનક્રિપ્ટ થયેલ નથી. તેના સમાવિષ્ટો ઈન્ટરનેટ પર પરિવહન દરમ્યાન દેખાઈ શકે છે."
 
-#: ../mail/em-format-html-display.c:791 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "એનક્રિપ્ટ થયેલ, નબળુ"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11655,21 +11595,21 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, પરંતુ નબળા એનક્રિપ્શન અલગોરિધમ સાથે. તે મુશ્કેલ હશે, પરંતુ એ "
 "બહારના વ્યક્તિ માટે પ્રાયોગિક સમય દરમ્યાન સંદેશાના સમાવિષ્ટો જોવાનું અશક્ય નથી."
 
-#: ../mail/em-format-html-display.c:792 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "એનક્રિપ્ટ થયેલ"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 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:793 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "એનક્રિપ્ટ થયેલ, મજબૂત"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11678,72 +11618,72 @@ msgstr ""
 "આ સંદેશો એનક્રિપ્ટ થયેલ છે, મજબૂત એનક્રિપ્શન અલગોરિધમ સાથે. બહારની વ્યક્તિ માટે પ્રાયોગિક "
 "સમય દરમ્યાન આ સંદેશાના સમાવિષ્ટોને જોવાનું મુશ્કેલ થઈ જશે."
 
-#: ../mail/em-format-html-display.c:894 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "પ્રમાણપત્ર જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "આ પ્રમાણપત્ર જોઈ શકાય એમ નથી"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p પૂર્ણ થઈ જશે"
 
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ઈચ્છિત સમયે નહિં થયેલ કાર્ય:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p દ્વારા"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "લીટીમાં જુઓ (_V)"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "છુપાવો (_H)"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "પહોળાઈમાં બંધબેસાડો (_F)"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "મૂળ માપ બતાવો (_O)"
 
-#: ../mail/em-format-html-display.c:1693 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "જોડાણ"
 
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "બધા જોડાણ સંગ્રહવા માટે ફોલ્ડર પસંદ કરો..."
 
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "પસંદિત સંગ્રહો (_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d જોડાણ (_n)"
 msgstr[1] "%d જોડાણો (_n)"
 
-#: ../mail/em-format-html-display.c:2021 ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "બધું સંગ્રહો (_a)"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "કોઈ જોડાણ નથી"
 
@@ -11757,94 +11697,94 @@ msgstr "પાનુ %d %d નું"
 msgid "Retrieving `%s'"
 msgstr "`%s' મેળવી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "માન્ય સહી પરંતુ મોકલનારને ચકાસી શકતા નથી"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "બાહ્ય ભાગનો કદરુપો ભાગ."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP સાઈટ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક સાઈટ \"%s\" માન્ય છે"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "સ્થાનિક ફાઈલ (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "દૂરસ્થા માહિતી (%s) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "અજ્ઞાત બાહ્ય માહિતી (\"%s\" પ્રકારની) નો નિર્દેશક"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "સંદેસાનું બંધારણ ઘડી રહ્યા છીએ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "પ્રતિ"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "મેઈલ મોકલનાર"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 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:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../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:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "સમાચાર જૂથો"
@@ -11894,7 +11834,7 @@ msgstr "અઠવાડિયામાં એક વાર"
 msgid "Once per month"
 msgstr "મહિનામાં એક વાર"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -11905,47 +11845,47 @@ msgstr ""
 "\n"
 "મહેરબાની કરીને ઈવોલ્યુશન તમારા ફોલ્ડરોને ફેરવે ત્યાં સુધી શાંતિ દાખવો..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "નવું ફોલ્ડર `%s' બનાવવામાં સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ફોલ્ડર `%s' ને `%s' માં નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "વર્તમાન મેઈલબોક્સને `%s' આગળ ચકાસવા માટે સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "જૂની POP keep-on-server માહિતી `%s' ખોલવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "POP3 keep-on-server માહિતી ડિરેક્ટરી `%s' બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "POP3 keep-on-server માહિતી `%s' નકલ કરવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "સ્થાનિક મેઈલ સંગ્રહસ્થાન `%s' બનાવવામાં નિષ્ફળ: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "`%s' જગ્યાએ સ્થાનિક મેઈલ ફોલ્ડરો બનાવવા સમર્થ નથી: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -11962,6 +11902,10 @@ msgstr "મોકલનારને જવાબ આપો (_R)"
 msgid "Reply to _List"
 msgstr "યાદીને જવાબ આપો (_L)"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "કડીને બ્રાઉઝરમાં ખોલો (_O)"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "ના પ્રતિ નવો સંદેશો મોકલો (_S)..."
@@ -11991,28 +11935,28 @@ msgstr "મહેરબાની કરીને સર્વર પસંદ �
 msgid "No server has been selected"
 msgstr "કોઈ સર્વર પસંદ થયેલ નથી"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "આ સંદેશો ફરીથી બતાવો નહિં."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "સંદેશા ગાળકો"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "સંદેશો"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "સંદેશો સંગ્રહો..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "સરનામુ ઉમેરો"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "%s માંથી સંદેશાઓ"
@@ -12054,107 +11998,82 @@ msgid "Composer Window default width"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "સરનામાઓનું દૃશ્ય TO/CC/BCC માં સંકુચિત કરે છે"
-
-#: ../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 "સરનામાઓનું દૃશ્ય TO/CC/BCC માં address_count માં સ્પષ્ટ થયેલ નંબર પ્રમાણે સંકુચિત કરે છે."
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બનાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "અક્ષરોનો મૂળભુત સમૂહ કે જેમાં સંદેશાઓ બતાવવાના છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "મૂળભુત આગળ ધપાવવાની શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "ઉમેદવારી સંવાદની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "વળતા જવાબની મૂળભુત શૈલી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "કમ્પોઝર વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "ઉમેદવારી સંવાદની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "તમે ટાઈપ કરો તે શબ્દ પર જોડણઈ ભૂલ સૂચવનારાઓ દોરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "ખાલી કચરાપેટી ફોલ્ડરો અસ્તિત્વમાં નથી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "ઈવોલ્યુશનમાંથી બહાર નીકળો ત્યારે બધા કચરાપેટી ફોલ્ડરો ખાલી કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "કેરેટ સ્થિતિ સક્રિય કરો, કે જેથી તમે મેઈલ વાંચતી વખતે કર્સર જોઈ શકો."
 
-#: ../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
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "કેરેટ સ્થિતિ સક્રિય/નિષ્ક્રિય કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "સંદેશા યાદી તકતીની ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "સંદેશા-યાદી તકતીની ઊંચાઈ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12162,7 +12081,7 @@ msgstr ""
 "જો વપરાશકર્તા ૧૦ અથવા વધુ સંદેશાઓ એક જ સમયે ખોલવાનો પ્રયત્ન કરે, તો જો વપરાશકર્તા "
 "ખરેખર ઈચ્છા ધરાવતો હોય તો તેને પૂછો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12171,23 +12090,23 @@ msgstr ""
 "જો ત્યાં કોઈ આંતરિક દર્શક કોઈ ચોક્કસ પ્રકારના mime કે જે ઈવોલ્યુશનની અંદર હોય, અને કોઈ "
 "પ્રકારના mime."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "છેલ્લી વખતે ખાલી કચરાપેટી ચાલી હતી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "લેબલો અને તેની સાથે સંકળાયેલ રંગોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "સ્વીકાર્ય લાઈસન્સોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "ખાતાઓની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12195,11 +12114,11 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ કમ્પોનન્ટ માટે જાણીતા ખાતાઓની યાદી. યાદી શબ્દમાળા ધરાવે છે જે /apps/"
 "evolution/mail/accounts ની ઉપડિરેક્ટરીને અનુલક્ષે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "કસ્ટમ હેડરોની યાદી અને શું તેઓ સક્રિય છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12207,19 +12126,19 @@ msgstr ""
 "ઈવોલ્યુશનના મેઈલ ભાગને જાણતા લેબલોની યાદી. યાદી શબ્દમાળાઓ ધરાવે છે જે નામ:રંગ ધરાવે છે કે "
 "જ્યાં રંગો HTML હેક્ઝ સંગ્રહપદ્ધતિ વાપરે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "બોનોબો કમ્પોનન્ટ દર્શકોની ચકાસણી માટે mime પ્રકારોની યાદી"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "પ્રોટોકોલ નામોની યાદી કે જેઓનું લાઈસન્સ સ્વીકારાયેલ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12228,95 +12147,91 @@ msgstr ""
 "HTML સંદેશાઓ માટે http ની ઉપર ચિત્રો લાવો. શક્ય કિંમતો છે: ૦ - ક્યારેય નેટ પરથી ચિત્રો "
 "લાવો નહિં ૧ - સંપર્કોમાંથી મેઈલમાં ચિત્રો લાવો ૨ - હંમેશા નેટ પરથી ચિત્રો લાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "ગાળકની ક્રિયાઓનો લોગ કોઈ સ્પષ્ટ કરેલ લોગ ફાઈલમાં કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "ગાળકની ક્રિયાઓનો લોગ માટેની લોગ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "સ્પષ્ટ કરેલ સમય સમાપ્ત થાય પછી જોયું છે એમ ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "સ્પષ્ટ કરેલ સમય પછી જોયું હોય એમ ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "સંદેશા \"પૂર્વદર્શન\" માં સાઈટ બનાવવાનું ચિહ્નિત કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "સંદેશા વિન્ડોની મૂળભુત ઊંચાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "સંદેશા વિન્ડોની મૂળભુત પહોળાઈ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "સંદેશા-પ્રદર્શન શૈલી (\"સામાન્ય\", \"આખી હેડરો\", \"સ્રોત\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "બહાર નીકળવા પર કચરાપેટીને ખાલી કરતી વખતે લાગતા ન્યુનતમ દિવસો, દિવસોમાં."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "નવો મેઈલ ધ્વનિ ફાઈલ સૂચવે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "નવા મેઈલનો સૂચક પ્રકાર"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "TO/CC/BCC માં દર્શાવવા માટેના સરનામાઓની સંખ્યા"
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "ખાલી વિષય પર પ્રોમ્પ્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "જ્યારે તે અથવા તેણી ફોલ્ડરને સંપૂર્ણ રીતે દૂર કરવા માંગો ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "જ્યારે તે અથવા તેણી વિષય વગર સંદેશો મોકલવાનો પ્રયત્ન કરે છે ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "જ્યારે વપરાશકર્તા સંપૂર્ણપણે દૂર કરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "જ્યારે વપરાશકર્તા માત્ર આને પણ ખબર વિના મોકલો ભરે છે ત્યારે પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "જ્યારે વપરાશકર્તા એક જ સમયે ૧૦ અથવા વધુ સંદેશાઓ ખોલવાનો પ્રયત્ન કરે ત્યારે પૂછો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12324,89 +12239,89 @@ msgstr ""
 "જ્યારે વપરાશકર્તા HTML મેઈલ મેળવનારાઓને મોકલે છે કે જેઓ HTML મેઈલ મેળવવા માંગતા ના હોય "
 "ત્યારે વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "જ્યારે વપરાશકર્તા સંદેશો પ્રતિ અને આને પણ ભર્યા વગર મોકલવાનો પ્રયત્ન કરે છે ત્યારે "
 "વપરાશકર્તાને પૂછે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "જ્યારે વપરાશકર્તા બિનજરુરી HTML મોકલવાનો પ્રયત્ન કરે છે ત્યારે તે વપરાશકર્તાને પૂછે છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "લખાણમાં કડીઓ ઓળખે છે અને તેઓને બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "લખાણમાં હસતા મોં ઓળખે છે અને તેમને ચિત્રો સાથે બદલે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "આવતા મેઈલ પર સામાન્ય ચકાસણી ચલાવ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "મૂળભુત રીતે HTML મેઈલ મોકલો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "એનિમેશન બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "હાલતાં ચાલતાં ચિત્રો એનિમેશન તરીકે બતાવો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો (ચેકી નંખાયેલ રીતે)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "કાઢી નંખાયેલ સંદેશાઓ સંદેશા યાદીમાં બતાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "જ્યારે નવા મેઈલ આવે ત્યારે વગાડવાની ધ્વનિ ફાઈલ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "નવા મેઈલનું સૂચનનો પ્રકાર સ્પષ્ટ કરે છે જ્યારે વપરાશકર્તા તેને વાપરવાની ઈચ્છા ધરાવે છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "લીટીમાં જોડણી ચકાસો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "સંવાદની મૂળભુત ઊંચાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "સંવાદની મૂળભુત પહોળાઈ નોંધાવો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "છેલ્લે વખતે ખાલી કચરાપેટી ચાલી હતી, દિવસોમાં ઈપોકથી."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટેના ટર્મિનલ ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12417,105 +12332,99 @@ msgstr ""
 "થશે. XML સંરચનાનું બંધારણ &lt;હેડર સક્રિય&gt; હોય છે - સક્રિય સુયોજિત કરો જો હેડર એ મેઈલ "
 "દેખાવમાં પ્રદર્શિત થાય."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-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:91
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "સંદેશાની યાદીને થ્રેડ કરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "વિષયને આધારિત સંદેશા-યાદીને થ્રેડ કરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "સંદેશાને જોયેલો છે એમ ચિહ્નિત કરવા માટેનો સમયસમાપ્તિ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "સંદેશાને જોયેલો છે એમ ચિહ્નિત કરવા માટેનો સમયસમાપ્તિ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "મૂળભુત ખાતાની UID શબ્દમાળા."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin ડિમન અને ક્લાઈન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin ડિમન અને ક્લાઈન્ટ વાપરો (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "મેઈલ પ્રદર્શિત કરવા માટે કસ્ટમ ફોન્ટ વાપરો"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "માત્ર સ્થાનિક ચકાસણીઓ વાપરો (DNS નહિં)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "ચલિત પહોળાઈના ફોન્ટ"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "દેખાવ/આને પણ ખબર વિના મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "દેખાવ/આને પણ મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "દેખાવ/તરફથી મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "દેખાવ/ને મોકલો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "દેખાવ/ને જવાબ આપો મેનુ વસ્તુઓ ચકાસાઈ ગઈ છે."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12554,7 +12463,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "બર્કલી મેઈલબોક્સ બંધારણના ફોલ્ડરો આયાત કરનાર"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' આયાત કરી રહ્યા છીએ"
@@ -12562,7 +12471,7 @@ msgstr "`%s' આયાત કરી રહ્યા છીએ"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "મહેરબાની કરીને રાહ જુઓ"
 
@@ -13395,26 +13304,18 @@ msgid "_Show image animations"
 msgstr "ચિત્ર એનીમેશનો બતાવો (_S)"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "પ્રતિ / આને પણ / આને પણ ખબર વિના હેડરો આમાં સંકોચો (_S) "
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "સુરક્ષિત જોડાણ વાપરો (_U):"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "બીજા કાર્યક્રમોનની જેમ સરખા ફોન્ટ વાપરો (_U)"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "સરનામાઓ"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "રંગ"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "વર્ણન"
 
@@ -13525,21 +13426,21 @@ msgstr "બધા સ્થાનિક ફોલ્ડરો સાથે"
 msgid "Pinging %s"
 msgstr "%s ને ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "ફોલ્ડરો ગાળી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "મેઈલ મેળવી રહ્યા છીએ"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "જતા ગાળકો અમલમાં મૂકવામાં નિષ્ફળ: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13548,114 +13449,123 @@ msgstr ""
 "%s માં ઉમેરવામાં નિષ્ફળ: %s\n"
 "એની જગ્યાએ `મોકલો' ફોલ્ડરમાં ઉમેરી રહ્યા છીએ."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "સ્થાનિક `મોકલો' ફોલ્ડરમાં ઉમેરવામાં નિષ્ફળ: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d માંના %d સંદેશાને મોકલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d માંના %d સંદેશાઓને મોકલવામાં નિષ્ફળ"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "રદ થઈ ગયેલ."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "પૂર્ણ."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "સંદેશાને ફોલ્ડરમાં સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "સંદેશાઓને %s માં ખસેડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "સંદેશાઓને %s માં નકલ કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "આગળ ધપાવાયેલ સંદેશાઓ"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "ફોલ્ડર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "સ્ટોર %s ખોલી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "ફોલ્ડર %s દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "ફોલ્ડર '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "ખાતું '%s' સંપૂર્ણપણે દૂર કરી રહ્યા છીએ અને સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "ખાતુ '%s' સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "ફોલ્ડર ફરીથી તાજું કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "ફોલ્ડર સંપૂર્ણપણે દૂર કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "કચરાપેટીને '%s' માં ખાલી કરી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "સ્થાનિક ફોલ્ડરો"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "સંદેશો %s મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d સંદેશો મેળવી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ મેળવી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d સંદેશાનો સંગ્રહ કરી રહ્યા છીએ"
 msgstr[1] "%d સંદેશાઓ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"આઉટપુટ ફાઈલ બનાવવા સમર્થ નથી: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13664,11 +13574,11 @@ msgstr ""
 "માં સંદેશાઓ સંગ્રહતી વખતે ભૂલ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "જોડાણ સંગ્રહી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13677,22 +13587,22 @@ msgstr ""
 "આઉટપુટ ફાઈલ બનાવી શકતા નથી: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "માહિતી લખી શક્યા નહિં: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%sમાંથી સંપર્ક તોડી રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s સાથે ફરીથી જોડાઈ રહ્યા છીએ"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "સેવા ચકાસી રહ્યા છીએ"
 
@@ -13720,26 +13630,17 @@ msgstr "રાહ જોઈ રહ્યા છીએ..."
 msgid "Checking for new mail"
 msgstr "નવા મેઈલ માટે ચકાસી રહ્યા છીએ"
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "%s માટે પાસફ્રેઝ દાખલ કરો"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "પાસફ્રેઝ દાખલ કરો"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s માટે પાસવર્ડ દાખલ કરો"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "પાસવર્ડ દાખલ કરો"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "વપરાશકર્તાએ પ્રક્રિયા નકારી કાઢી."
 
@@ -14351,74 +14252,74 @@ msgstr "સંપૂર્ણપણે કાઢી નાંખો (_E)"
 msgid "_Open Messages"
 msgstr "સંદેશાઓ ખોલો (_O)"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "જોયેલ નથી"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "જોયેલ છે"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "જવાબ અપાયેલ છે"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "ઘણા બધા નહિં જોયેલા સંદેશાઓ"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "ઘણા બધા સંદેશાઓ"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "નીચામાં નીચું"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "થી નીચું"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "થી ઊંચું"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "ઊંચામાં ઊંચુ"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "આજે %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "ગઈકાલે %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "સંદેશાઓ"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "સંદેશા યાદી બનાવી રહ્યા છીએ"
 
@@ -14446,7 +14347,7 @@ msgstr "મૂળ જગ્યા"
 msgid "Received"
 msgstr "મેળવેલ છે"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "માપ"
@@ -14710,6 +14611,10 @@ msgstr ""
 "ચકાસણી પ્લગઈન કે જે પોપઅપ મેનુ પ્લગઈન રજૂ કરે છે જે તમને વસ્તુઓની ક્લિપબોર્ડમાં નકલ કરવા માટે "
 "પરવાનગી આપે છે."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "ઈમેઈલ સરનામાની નકલ કરો (_E)"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "સાધનની નકલ કરો"
@@ -14847,19 +14752,19 @@ msgstr "ફોલ્ડરોનું માપ"
 msgid "Exchange Settings"
 msgstr "એક્સચેન્જ સુયોજનો"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "સત્તાધિકરણ કરો (_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "સત્તાધિકરણ પ્રકાર"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "આધારભૂત પ્રકારો માટે ચકાસો (_e)"
 
@@ -15178,11 +15083,11 @@ msgstr "ફોલ્ડરો દર્શાવી શકતા નથી."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
-"ફેરબદલી ખાતા \"{0}\" માટેના વિકલ્પોમાં ફેરફારો માત્ર ઈવોલ્યુશન પુનઃશરૂ કર્યા પછી જ અસર "
-"આપશે."
+"એક્સચેન્જ ખાતા રૂપરેખાંકનમાં બદલે છે જે તમે ઈવોલ્યુશનમાંથી બહાર નીકળો અને તેને ફરીથી શરૂ કરો "
+"ત્યારે થશે."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15340,8 +15245,8 @@ msgid "Password successfully changed."
 msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "ફેરફારોની અસર જોવા માટે મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
+msgid "Please restart Evolution"
+msgstr "મહેરબાની કરીને ઈવોલ્યુશન પુનઃશરૂ કરો"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15720,12 +15625,12 @@ msgid "Select Calendar"
 msgstr "કેલેન્ડર પસંદ કરો"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "આયાત (_I)"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar બંધારણ (.ics)"
 
@@ -16294,10 +16199,8 @@ msgstr "Itip ફોર્મેટર"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
-msgstr ""
-"&quot;{0}&quot; એ મંત્રણા આયોજિત કરી હતી. શું તમે &quot;{1}&quot; પ્રતિનીધિ ઉમેરવા "
-"માંગો છો?"
+"&quot;{1}&quot; ?"
+msgstr "&quot;{0}&quot; એ મંત્રણા આયોજિત કરી હતી. શું તમે &quot;{1}&quot; પ્રતિનીધિ ઉમેરવા માંગો છો ?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
@@ -16796,12 +16699,12 @@ msgstr "બધા જોડાણ સંગ્રહો"
 msgid "Select save base name"
 msgstr "આધાર નામ સંગ્રહો પસંદ કરો"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME પ્રકાર"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "સંગ્રહો"
 
@@ -16911,7 +16814,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF બંધારણ (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "અંતિમ મુકામ ફાઈલ પસંદ કરો"
 
@@ -16960,18 +16863,18 @@ msgstr ""
 "મહેરબાની કરીને ચાલુ રાખવા માટે \"આગળ ધપાવો\" બટન ક્લિક કરો. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "મહેરબાની કરીને તમે જેની આયાત કરવા માંગો તે જાણકારી પસંદ કરો:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "%s માંથી:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "માહિતી આયાત કરી રહ્યા છીએ."
 
@@ -17025,64 +16928,56 @@ msgid "Default window height"
 msgstr "મૂળભુત વિન્ડો ઊંચાઈ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
-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:7
+#: ../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 "શરુઆતમાં ભાગનું ID અથવા ઉપનામ મૂળભુત રીતે દેખાય છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "છેલ્લે સુધારાયેલ રૂપરેખાંકન આવૃત્તિ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "ફોલ્ડરો માટે યાદીના પથો કે જે ઓફલાઈન વપરાશ માટે ડિસ્ક સાથે સુમેળ કરવાના છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "પ્રિન્ટર સુયોજનો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Sidebar is visible"
 msgstr "બાજુપટ્ટી દૃશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "વિકાસ ચેતવણી સંવાદ અવગણો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ઓફલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "પરિસ્થિતિદર્શક પટ્ટી દૃશ્યમાન છે"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ઈવોલ્યુશનની રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/રૂપરેખાંકન સ્તર સાથે (ઉદાહરણ તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત ઊંચાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "મુખ્ય વિન્ડો માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "બાજુની પટ્ટી માટે મૂળભુત પહોળાઈ, પિક્સેલોમાં."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17090,7 +16985,7 @@ msgstr ""
 "ઈવોલ્યુશનની છેલ્લી સુધારાયેલ રૂપરેખાંકિત આવૃત્તિ, મુખ્ય/ગૌણ/ રૂપરેખાંકન સ્તરો સાથે (ઉદાહરણ "
 "તરીકે \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17100,43 +16995,35 @@ msgstr ""
 "\"સાધનપટ્ટી\" સુયોજિત હોય, તો જીનોમ સાધનપટ્ટી સુયોજનો દ્વારા બટનોની શૈલી નક્કી થાય "
 "છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "સાધનપટ્ટી દ્રશ્યમાન છે"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "શું ઈવોલ્યશન ઓનલાઈન સ્થિતિની જગ્યાઓ ઓફલાઈન સ્થિતિમાં શરૂ થશે."
 
-#: ../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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "શું સાધનપટ્ટી દ્રશ્યમાન થશે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "શું ઈવોલ્યુશનની વિકાસ આવૃત્તિઓમાંનો ચેતવણી સંવાદ અવગણાયેલ છે."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "શું વિન્ડો બટનો દેખાવા જોઈએ."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "વિન્ડો બટન શૈલી"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "વિન્ડો બટનો દ્રશ્યમાન છે"
 
@@ -17157,11 +17044,11 @@ msgstr "આ જોડાણો બંધ કરવા માટે બરાબ�
 msgid "(Untitled)"
 msgstr "(શીર્ષક વગરનું)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "ચલાવવા માટે આયાત કરનારનો પ્રકાર પસંદ કરો:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17175,11 +17062,11 @@ msgstr ""
 "જો તમે જાણતા ના હોય તો તમે \"આપોઆપ\" પસંદ કરી શકો છો, અને ઈવોલ્યુશન તેને કામ કરવા "
 "માટે લઈ લેશે."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "આ આયાત માટે અંતિમ મુકામ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17191,23 +17078,23 @@ msgstr ""
 "સુયોજનો મળ્યા નથી. જો તમે ફરીથી પ્રયત્ન કરવા\n"
 "માંગતા હોય, તો મહેરબાની કરીને \"પાછળ\" બટન ક્લિક કરો.\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "ફાઈલનું નામ (_i):"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "ફાઈલ પસંદ કરો"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "ફાઈલનો પ્રકાર (_t):"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "જૂના કાર્યક્રમોમાંથી માહિતી અને સુયોજનો આયાત કરો (_o)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "એક ફાઈલ જ આયાત કરો (_s)"
 
@@ -17271,19 +17158,19 @@ msgstr "ઓફલાઈન કામ કરો (_W)"
 msgid "Work Offline"
 msgstr "ઓફલાઈન કામ કરો"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓનલાઈન છે. ઓફલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:379
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "ઈવોલ્યુશન પ્રક્રિયાને ઓફલાઈન કામ કરવાની પ્રક્રિયામાં છે."
 
-#: ../shell/e-shell-window.c:386
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ઈવોલ્યુશન વર્તમાનમાં ઓફલાઈન છે. ઓનલાઈન કામ કરવા માટે આ બટન પર ક્લિક કરો."
 
-#: ../shell/e-shell-window.c:786
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "%s માં બદલો"
@@ -17368,7 +17255,7 @@ msgstr ""
 "કેવી રીતે આયાત કરવી તે પ્રક્રિયાનું માર્ગદર્શન આપવામાં આવેલ છે."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17403,7 +17290,7 @@ msgstr ""
 "અમે એવી આશા રાખીએ છીએ કે તમે અમારી સખ્ત મહેનતના પરિણામને માણી રહ્યા હશો,\n"
 "અને અમે તમારા ફાળાની આતુરતાથી રાહ જોઈ રહ્યા છીએ!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17411,39 +17298,35 @@ msgstr ""
 "આભાર\n"
 "ઈવોલ્યુશન ટુકડી\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "મને ફરી વાર કહો નહિં"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "સ્પષ્ટ કરેલ કમ્પોનન્ટ ક્રિયાશીલ કરવા માટે ઈવોલ્યુશન શરુ કરો"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ઓનલાઈન સ્થિતિમાં શરુ કરો"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ઈવોલ્યુશનના બધા કમ્પોનન્ટો દબાણપૂર્વક બંધ કરી દો"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ઈવોલ્યુશન ૧.૪ માંથી દબાણપૂર્વક ફેરવો"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ફાઈલના બધા કમ્પોનન્ટો માટે ભૂલ શોધવા માટેનું આઉટપુટ મોકલો."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "કોઈપણ પ્લગઈનો લાવવાનું નિષ્ક્રિય કરો."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "- ઈવોલ્યુશન PIM અને ઈમેઈલ ક્લાઈન્ટ"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18101,12 +17984,6 @@ msgstr "બધા સંપર્કોની નકલ અંહિ કરો (
 msgid "Contact _Preview"
 msgstr "સંપર્ક પૂર્વદર્શન (_P)"
 
-#: ../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
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "પસંદિત સંપર્કોને બીજા ફોલ્ડરમાં નકલ કરો..."
@@ -18208,7 +18085,7 @@ 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-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "બધું પસંદ કરો (_A)"
@@ -18339,7 +18216,6 @@ msgid "Month"
 msgstr "મહિનો"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "આગળ વધો"
 
@@ -18348,7 +18224,7 @@ msgid "Previews the calendar to be printed"
 msgstr "કેલેન્ડરનું છાપન માટે પૂર્વદર્શન આપે છે"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "પહેલાનું"
 
@@ -18436,11 +18312,11 @@ msgstr "પસંદગીને ક્લિપબોર્ડમાં કા�
 msgid "Paste from clipboard"
 msgstr "ક્લિપબોર્ડમાંથી ચોંટાડો"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "ક્લિપબોર્ડમાંથી લખાણ ચોંટાડો"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "બધું લખાણ પસંદ કરો"
 
@@ -18475,31 +18351,30 @@ msgstr "ઉપલબ્ધ મદદ જોવા માટે અંહિ ક�
 msgid "Close"
 msgstr "બંધ કરો"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "દાખલ કરો (_n)"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "જોડાણ (_A)..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "બંધ કરો (_C)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "ફાઈલ (_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "મદદ (_H)"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "દાખલ કરો (_I)"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "વિકલ્પો (_O)"
@@ -18597,11 +18472,6 @@ msgstr "શું સમયને વ્યસ્ત તરીકે બતા�
 msgid "_Alarms"
 msgstr "એલાર્મ (_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "વર્ગો (_C)"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19352,6 +19222,11 @@ msgstr "જ્યારે તમારો સંદેશો વંચાય �
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "દાખલ કરો (_n)"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "ફાઈલ ખોલો"
@@ -19986,19 +19861,14 @@ msgstr "દેખાવનો પ્રકાર"
 msgid "Type of view:"
 msgstr "દેખાવનો પ્રકાર:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MTWTFSS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20066,7 +19936,7 @@ msgid "Minimum Width"
 msgstr "ન્યુનતમ પહોળાઈ"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "જગ્યા છોડી રહ્યા છીએ"
 
@@ -20208,23 +20078,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "વિસ્તૃત થયેલ"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "શું વિસ્તારનાર વિસ્તૃત થશે કે નહિં"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "વિસ્તારનારના લેબલનું લખાણ"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "નીચે લીટી વાપરો"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -20232,31 +20102,31 @@ msgstr ""
 "જો સુયોજિત હોય, તો લખાણમાં નીચે લીટી પછીનો અક્ષર મ્નેમોનિક એસીલરેટર કી માટે વપરાય છે "
 "એમ સૂચવે છે"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "લેબલ અને બાળક વચ્ચે મૂકવાની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "લેબલ વિજેટ"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "રોજિંદા વિસ્તૃતકારક લેબલ ની જગ્યાએ વિજેટ બતાવો"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "વિસ્તારનારનું માપ"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "વિસ્તારનાર તીરનું માપ"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "સૂચકની વચ્ચેની જગ્યા"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "વિસ્તારનાર તીરની ફરતે જગ્યા છોડી રહ્યા છીએ"
 
@@ -20336,39 +20206,39 @@ msgstr "સ્તંભ પહોળાઈ"
 msgid "Search"
 msgstr "શોધ"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "શોધ (_S)"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "હમણાં શોધો (_F)"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "સાફ કરો (_C)"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "શોધ પ્રકાર"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "વસ્તુ ID"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ઉપવસ્તુ ID"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "લખાણ"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
-msgstr "હમણાં શોધો (_w)"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
+msgstr "હમણા શોધો (_N)"
 
 #: ../widgets/misc/e-selection-model-array.c:547
 #: ../widgets/table/e-tree-selection-model.c:811
diff --git a/po/hu.po b/po/hu.po
index 91b9654d8f..2eeb347ea7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,26 +2,26 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the evolution package.
 # meeting - találkozó
-#appointment- értekezlet
+# appointment- értekezlet
+#
 # Szabolcs Ban <shooby@gnome.hu>, 2000.
 # Andras Timar <timar@gnome.hu>, 2001, 2002, 2003, 2004.
 # Zsiraf <zsiraf@mylinux.hu>, 2003.
 # Laszlo Dvornik <dvornik@gnome.hu>, 2004.
 # Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005, 2006.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-07 06:12+0100\n"
-"PO-Revision-Date: 2006-03-18 23:29+0100\n"
+"POT-Creation-Date: 2006-05-24 05:36+0200\n"
+"PO-Revision-Date: 2006-05-25 03:42+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -63,32 +63,32 @@ msgstr "Névjegyek: "
 msgid "evolution minicard"
 msgstr "evolution minikártya"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Vannak figyelmeztetések."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Vannak ismétlődései."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Ez egy találkozó."
 
-#: ../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 "Naptáresemény összefoglalója: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Naptáresemény: nincs összefoglalója."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "naptáresemény megjelenítése"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Fókusz elkapása"
 
@@ -117,14 +117,14 @@ msgstr "Ugrás dátumra"
 msgid "a table to view and select the current time range"
 msgstr "a megjelenítendő tábla és válassza ki a jelenlegi időtartamot"
 
-#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "%d esemény tartozik hozzá."
 msgstr[1] "%d esemény tartozik hozzá."
 
-#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Nem tartozik hozzá esemény."
 
@@ -218,21 +218,21 @@ msgstr "Ugrás gomb"
 msgid "Click here, you can find more events."
 msgstr "Kattintson ide további események kereséséhez."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Hónapnézet: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Hétnézet: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "naptárnézet egy hónaphoz"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "naptárnézet egy vagy több héthez"
 
@@ -548,9 +548,9 @@ msgstr "Automatikus kiegészítés beállítása itt"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Névjegyek"
 
@@ -806,10 +806,11 @@ msgstr "Ú_j címjegyzék"
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/e-calendar-table.c:1194
 #: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
-#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091 ../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
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
+#: ../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 "_Törlés"
 
@@ -819,11 +820,11 @@ msgstr "Mentés Vcardként..."
 
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
-#: ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Névjegyforrás-választó"
 
@@ -832,12 +833,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Adja meg %s jelszavát (%s felhasználó)"
@@ -1019,9 +1020,9 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
-"A keresési szűrő a keresett objektumok típusa a keresés végrehajtása "
-"közben. Ennek módosítása nélkül a keresés a \"személy\" "
-"objektumosztályán lesz végrehajtva."
+"A keresési szűrő a keresett objektumok típusa a keresés végrehajtása közben. "
+"Ennek módosítása nélkül a keresés a \"személy\" objektumosztályán lesz "
+"végrehajtva."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1047,8 +1048,8 @@ msgid ""
 "vulnerable to security exploits."
 msgstr ""
 "Ez a beállítás azt jelenti, hogy a kiszolgáló nem támogatja sem az SSL, sem "
-"a TLS protokollt. Emiatt a kapcsolat nem lesz biztonságos és "
-"sebezhetővé válik a biztonsági hibákkal szemben."
+"a TLS protokollt. Emiatt a kapcsolat nem lesz biztonságos és sebezhetővé "
+"válik a biztonsági hibákkal szemben."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1073,8 +1074,8 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "A keresési alap a bejegyzésnek az a megkülönböztető neve, ahol a keresés "
-"kezdődik majd. Amennyiben üresen hagyja, a keresés a könyvtárfa "
-"gyökerében fog kezdődni."
+"kezdődik majd. Amennyiben üresen hagyja, a keresés a könyvtárfa gyökerében "
+"fog kezdődni."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -2545,6 +2546,22 @@ msgstr ""
 "A névjegyadat érvénytelen:\n"
 "\n"
 
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "\"%s\" formátuma érvénytelen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s\"%s\" formátuma érvénytelen"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s\"%s\" üres"
+
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Érvénytelen névjegy."
@@ -2702,8 +2719,8 @@ msgstr "_IM szolgáltatás:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "He_ly:"
 
@@ -2947,12 +2964,13 @@ msgstr "_Kivágás"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
+#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Másolás"
 
@@ -3427,9 +3445,9 @@ msgid ""
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy a "
-"címjegyzék nincs megjelölve, vagy még nem lett letöltve kapcsolat nélküli "
-"használatra. A letöltéséhez nyissa meg egyszer online módban."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy a címjegyzék "
+"nincs megjelölve, vagy még nem lett letöltve kapcsolat nélküli használatra. "
+"A letöltéséhez nyissa meg egyszer online módban."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
@@ -3437,16 +3455,16 @@ msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr ""
-"Nem nyitható meg a címjegyzék. Ellenőrizze, hogy a(z) %s útvonal "
-"létezik-e, és van-e jogosultsága az eléréséhez."
+"Nem nyitható meg a címjegyzék. Ellenőrizze, hogy a(z) %s útvonal létezik-e, "
+"és van-e jogosultsága az eléréséhez."
 
 #: ../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 ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen "
-"URI-t adott meg, vagy az LDAP-kiszolgáló elérhetetlen."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen URI-t "
+"adott meg, vagy az LDAP-kiszolgáló elérhetetlen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
@@ -3463,8 +3481,8 @@ msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
-"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen "
-"URI-t adott meg, vagy a kiszolgáló elérhetetlen."
+"Nem nyitható meg ez a címjegyzék. Ez vagy azt jelenti, hogy helytelen URI-t "
+"adott meg, vagy a kiszolgáló elérhetetlen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
 msgid ""
@@ -3759,7 +3777,7 @@ msgstr "Formátum"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Élőfej"
@@ -3863,9 +3881,9 @@ msgstr "Árnyalás"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Méret:"
 
@@ -4031,7 +4049,9 @@ msgstr ""
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "Ezekről az értekezletekről minden információ visszavonhatatlanul törlésre kerül."
+msgstr ""
+"Ezekről az értekezletekről minden információ visszavonhatatlanul törlésre "
+"kerül."
 
 #: ../calendar/calendar.error.xml.h:6
 msgid "All information on these tasks will be deleted and can not be restored."
@@ -4164,22 +4184,24 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
-"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a "
-"napló törléséről."
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a napló törléséről."
 
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a találkozó lemondásáról."
+msgstr ""
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a találkozó lemondásáról."
 
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog tudni a feladat "
-"törléséről."
+"Ha nem küld lemondási értesítést, a többi résztvevő lehet, hogy nem fog "
+"tudni a feladat törléséről."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4201,17 +4223,23 @@ msgstr ""
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr "Néhány melléklet még letöltés alatt áll. Ha menti az értekezletet, az a mellékletek elveszését fogja okozni."
+msgstr ""
+"Néhány melléklet még letöltés alatt áll. Ha menti az értekezletet, az a "
+"mellékletek elveszését fogja okozni."
 
 #: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr "Néhány melléklet még letöltés alatt áll. Ha menti a feladatot, az a mellékletek elveszését fogja okozni."
+msgstr ""
+"Néhány melléklet még letöltés alatt áll. Ha menti a feladatot, az a "
+"mellékletek elveszését fogja okozni."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
-msgstr "Néhány funkció nem biztos, hogy megfelelően fog működni a jelenlegi kiszolgálóval."
+msgstr ""
+"Néhány funkció nem biztos, hogy megfelelően fog működni a jelenlegi "
+"kiszolgálóval."
 
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
@@ -4292,8 +4320,8 @@ msgid ""
 "a supported version."
 msgstr ""
 "Egy nem támogatott GroupWise kiszolgálóhoz csatlakozik, emiatt problémákat "
-"tapasztalhat az Evolution használata közben. A legjobb eredmények "
-"érdekében a kiszolgálót frissíteni kell egy támogatott verzióra."
+"tapasztalhat az Evolution használata közben. A legjobb eredmények érdekében "
+"a kiszolgálót frissíteni kell egy támogatott verzióra."
 
 #: ../calendar/calendar.error.xml.h:63
 msgid "You have changed this appointment, but not yet saved it."
@@ -4330,7 +4358,7 @@ msgid "_Save Changes"
 msgstr "_Változtatások mentése"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Küldés"
 
@@ -4448,9 +4476,9 @@ msgstr "Feljegyzések"
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Feladatok"
@@ -4873,7 +4901,8 @@ msgid ""
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
 "A Szabad/foglalt adatokhoz használt tartalék URL sablon, a %u az e-mail cím "
-"felhasználónév részével, a %d pedig annak tartomány részével lesz helyettesítve."
+"felhasználónév részével, a %d pedig annak tartomány részével lesz "
+"helyettesítve."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
@@ -5040,10 +5069,10 @@ msgstr "Nyomtatás"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5056,8 +5085,8 @@ msgid ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr ""
-"Ez a művelet véglegesen eltávolítja a megadott időnél régebbi eseményeket. Ha "
-"folytatja, akkor ezek az események visszavonhatatlanul törlődnek."
+"Ez a művelet véglegesen eltávolítja a megadott időnél régebbi eseményeket. "
+"Ha folytatja, akkor ezek az események visszavonhatatlanul törlődnek."
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
@@ -5418,7 +5447,7 @@ msgid "Display"
 msgstr "Megjelenítés"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Szabad/elfoglalt"
@@ -5615,7 +5644,9 @@ msgstr "A feladatlista elemeiről helyi másolat készítése kapcsolat nélkül
 
 #: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Copy memo list contents locally for offline operation"
-msgstr "A feljegyzéslista elemeiről helyi másolat készítése kapcsolat nélküli munkához"
+msgstr ""
+"A feljegyzéslista elemeiről helyi másolat készítése kapcsolat nélküli "
+"munkához"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5803,7 +5834,7 @@ msgstr "_Mellékletsáv megjelenítése"
 #: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5875,8 +5906,8 @@ msgid "No summary"
 msgstr "Nincs összefoglaló"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2654
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "melléklet"
 
@@ -5987,7 +6018,7 @@ msgstr "_Naptár:"
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Sz_ervező:"
 
@@ -6008,7 +6039,7 @@ msgid "Event with no end date"
 msgstr "Esemény befejeződési dátum nélkül"
 
 #: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "A kezdés dátuma érvénytelen"
 
@@ -6026,25 +6057,25 @@ msgstr "A befejezés időpontja érvénytelen"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "A kijelölt szervezőnek már nincs fiókja."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "A szervezőt be kell állítani."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "Hozzá_adás "
 
@@ -6256,7 +6287,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Nem nyithatók meg a feljegyzések ebben: %s."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Csoport:"
@@ -6335,7 +6366,9 @@ msgstr "Minden előfordulást"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ez az értekezlet olyan ismétlődéseket tartalmaz, amelyeket az Evolution nem tud szerkeszteni."
+msgstr ""
+"Ez az értekezlet olyan ismétlődéseket tartalmaz, amelyeket az Evolution nem "
+"tud szerkeszteni."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6508,7 +6541,7 @@ msgstr "<span weight=\"bold\">Állapot</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Befejezve"
@@ -6584,11 +6617,11 @@ msgstr "_Feladat"
 msgid "Task Details"
 msgstr "Feladat részletei"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nem nyithatók meg a feladatok ebben: %s."
@@ -6733,7 +6766,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Kattintson a(z) %s megnyitásához"
@@ -6832,15 +6865,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Igen"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nem"
@@ -6851,8 +6884,8 @@ msgstr "Nem"
 #: ../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:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7129,25 +7162,25 @@ msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Szervező: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Szervező: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Hely: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Idő: %s %s"
@@ -7311,7 +7344,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7324,7 +7357,7 @@ msgstr "Feltételesen elfogadva"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7649,63 +7682,63 @@ msgid "Resources"
 msgstr "Erőforrások"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Egyén"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Csoport"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Erőforrás"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Szoba"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Levezető"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Szükséges résztvevők"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Esetleges résztvevő"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Nem vesz részt"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Beavatkozás szükséges"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Feltételes"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7716,14 +7749,14 @@ msgstr "Átruházva"
 msgid "Attendee                          "
 msgstr "Résztvevő                        "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Folyamatban"
 
 #. 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%Y %B %d, %A"
 
@@ -7732,7 +7765,7 @@ msgstr "%Y %B %d, %A"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%Y. %m. %d., %a."
 
@@ -8019,23 +8052,6 @@ msgstr "iCalendar információ"
 msgid "You must be an attendee of the event."
 msgstr "Részt kell vennie az eseményen."
 
-#: ../calendar/gui/memos-component.c:451 ../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 "Másolás"
-
-#: ../calendar/gui/memos-component.c:452 ../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 "Törlés"
-
-#: ../calendar/gui/memos-component.c:453
-msgid "Properties..."
-msgstr "Tulajdonságok..."
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -10128,8 +10144,8 @@ msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"Adja meg azokat a címeket, akik rejtett másolatot kapnak az üzenetről, azaz a "
-"címzettnél nem jelenik meg a címük."
+"Adja meg azokat a címeket, akik rejtett másolatot kapnak az üzenetről, azaz "
+"a címzettnél nem jelenik meg a címük."
 
 #.
 #. * Post-To
@@ -10156,7 +10172,9 @@ msgstr "Melléklet beszúrása"
 
 #: ../composer/e-msg-composer.c:828
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Nem írható alá a kimenő üzenet: Nincs beállítva tanúsítvány az aláíráshoz ehhez a postafiókhoz"
+msgstr ""
+"Nem írható alá a kimenő üzenet: Nincs beállítva tanúsítvány az aláíráshoz "
+"ehhez a postafiókhoz"
 
 #: ../composer/e-msg-composer.c:835
 msgid ""
@@ -10244,7 +10262,7 @@ msgstr ""
 "miatt: &quot;{0}&quot;."
 
 #: ../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 "Ok: &quot;{1}&quot;."
 
@@ -10254,8 +10272,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"Ezen szerkesztőablak bezárása az üzenet végleges eldobását jelenti, hacsak nem "
-"menti a Piszkozatok mappába. Ez lehetővé teszi az üzenet folytatását egy "
+"Ezen szerkesztőablak bezárása az üzenet végleges eldobását jelenti, hacsak "
+"nem menti a Piszkozatok mappába. Ez lehetővé teszi az üzenet folytatását egy "
 "későbbi időpontban."
 
 #: ../composer/mail-composer.error.xml.h:7
@@ -10360,11 +10378,11 @@ msgstr "Üzenet m_entése"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Csoportmunka-szoftver"
 
@@ -10404,7 +10422,8 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>A lent megadott üzenetet mindenki automatikusan megkapja, aki akkor küld\n"
+"<small>A lent megadott üzenetet mindenki automatikusan megkapja, aki akkor "
+"küld\n"
 "levelet Önnek, amikor házon kívül van.</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
@@ -10446,8 +10465,10 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>Ezen a panelen beállíthatja, hogy szeretne-e értesítést kapni az Ön által elküldött üzenetek\n"
-"elolvasásáról, és hogy mit tegyen az Evolution, ha valaki tértivevényt kér Öntől.</small>"
+"<small>Ezen a panelen beállíthatja, hogy szeretne-e értesítést kapni az Ön "
+"által elküldött üzenetek\n"
+"elolvasásáról, és hogy mit tegyen az Evolution, ha valaki tértivevényt kér "
+"Öntől.</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Always send back a read receipt"
@@ -10531,7 +10552,7 @@ msgstr "Felül szeretné írni?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "A(z) &quot;{0}&quot; fájl már létezik."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Felülírás"
 
@@ -10699,7 +10720,7 @@ msgstr "Hiányzó dátum."
 msgid "Missing file name."
 msgstr "Hiányzó fájlnév."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Hiányzó név."
 
@@ -10987,14 +11008,14 @@ msgstr "Aláírás(ok)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Továbbított üzenet --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "ismeretlen feladó"
 
 #. 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:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11043,6 +11064,12 @@ msgstr "Fogadás dátuma"
 msgid "Date sent"
 msgstr "Küldés dátuma"
 
+#: ../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 "Törlés"
+
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Törölt"
@@ -11318,7 +11345,7 @@ msgstr "Piszkozatok"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Beérkezett levelek"
 
@@ -11404,7 +11431,7 @@ msgstr "Új _mappa..."
 msgid "_Rename..."
 msgstr "Á_tnevezés..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "K_uka ürítése"
 
@@ -11547,37 +11574,37 @@ msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Üzenet nyomtatása"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Nem kérhető le az üzenet"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "Hivatkozás _címének másolása"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Keresőmappa létrehozása"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Erről a _címről"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "E_rre a címre"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kattintson a(z) %s elküldéséhez"
@@ -11640,7 +11667,9 @@ msgstr "Titkosítatlan"
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "Ez az üzenet nincs titkosítva. A tartalma megnézhető az interneten való átvitele közben."
+msgstr ""
+"Ez az üzenet nincs titkosítva. A tartalma megnézhető az interneten való "
+"átvitele közben."
 
 #: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
@@ -11651,7 +11680,10 @@ 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 "Ez az üzenet titkosítva van, de a titkosítási eljárás gyenge. Egy harmadik személy számára nehéz lenne, de nem lehetetlen az üzenet tartalmát elfogadható időn belül visszafejteni."
+msgstr ""
+"Ez az üzenet titkosítva van, de a titkosítási eljárás gyenge. Egy harmadik "
+"személy számára nehéz lenne, de nem lehetetlen az üzenet tartalmát "
+"elfogadható időn belül visszafejteni."
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
@@ -11661,7 +11693,9 @@ msgstr "Titkosított"
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "Ez az üzenet titkosítva van. Egy harmadik személy számára nehéz lenne az üzenet tartalmát megjeleníteni."
+msgstr ""
+"Ez az üzenet titkosítva van. Egy harmadik személy számára nehéz lenne az "
+"üzenet tartalmát megjeleníteni."
 
 #: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
@@ -11672,7 +11706,10 @@ 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 "Ez az üzenet egy erős titkosítási eljárással van titkosítva. Egy harmadik személy számára nagyon nehéz lenne az üzenet tartalmát elfogadható időn belül megjeleníteni."
+msgstr ""
+"Ez az üzenet egy erős titkosítási eljárással van titkosítva. Egy harmadik "
+"személy számára nagyon nehéz lenne az üzenet tartalmát elfogadható időn "
+"belül megjeleníteni."
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -11850,7 +11887,7 @@ msgstr "Hírcsoportok"
 msgid "%s attachment"
 msgstr "%s melléklet"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 "Nem dolgozható fel az S/MIME-üzenet: Ismeretlen hiba"
 
@@ -11866,11 +11903,11 @@ msgstr "Nem támogatott titkosítási típus a levél titkosított részében"
 msgid "Unsupported signature format"
 msgstr "Nem támogatott aláírási formátum"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Hiba az aláírás ellenőrzésekor"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Ismeretlen hiba az aláírás ellenőrzésekor"
 
@@ -11946,7 +11983,9 @@ msgstr "Nem hozhatók létre \"%s\" helyen helyi levélkönyvtárak: %s"
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "Nem olvashatók be az előző Evolution telepítés beállításai az evolution/config-ból. Az xmldb nem létezik vagy sérült."
+msgstr ""
+"Nem olvashatók be az előző Evolution telepítés beállításai az evolution/"
+"config-ból. Az xmldb nem létezik vagy sérült."
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -11998,20 +12037,20 @@ msgstr "Ne jelenjen meg többé ez az üzenet."
 msgid "Message Filters"
 msgstr "Üzenetszűrők"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "üzenet"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Üzenet mentése..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Cím hozzáadása"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "A feladó %s"
@@ -12249,7 +12288,9 @@ msgstr "Üzenetablak alapértelmezett szélessége"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Üzenet megjelenítési stílusa (\"normal\" (normál), \"full headers\" (teljes fejléc), \"source\" (forrás))"
+msgstr ""
+"Üzenet megjelenítési stílusa (\"normal\" (normál), \"full headers\" (teljes "
+"fejléc), \"source\" (forrás))"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
@@ -13776,26 +13817,28 @@ 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 ""
 "Már létezik egy nem üres mappa itt: &quot;{1}&quot;.\n"
 "\n"
 "Választhat, hogy mellőzi ezt a mappát, felülírja vagy hozzáfűzi a tartalmát "
-"vagy kilép.\n"
+"vagy kilép."
 
-#: ../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}?"
-msgstr "&quot;{1}&quot; olvasási tértivevényt kért. Elküldi a tértivevényt a következőnek: {0}?"
+msgstr ""
+"&quot;{1}&quot; olvasási tértivevényt kért. Elküldi a tértivevényt a "
+"következőnek: {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 "Már létezik &quot;{0}&quot; nevű mappa. Adjon meg egy másik nevet."
 
-#: ../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."
@@ -13803,210 +13846,217 @@ msgstr ""
 "Egy értelmes Tárgy sor hozzáadása az üzenethez segít a címzettnek képet "
 "alkotni arról, hogy miről szólhat a levél."
 
-#: ../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 "Valóban törölni akarja ezt a postafiókot és az összes proxyját?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Valóban törölni akarja ezt a postafiókot?"
 
-#: ../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 "Valóban le akarja tiltani ezt a felhasználói fiókot és az összes proxyját?"
 
-#: ../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 "Biztosan meg akar nyitni egyszerre {0} üzenetet?"
 
-#: ../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 ""
-"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet az összes "
-"mappából?"
+"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet az "
+"összes mappából?"
 
-#: ../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;?"
-msgstr "Valóban véglegesen el szeretné távolítani az összes törölt üzenetet a(z) &quot;{0}&quot; mappából?"
+msgstr ""
+"Valóban véglegesen el szeretné távolítani az összes törölt üzenetet a(z) "
+"&quot;{0}&quot; mappából?"
 
-#: ../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 "Biztosan HTML formátumban akarja küldeni az üzenetet?"
 
-#: ../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 "Valóban csak rejtett címzetteknek küldi el az üzenetet?"
 
-#: ../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 "Valóban tárgy nélkül akarja elküldeni az üzenetet?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Ok: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Ok: &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Üres aláírás"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Nem hozható létre a(z) &quot;{0}&quot; keresőmappa."
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "A(z) &quot;{0}&quot; mappa nem másolható ide: &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Nem hozható létre a(z) &quot;{0}&quot; mappa."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Nem hozható létre az átmeneti mentési könyvtár."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Nem hozható létre a mentési könyvtár, ok: &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Nem törölhető a(z) &quot;{0}&quot; mappa."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Nem törölhető a(z) &quot;{0}&quot; rendszermappa."
 
-#: ../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 "Nem szerkeszthető a(z) &quot;{0}&quot; keresőmappa, mivel nem létezik."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nem mozgatható a(z) &quot;{0}&quot; mappa ide: &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Nem nyitható meg a(z) &quot;{1}&quot; forrás"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Nem nyitható meg a(z) &quot;{2}&quot; forrás."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Nem nyitható meg a(z) &quot;{2}&quot; cél."
 
-#: ../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 "
 "license."
-msgstr "Nem olvasható be a(z) &quot;{0}&quot; licencfájl egy telepítési hiba miatt. Nem használhatja ezt a szolgáltatót, míg nem fogadta el a licencét."
+msgstr ""
+"Nem olvasható be a(z) &quot;{0}&quot; licencfájl egy telepítési hiba miatt. "
+"Nem használhatja ezt a szolgáltatót, míg nem fogadta el a licencét."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nem nevezhető át &quot;{0}&quot; erre: &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 "Nem nevezhető át vagy mozgatható a(z) &quot;{0}&quot; rendszermappa."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Nem menthetők a postafiók beállításai."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Nem lehet menteni a(z) &quot;{0}&quot; könyvtárba."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Nem lehet menteni a(z) &quot;{0}&quot; fájlba."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Nem állítható be a(z) &quot;{0}&quot; aláírás-parancsfájl."
 
-#: ../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."
-msgstr "Ellenőrizze, hogy nem gépelte-e el a jelszavát. Ne feledje, hogy sok jelszóban a kis- és nagybetűk különböznek, a caps lock lehet, hogy be van kapcsolva."
+msgstr ""
+"Ellenőrizze, hogy nem gépelte-e el a jelszavát. Ne feledje, hogy sok "
+"jelszóban a kis- és nagybetűk különböznek, a caps lock lehet, hogy be van "
+"kapcsolva."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Nem menthető az aláírásfájl."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Törli a(z) &quot;{0}&quot;-t?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Törli a postafiókot?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Eldobja a változtatásokat?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Ne törölje"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Ne tiltsa le"
 
-#: ../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 "El akarja végezni a műveletet az almappákban?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Az összes üzenetet olvasottnak jelöli meg?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Szeretné menteni a változtatásait?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Adja meg a jelszót."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Hiba a szűrődefiníciók betöltése közben."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Hiba a művelet végrehajtása közben."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Hiba a következő folyamán: {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "A fájl már létezik, de nem írható felül."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "A fájl már létezik, de nem közönséges fájl."
 
-#: ../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 "Ha folytatja, ezeket az üzeneteket később nem állíthatja majd vissza."
 
-#: ../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."
@@ -14014,11 +14064,11 @@ msgstr ""
 "Ha törli a mappát, a tartalma és alkönyvtárainak tartalma véglegesen "
 "törlődik."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ha folytatja, az összes proxy felhasználói fiók véglegesen törlésre kerül."
 
-#: ../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."
@@ -14026,29 +14076,31 @@ msgstr ""
 "Ha folytatja, a postafiók információi és az\n"
 "összes proxy információ véglegesen törlésre kerül."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ha folytatja, a postafiók információi véglegesen törlésre kerülnek."
 
-#: ../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."
-msgstr "Ha kilép, ezek az üzenetek nem kerülnek elküldésre az Evolution újraindításáig."
+msgstr ""
+"Ha kilép, ezek az üzenetek nem kerülnek elküldésre az Evolution "
+"újraindításáig."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Kihagy"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Érvénytelen hitelesítés"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Levélszűrők automatikusan frissítve."
 
-#: ../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 "
@@ -14057,38 +14109,38 @@ msgid ""
 msgstr ""
 "Sok e-mail rendszer a csak rejtett címzetteknek küldött üzenetekhez hozzáad "
 "egy Apparently-to fejlécet. Ez a fejléc mindenképpen megjeleníti az összes "
-"címzettet az üzenetében. Ennek megelőzése érdekében adjon meg legalább "
-"egy Címzett vagy Másolat címet."
+"címzettet az üzenetében. Ennek megelőzése érdekében adjon meg legalább egy "
+"Címzett vagy Másolat címet."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Az összes üzenetet olvasottnak jelöli meg"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Az összes üzenet megjelölése olvasottként a kijelölt mappában"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Hiányzó mappa."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Nincs forrás kiválasztva."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Túl sok üzenet egyidejű megnyitása sokáig tarthat."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Kérem ellenőrizze a postafiókjának beállításait és próbálja újra."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Engedélyezze a postafiókot vagy küldje másik fiók használatával."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14096,7 +14148,7 @@ msgstr ""
 "Kérem írjon be egy érvényes e-mail címet a Címzett: mezőbe. A beviteli mező "
 "melletti Címzett gombra kattintva kereshet e-mail címeket."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14108,49 +14160,49 @@ msgstr ""
 "{0}\n"
 "Mindenképp el akarja küldeni?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Adjon meg egy egyedi nevet az aláírás azonosításához."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Kérem várjon."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Probléma a(z) &quot;{0}&quot; régi levélmappa átköltöztetése közben."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Kiszolgáló lekérdezése"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "A támogatott hitelesítési mechanizmusok listájának lekérdezése a "
 "kiszolgálótól."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Olvasási tértivevény kérés."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Valóban törli &quot;{0}&quot; mappát és minden almappáját?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "A keresőmappák automatikusan frissítve lettek."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Tértivevény küldése"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "A tanúsítvány már létezik"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14158,7 +14210,7 @@ msgstr ""
 "A rendszermappák a Ximian Evolution megfelelő működéséhez szükségesek és nem "
 "lehet őket átnevezni, mozgatni vagy törölni."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14167,13 +14219,14 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"A címzettként megadott címlista a lista címzettjeinek rejtésére van beállítva.\n"
+"A címzettként megadott címlista a lista címzettjeinek rejtésére van "
+"beállítva.\n"
 "\n"
 "Sok e-mail rendszer az ilyen üzenetekhez hozzáad egy Apparently-to fejlécet. "
 "Ez a fejléc megjeleníti az összes címzettet az üzenetében. Ennek "
 "megelőzésére adjon meg legalább egy Címzett vagy Másolat címet. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14187,7 +14240,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "és frissítve lettek."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14201,21 +14254,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "és frissítve lettek."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Ez az üzenet a &quot;sendmail&quot; külső alkalmazáson keresztül került elküldésre. A sendmail a következő hibát jelentette: 67-es állapot: a levél nincs elküldve.\n"
-"Az üzenet a Postázandó üzenetek mappába került. Ellenőrizze az üzenet hibátlanságát és küldje újra."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "A parancsfájlnak létezőnek és végrehajthatónak kell lennie."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14223,17 +14266,19 @@ msgstr ""
 "Lehet, hogy ezt a mappát közvetett módon hozta létre, ha szükséges,\n"
 "nyissa meg a keresőmappa szerkesztőt és hozza létre közvetlenül."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Ez az üzenet nem küldhető el, mivel a küldéshez kijelölt postafiók nincs engedélyezve"
+msgstr ""
+"Ez az üzenet nem küldhető el, mivel a küldéshez kijelölt postafiók nincs "
+"engedélyezve"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ez az üzenet nem küldhető el, mivel nem adott meg egyetlen címzettet sem"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14241,59 +14286,63 @@ msgstr ""
 "Ez a kiszolgáló nem támogatja ezt a hitelesítési típust és lehet, hogy "
 "egyáltalán nem támogatja a hitelesítést."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Az aláírás megváltozott, de nem lett mentve."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "Ez megjelöli összes üzenetet olvasottként a kijelölt mappában és annak almappáiban."
+msgstr ""
+"Ez megjelöli összes üzenetet olvasottként a kijelölt mappában és annak "
+"almappáiban."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nem lehet kapcsolódni a GroupWise kiszolgálóhoz."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "Nem nyitható meg az ehhez a postafiókhoz tartozó piszkozatok mappa. Szeretné használni a rendszer alapértelmezett piszkozatok mappáját?"
+msgstr ""
+"Nem nyitható meg az ehhez a postafiókhoz tartozó piszkozatok mappa. Szeretné "
+"használni a rendszer alapértelmezett piszkozatok mappáját?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Nem olvasható be a licencfájl."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "_Alapértelmezett használata"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Az alapértelmezett Piszkozatok mappát használja?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Nem adta meg az összes szükséges információt."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Vannak el nem küldött üzenetek. Biztosan kilép?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Nem hozhat létre két egyező nevű postafiókot."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Nevet kell adnia ennek a keresőmappának."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Meg kell adnia egy mappát."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14303,27 +14352,23 @@ msgstr ""
 "Kiválaszthatja a mappákat egyenként, és/vagy kiválaszthatja az összes helyi "
 "vagy távoli mappát, esetleg mindkettőt."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "A belépése &quot;{0}&quot; kiszolgálóra &quot;{0}&quot; néven sikertelen."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "A(z) &quot;{0}&quot; tárgyú üzenete nem került kézbesítésre."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Hozzáfűzés"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Változtatások eldobása"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "T_isztítás"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "Üzenetek _megnyitása"
 
@@ -14394,7 +14439,7 @@ msgstr "%Y %b. %d"
 msgid "Messages"
 msgstr "Üzenetek"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Üzenetlista létrehozása"
 
@@ -14579,7 +14624,9 @@ msgstr "Azonnali üzenetküldő névjegyek"
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
 msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Névjegyinformációk és képek szinkronizálása a gaim partnerlistából szabályos időközönként"
+msgstr ""
+"Névjegyinformációk és képek szinkronizálása a gaim partnerlistából szabályos "
+"időközönként"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
@@ -14591,7 +14638,10 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr "Automatikusan feltölti a címjegyzékét nevekkel és e-mail címekkel amikor üzenetekre válaszol. Ezen kívül az azonnali üzenő névjegyinformációkat is kitölti a partnerlistája alapján."
+msgstr ""
+"Automatikusan feltölti a címjegyzékét nevekkel és e-mail címekkel amikor "
+"üzenetekre válaszol. Ezen kívül az azonnali üzenő névjegyinformációkat is "
+"kitölti a partnerlistája alapján."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14729,7 +14779,9 @@ msgstr "Alapértelmezett források"
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr "Alapvető funkcionalitást biztosít egy naptár vagy címjegyzék kijelöléséhez alapértelmezettként."
+msgstr ""
+"Alapvető funkcionalitást biztosít egy naptár vagy címjegyzék kijelöléséhez "
+"alapértelmezettként."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -14833,29 +14885,30 @@ msgstr "Mappák mérete"
 msgid "Exchange Settings"
 msgstr "Exchange beállításai"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "_Hitelesítés"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Hitelesítés típusa"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "_Támogatott típusok lekérdezése"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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 ""
-"Az Evolution jelenleg kapcsolat nélküli módban van. Most nem hozhat létre vagy módosíthat mappákat.\n"
+"Az Evolution jelenleg kapcsolat nélküli módban van. Most nem hozhat létre "
+"vagy módosíthat mappákat.\n"
 "Az ilyen műveletek végrehajtásához kapcsolódjon az internetre."
 
 #. User entered a wrong existing
@@ -15030,14 +15083,14 @@ msgstr "Exchange mappafa"
 msgid "Unsubscribe Folder..."
 msgstr "Leiratkozás mappáról..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Valóban leiratkozik a(z) \"%s\" mappáról?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Leiratkozás a következőről: \"%s\""
@@ -15146,7 +15199,9 @@ msgstr "Feliratkozás más felhasználó naptárjára"
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr "Exchange felhasználói fiókokra jellemző műveleteket és szolgáltatásokat kezelő bővítmény."
+msgstr ""
+"Exchange felhasználói fiókokra jellemző műveleteket és szolgáltatásokat "
+"kezelő bővítmény."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -15164,7 +15219,9 @@ msgstr "Nem jeleníthetők meg a mappák."
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr "Az Exchange felhasználói fiók beállításainak módosításai az Evolution újraindítása után lépnek életbe."
+msgstr ""
+"Az Exchange felhasználói fiók beállításainak módosításai az Evolution "
+"újraindítása után lépnek életbe."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15255,7 +15312,8 @@ msgstr ""
 "ezeket be kell kapcsolnia, hogy használhassa az\n"
 "Exchange Connectort.\n"
 "\n"
-"Az Exchange adminisztrátorral közölje a következő hivatkozáson található információkat:\n"
+"Az Exchange adminisztrátorral közölje a következő hivatkozáson található "
+"információkat:\n"
 "\n"
 "{0}\n"
 "  "
@@ -15285,7 +15343,9 @@ msgstr "Általános hiba"
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Ha az Outlook Web Access más elérési úton fut, adja meg azt a felhasználói fiók beállításai párbeszédablakban."
+msgstr ""
+"Ha az Outlook Web Access más elérési úton fut, adja meg azt a felhasználói "
+"fiók beállításai párbeszédablakban."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
@@ -15413,19 +15473,25 @@ msgstr "Csak egyetlen Exchange fiókot állíthat be."
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "A jelenlegi területhasználata: {0} KB. Próbáljon felszabadítani egy kis helyet néhány levél törlésével."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Próbáljon felszabadítani egy kis "
+"helyet néhány levél törlésével."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket sem küldeni, sem fogadni."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket "
+"sem küldeni, sem fogadni."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket küldeni, amíg néhány levél törlésével nem szabadít fel egy kis helyet."
+msgstr ""
+"A jelenlegi területhasználata: {0} KB. Mostantól nem lesz képes leveleket "
+"küldeni, amíg néhány levél törlésével nem szabadít fel egy kis helyet."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15464,7 +15530,7 @@ msgstr "Lehetővé teszi a leiratkozást levélmappákról a mappagyökér helyi
 msgid "Unsubscribe Folders"
 msgstr "Leiratkozás mappákról"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Feladatlista"
 
@@ -15723,7 +15789,9 @@ msgstr "Nincs kimeneti könyvtár!"
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr "A kimeneti könyvtár nem található az iPodon! Győződjön meg róla, hogy az iPod beállításai helyesek és próbálkozzon újra."
+msgstr ""
+"A kimeneti könyvtár nem található az iPodon! Győződjön meg róla, hogy az "
+"iPod beállításai helyesek és próbálkozzon újra."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
@@ -15848,7 +15916,9 @@ msgstr "A csatolt naptár érvénytelen"
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "Az üzenet azt állítja, hogy egy naptárt tartalmaz, de a naptár nem egy érvényes iCalendar."
+msgstr ""
+"Az üzenet azt állítja, hogy egy naptárt tartalmaz, de a naptár nem egy "
+"érvényes iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
@@ -16040,7 +16110,9 @@ msgstr "%Y. %B %e. %A %l.%M.%S %P"
 #: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr "<b>%s</b> %s közvetítésével a következő információt tette közzé a találkozóról:"
+msgstr ""
+"<b>%s</b> %s közvetítésével a következő információt tette közzé a "
+"találkozóról:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
@@ -16055,7 +16127,9 @@ msgstr "<b>%s</b> átruházta Önre a következő találkozót:"
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> %s közvetítésével arra kéri, hogy vegyen részt a következő találkozón:"
+msgstr ""
+"<b>%s</b> %s közvetítésével arra kéri, hogy vegyen részt a következő "
+"találkozón:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
@@ -16075,7 +16149,9 @@ msgstr "<b>%s</b> szeretné Önt hozzáadni egy létező találkozóhoz:"
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> szeretné megkapni a legújabb információkat a következő találkozóról:"
+msgstr ""
+"<b>%s</b> szeretné megkapni a legújabb információkat a következő "
+"találkozóról:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
@@ -16100,7 +16176,9 @@ msgstr "<b>%s</b> a következő találkozóváltoztatásokat javasolja:"
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> %s közvetítésével elutasította a következő találkozóváltoztatásokat:"
+msgstr ""
+"<b>%s</b> %s közvetítésével elutasította a következő "
+"találkozóváltoztatásokat:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
@@ -16417,8 +16495,9 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"Egy e-mail üzenet kerül elküldésre a következő URL címre: \"{0}\". Az üzenetet "
-"elküldheti automatikusan, vagy előtte megnézheti és megváltoztathatja.\n"
+"Egy e-mail üzenet kerül elküldésre a következő URL címre: \"{0}\". Az "
+"üzenetet elküldheti automatikusan, vagy előtte megnézheti és "
+"megváltoztathatja.\n"
 "\n"
 "Az üzenet elküldése után hamarosan meg kell kapnia a levelezőlista válaszát."
 
@@ -16454,7 +16533,8 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"A művelet nem hajtható végre. Ez azt jelenti, hogy a művelethez tartozó fejléc nem tartalmaz kezelhető műveleteket.\n"
+"A művelet nem hajtható végre. Ez azt jelenti, hogy a művelethez tartozó "
+"fejléc nem tartalmaz kezelhető műveleteket.\n"
 "\n"
 "Fejléc: {0}"
 
@@ -16485,8 +16565,8 @@ msgstr "Ü_zenet küldése"
 #: ../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 ""
-"Kapcsolat felvétele azon levelezőlista tulajdonosával, amelyhez ez az üzenet"
-"tartozik"
+"Kapcsolat felvétele azon levelezőlista tulajdonosával, amelyhez ez az "
+"üzenettartozik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
@@ -16494,7 +16574,9 @@ msgstr "Azon levelezőlista archívumának lekérése, amelyhez ez az üzenet ta
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Azon levelezőlista használatára vonatkozó szabályok lekérése, amelyhez ez az üzenet tartozik"
+msgstr ""
+"Azon levelezőlista használatára vonatkozó szabályok lekérése, amelyhez ez az "
+"üzenet tartozik"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
@@ -16600,7 +16682,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Példabővítmény, amely bemutat egy formázóbővítményt, amely lehetővé teszi a HTML üzenetek letiltásának kiválasztását.\n"
+"Példabővítmény, amely bemutat egy formázóbővítményt, amely lehetővé teszi a "
+"HTML üzenetek letiltásának kiválasztását.\n"
 "\n"
 "Ez a bővítmény csak egy nem támogatott példakód.\n"
 
@@ -16748,7 +16831,9 @@ msgstr "Spamassassin (beépített)"
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr "A levélszemetet szűri a Spamassassin használatával. A bővítmény működéséhez a Spamassassinnak telepítve kell lennie."
+msgstr ""
+"A levélszemetet szűri a Spamassassin használatával. A bővítmény működéséhez "
+"a Spamassassinnak telepítve kell lennie."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
@@ -16756,7 +16841,9 @@ msgstr "Spamassassin levélszemét-bővítmény"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Egy üzenet összes mellékletének vagy részének együttes mentésére szolgáló bővítmény."
+msgstr ""
+"Egy üzenet összes mellékletének vagy részének együttes mentésére szolgáló "
+"bővítmény."
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
@@ -17005,64 +17092,72 @@ msgid "Default window height"
 msgstr "Alapértelmezett ablakmagasság"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Alapértelmezett ablakállapot"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Alapértelmezett ablakszélesség"
 
-#: ../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 "Az indításkor alapértelmezésként megjelenő összetevő azonosítója vagy álneve."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Utoljára frissített konfiguráció verziója"
 
-#: ../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 ""
 "A kapcsolat nélküli használatra szinkronizálandó mappák elérési útjainak "
 "listája"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Nyomtató beállításai"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Az oldalsáv látható"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "A fejlesztői verzióra figyelmeztető párbeszédablak átugrása"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel (Például \"2.6.0\")."
+msgstr ""
+"Az Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel "
+"(Például \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "A főablak alapértelmezett magassága, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "A főablak alapértelmezett szélessége, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Az oldalsáv alapértelmezett szélessége, képpontokban."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr "Az utoljára frissített Evolution konfiguráció verziója, major/minor/konfiguráció szintekkel (Például \"2.6.0\")."
+msgstr ""
+"Az utoljára frissített Evolution konfiguráció verziója, major/minor/"
+"konfiguráció szintekkel (Például \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17072,39 +17167,43 @@ msgstr ""
 "\" (ikonok), \"both\", (mindkettő), \"toolbar\" (eszköztár). Ha a \"toolbar"
 "\" van beállítva, a gombok stílusa a GNOME hasonló beállításához igazodik."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Az eszköztár látható"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Ha be van állítva, az Evolution kapcsolat nélküli módban fog indulni, "
 "kapcsolódott mód helyett."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Az ablak maximális méretű legyen-e?"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Az oldalsáv látható legyen-e."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Az eszköztár látható legyen-e."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Ha be van állítva, az Evolution fejlesztői verzióiban nem jelenik meg a "
 "figyelmeztető ablak."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Az eszköztárgombok láthatóak legyenek-e?"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Ablak gombjainak stílusa"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Az ablak gombjai láthatóak"
 
@@ -17223,7 +17322,7 @@ msgstr "Nem futtatható a Bug buddy."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Bán Szabolcs <shooby@gnome.hu>\n"
@@ -17232,31 +17331,35 @@ msgstr ""
 "Tímár András <timar@gnome.hu>\n"
 "Zsiráf <zsiraf@mylinux.hu>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "M_unka a hálózatban"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Az Evolution jelenleg a hálózatban van. Kattintson erre a gombra a kapcsolat nélküli munkához."
+msgstr ""
+"Az Evolution jelenleg a hálózatban van. Kattintson erre a gombra a kapcsolat "
+"nélküli munkához."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Az Evolution felkészül a kapcsolat nélküli munkára."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Az Evolution jelenleg kapcsolat nélküli módban van. Kattintson erre a gombra a hálózatra kapcsolódáshoz."
+msgstr ""
+"Az Evolution jelenleg kapcsolat nélküli módban van. Kattintson erre a gombra "
+"a hálózatra kapcsolódáshoz."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Váltás erre: %s"
@@ -17341,7 +17444,7 @@ msgstr ""
 "importálásának folyamatán."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17363,7 +17466,8 @@ msgstr ""
 "Üdvözöljük! Köszönjük, hogy letöltötte az Evolution csoportmunka-szoftver\n"
 "előzetes verzióját.\n"
 "\n"
-"Az Evolution ezen verziója még nincs kész. Közeledik a befejezéshez, de vannak\n"
+"Az Evolution ezen verziója még nincs kész. Közeledik a befejezéshez, de "
+"vannak\n"
 "befejezetlen vagy csak félig működő szolgáltatások.\n"
 "\n"
 "Ha az Evolution stabil verziójára vágyik, akkor távolítsa el ezt a verziót,\n"
@@ -17376,7 +17480,7 @@ msgstr ""
 "Reméljük, élvezni fogja kemény munkánk eredményét, és várjuk\n"
 "hozzájárulását! \n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17384,35 +17488,35 @@ msgstr ""
 "Köszönettel\n"
 "Az Evolution Csapat\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ne jelenítse meg többé"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Az Evolution indítása a megadott összetevő aktiválásával"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4-ről költöztetés kényszerítése"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Minden bővítmény betöltésének kikapcsolása."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18080,6 +18184,12 @@ msgstr "Összes _névjegy másolása..."
 msgid "Contact _Preview"
 msgstr "Névjegy_előnézet"
 
+#: ../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 "Másolás"
+
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kijelölt névjegyek másolása másik mappába..."
@@ -18759,7 +18869,9 @@ msgstr "Az összes üzenet ki_jelölése"
 
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
-msgstr "Azoknak és csak azoknak az üzeneteknek a kijelölése, amelyek nincsenek jelenleg kijelölve"
+msgstr ""
+"Azoknak és csak azoknak az üzeneteknek a kijelölése, amelyek nincsenek "
+"jelenleg kijelölve"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
@@ -19892,7 +20004,7 @@ msgid "_Edit..."
 msgstr "_Szerkesztés..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20336,12 +20448,12 @@ msgstr "Szöveg"
 msgid "Find _Now"
 msgstr "Keresés m_ost"
 
-#: ../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 "Kurzor sora"
 
-#: ../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 "Kurzor oszlopa"
@@ -20672,14 +20784,14 @@ msgstr "Me_zők megjelenítési sorrendje:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kód"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Teljes fejléc"
 
@@ -20845,17 +20957,17 @@ msgstr "Oszlopok formázása..."
 msgid "Customize Current View..."
 msgstr "Jelenlegi nézet testreszabása..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Betűkészlet"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rendezési információ"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
diff --git a/po/it.po b/po/it.po
index c352269ab6..f193415427 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@
 # Alessio Dessi <alessio.dessi@libero.it>, 2003
 # Monica Badia <Monica.Badia@Sun.COM>, 2003
 # Craig Jeffares <cjeffares@novell.com>, 2004.
-# Luca Ferretti <elle.uca@infinito.it>, 2003-2005.
+# Luca Ferretti <elle.uca@infinito.it>, 2003-2006.
 #
 # Convenzioni adottate:
 #
@@ -30,8 +30,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-28 11:34+0100\n"
-"PO-Revision-Date: 2006-02-28 11:33+0100\n"
+"POT-Creation-Date: 2006-03-11 17:00+0100\n"
+"PO-Revision-Date: 2006-03-19 15:18+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -102,12 +102,10 @@ msgstr "Evento di calendario: nessun indice."
 
 # descrizione accessibile... spero di averla indovinata -Luca
 #: ../a11y/calendar/ea-cal-view-event.c:268
-#, fuzzy
 msgid "calendar view event"
 msgstr "evento vista calendario"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
-#, fuzzy
 msgid "Grab Focus"
 msgstr "Cattura il focus"
 
@@ -137,32 +135,32 @@ msgid "a table to view and select the current time range"
 msgstr ""
 "una tabella per visualizzare e selezionare l'intervallo di tempo corrente"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Presenta %d evento."
 msgstr[1] "Presenta %d eventi."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Non presenta eventi."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Vista settimana lavorativa: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Vista giornaliera: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "vista calendario per una settimana lavorativa"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "vista calendario per uno o più giorni"
 
@@ -238,21 +236,21 @@ msgstr "Pulsante \"vai a\""
 msgid "Click here, you can find more events."
 msgstr "Fare clic qui per trovare altri eventi."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Vista mensile: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Vista settimanale: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "vista calendario per un mese"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "vista calendario per una o più settimane"
 
@@ -681,7 +679,7 @@ msgstr "_Rubrica"
 msgid "Create a new address book"
 msgstr "Crea una nuova rubrica"
 
-#: ../addressbook/gui/component/addressbook-component.c:382
+#: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Aggiornamento delle impostazioni o delle cartelle della rubrica fallito."
@@ -707,7 +705,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 #: ../calendar/gui/dialogs/calendar-setup.c:391
-#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -1058,6 +1056,9 @@ msgid ""
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
 msgstr ""
+"Il filtro di ricerca è il tipo di oggetto cercato, durante l'esecuzione "
+"della ricerca. Se questo non è modificato, in modo predefinito la ricerca "
+"verrà eseguida sulla objectclass di tipo \"person\"."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -1231,13 +1232,10 @@ msgstr "tessere"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2020
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1497,7 +1495,7 @@ msgstr "Indirizzo"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2508,7 +2506,7 @@ msgstr "Servizio"
 # verificare nel codice se indica effettivamente posizione geografica -Luca
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Ubicazione"
@@ -2572,15 +2570,15 @@ msgstr "Cambiato"
 msgid "Contact Editor - %s"
 msgstr "Editor dei contatti - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Selezionare un'immagine per questo contatto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Nessuna immagine"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2588,7 +2586,7 @@ msgstr ""
 "I dati del contatto non sono validi:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contatto non valido."
 
@@ -2746,8 +2744,8 @@ msgstr "Servizio _IM:"
 # verificare che sia realmente ubicazione -Luca
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:222
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Ubicazione:"
 
@@ -2919,7 +2917,7 @@ msgstr "Origine"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2932,7 +2930,7 @@ msgid "Save as VCard..."
 msgstr "Salva come VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2999,7 +2997,7 @@ msgstr "_Taglia"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
@@ -3158,7 +3156,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../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"
@@ -3197,7 +3195,7 @@ msgstr "Sito Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../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:656
@@ -3205,7 +3203,7 @@ msgstr "Sito Web"
 #: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Larghezza"
@@ -3213,14 +3211,14 @@ msgstr "Larghezza"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../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:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altezza"
@@ -3741,19 +3739,19 @@ msgstr "Importatore CSV e Tab di Evolution"
 msgid "Importing ..."
 msgstr "Importazione..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato dati di scambio LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importatore LDIF di Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importatore VCard di Evolution"
 
@@ -3923,8 +3921,8 @@ msgstr "Ombreggiatura"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:205
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Dimensione:"
 
@@ -4222,7 +4220,6 @@ msgstr ""
 "loro di accettare questo compito."
 
 #: ../calendar/calendar.error.xml.h:32
-#, fuzzy
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
@@ -4242,7 +4239,6 @@ msgid "Error loading task list"
 msgstr "Errore nel caricare l'elenco di compiti"
 
 #: ../calendar/calendar.error.xml.h:36
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
@@ -4251,7 +4247,6 @@ msgstr ""
 "potrebbero non venire a conoscenza che il diario è stato eliminato."
 
 #: ../calendar/calendar.error.xml.h:37
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -4260,7 +4255,6 @@ msgstr ""
 "potrebbero non venire a conoscenza che la riunione è stata annullata."
 
 #: ../calendar/calendar.error.xml.h:38
-#, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -4285,22 +4279,20 @@ msgstr ""
 "partecipanti di mantenere i propri elenchi di compiti aggiornati."
 
 #: ../calendar/calendar.error.xml.h:41
-#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
 " È in corso lo scaricamento di alcuni allegati. Salvando ora l'appuntamento, "
-"questo non includerà tali allegati non ancora disponibili "
+"si potrebbero perdere tali allegati."
 
 #: ../calendar/calendar.error.xml.h:42
-#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr ""
-" È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, "
-"questo non includerà tali allegati non ancora disponibili "
+" È in corso lo scaricamento di alcuni allegati. Salvando ora il compito, si "
+"potrebbero perdere tali allegati."
 
 #: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
@@ -4357,12 +4349,10 @@ msgid "Would you like to save your changes to this task?"
 msgstr "Salvare le modifiche apportate a questo compito?"
 
 #: ../calendar/calendar.error.xml.h:56
-#, fuzzy
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Inviare una notifica di annullamento per questa voce di diario?"
 
 #: ../calendar/calendar.error.xml.h:57
-#, fuzzy
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Inviare a tutti i partecipanti una notifica di annullamento?"
 
@@ -4383,7 +4373,6 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "Inviare ai partecipanti informazioni aggiornate sul compito?"
 
 #: ../calendar/calendar.error.xml.h:62
-#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4552,7 +4541,7 @@ msgid "Memos"
 msgstr "Memo"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
@@ -4578,9 +4567,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio notifica allarme del calendario di Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -4714,67 +4700,34 @@ msgstr "Impossibile creare la fabbrica per il servizio di notifica allarme"
 msgid "invalid time"
 msgstr "tempo non valido"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld secondi)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "secondo"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "secondi"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u secondo"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u secondi"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u minuti"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ora"
+msgstr[1] "%d ore"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "%u ora"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u ore"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5480,7 +5433,7 @@ msgstr "minuto/i"
 msgid "start of appointment"
 msgstr "inizio dell'appuntamento"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Azione/Attivatore"
 
@@ -5947,134 +5900,134 @@ msgstr "Messaggio allegato - %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:2855
-#: ../composer/e-msg-composer.c:3034
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Messaggio allegato"
 msgstr[1] "%d messaggi allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Sposta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Annulla _trascinamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Impossibile aggiornare l'oggetto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> allegato"
 msgstr[1] "<b>%d</b> allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Nascondi _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Mostra _barra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3597
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "_Rimuovi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Proprietà"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3600
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Aggiungi allegato..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Mostra allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Premere la barra spaziatrice per commutare la barra degli allegati"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Modifica appuntamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Riunione - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appuntamento - %s"
 
 # Novell Translation
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Compito assegnato - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Compito - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Voce diario - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Nessun indice"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
 #: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "allegato"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "I cambiamenti apportati a questa voce possono essere scartati se arriva un "
 "aggiornamento"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Impossibile usare la versione corrente!"
 
@@ -6165,107 +6118,107 @@ msgid "Recurrence"
 msgstr "Ricorrenza"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Questo evento presenta degli allarmi"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Cale_ndario:"
 
 # Novell Translation
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr "Or_ganizzatore:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegati"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Partecipa_nti"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evento senza data di inizio"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evento senza data di termine"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "La data di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "La data di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "L'ora di inizio è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "L'ora di termine è errata"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "L'organizzatore selezionato non ha più un account"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "È richiesto un organizzatore."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "È richiesto almeno un partecipante."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "A_ggiungi "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossibile aprire il calendario «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d giorno prima dell'appuntamento"
 msgstr[1] "%d giorni prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d ora prima dell'appuntamento"
 msgstr[1] "%d ore prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto prima dell'appuntamento"
 msgstr[1] "%d minuti prima dell'appuntamento"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Personalizza"
 
@@ -6274,7 +6227,7 @@ msgstr "Personalizza"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6405,14 +6358,14 @@ msgstr "Membro"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6553,6 +6506,15 @@ msgstr "il"
 msgid "first"
 msgstr "primo"
 
+#. 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:998
+msgid "second"
+msgstr "secondo"
+
 #. 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.
@@ -6861,30 +6823,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ora"
-msgstr[1] "%d ore"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minuti"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d secondo"
-msgstr[1] "%d secondi"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Azione sconosciuta da portare a termine"
@@ -7060,7 +6998,7 @@ msgstr "No"
 
 #. 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:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
@@ -7082,35 +7020,35 @@ msgstr "Ricorrente"
 msgid "Assigned"
 msgstr "Assegnato"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Selezionare una cartella per salvare gli allegati selezionati..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "immagine_senza_nome.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Sa_lva come..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Imposta come _sfondo"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Salva selezionati"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
@@ -7394,9 +7332,9 @@ msgstr ""
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
 #: ../calendar/gui/e-day-view-time-item.c:552
-#, fuzzy, c-format
+#, c-format
 msgid "%02i minute divisions"
-msgstr "%02i divisioni per minuto"
+msgstr "divisioni da %02i minuti"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
@@ -7548,17 +7486,15 @@ msgstr "Declinato"
 
 # ma che senso ha?
 #: ../calendar/gui/e-itip-control.c:1224
-#, fuzzy
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr ""
-"La riunione è stata annullata, tuttavia potrebbe non essere presente nei "
-"propri calendari"
+"La riunione è stata annullata, tuttavia potrebbe essere presente nei propri "
+"calendari"
 
 # ma che senso ha?
 #: ../calendar/gui/e-itip-control.c:1226
-#, fuzzy
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
@@ -7945,7 +7881,7 @@ msgid "Delegated"
 msgstr "Delegato"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Partecipante                      "
 
@@ -8052,7 +7988,7 @@ msgstr "Fare clic per aggiungere un memo"
 msgid "Memo sort"
 msgstr "Ordinamento memo"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -8071,7 +8007,7 @@ msgstr "Caricamento memo"
 msgid "Opening memos at %s"
 msgstr "Apertura memo presso %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Eliminazione oggetti selezionati..."
 
@@ -8080,20 +8016,20 @@ msgstr "Eliminazione oggetti selezionati..."
 msgid "Enter the password for %s"
 msgstr "Inserire la password per %s"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Caricamento compiti"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Apertura compiti presso %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Completamento compiti..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Pulizia"
 
@@ -8208,19 +8144,19 @@ msgstr "È necessario impostare un organizzatore."
 msgid "At least one attendee is necessary"
 msgstr "È richiesto almeno un partecipante"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "Informazioni sull'evento"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "Informazioni sul compito"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "Informazioni sul diario"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "Informazioni libero/occupato"
 
@@ -8240,16 +8176,16 @@ msgstr "Aggiorna"
 msgid "Counter-proposal"
 msgstr "Contro-proposta"
 
-#: ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informazioni libero/occupato (da %s a %s)"
 
-#: ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "Informazioni iCalendar"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "È necessario essere un partecipante all'evento."
 
@@ -8373,12 +8309,6 @@ msgstr "Impossibile migrare il calendario «%s»"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossibile migrare i compiti «%s»."
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d secondi)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1"
@@ -10296,7 +10226,7 @@ msgid "%.0fG"
 msgstr "%.0f GB"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra allegati"
 
@@ -10426,7 +10356,7 @@ msgid "Hide _Attachment Bar"
 msgstr "Nascondi _barra allegati"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3843
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Mostra _barra allegati"
 
@@ -10461,12 +10391,12 @@ msgstr "Generata autom."
 msgid "Si_gnature:"
 msgstr "Si_gla:"
 
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
-#: ../composer/e-msg-composer.c:3728
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Composizione messaggio"
 
-#: ../composer/e-msg-composer.c:4952
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10902,7 +10832,7 @@ msgstr "Nome della ric_erca:"
 
 #: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
-msgstr "Trova elementi che soddisfano i seguenti criteri"
+msgstr "Trova gli elementi che soddisfano i seguenti criteri"
 
 #: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
@@ -10934,7 +10864,7 @@ msgstr "Nessuna risposta o genitore"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
-msgstr "Includere le discussioni"
+msgstr "Includi discussioni"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:311
@@ -11037,6 +10967,10 @@ msgstr "fa"
 msgid "months"
 msgstr "mesi"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "secondi"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "l'ora corrente"
@@ -11154,46 +11088,46 @@ msgstr "Scelta cartella"
 msgid "Ask for each message"
 msgstr "Domandare per ciascun messaggio"
 
-#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identità"
 
-#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Ricezione email"
 
-#: ../mail/em-account-editor.c:2012
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "Controllare automaticamente la _nuova posta ogni"
 
-#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Invio email"
 
-#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Predefiniti"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Sicurezza"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2355 ../mail/em-account-editor.c:2446
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Ricezione opzioni"
 
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Controllo nuova posta"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor account"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistente agli account di Evolution"
 
@@ -11215,7 +11149,7 @@ msgstr "[Predefinito]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -11244,18 +11178,18 @@ msgstr "Aggiungi script di sigla"
 msgid "Signature(s)"
 msgstr "Sigla/e"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1666
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. 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:1712
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11356,9 +11290,11 @@ msgstr "esiste"
 msgid "Expression"
 msgstr "Espressione"
 
+# For Follow Up --> da completare
+#
 #: ../mail/em-filter-i18n.h:25
 msgid "Follow Up"
-msgstr "Segue"
+msgstr "Da completare"
 
 #: ../mail/em-filter-i18n.h:27
 msgid "is"
@@ -11374,7 +11310,7 @@ msgstr "è prima di"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
-msgstr "è con segnalazione"
+msgstr "è contrassegnato"
 
 #: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
@@ -11390,7 +11326,7 @@ msgstr "non è"
 
 #: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
-msgstr "è senza segnalazione"
+msgstr "non è contrassegnato"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
@@ -11520,7 +11456,7 @@ msgstr "Oggetto"
 
 #: ../mail/em-filter-i18n.h:66
 msgid "Unset Status"
-msgstr "Stato non impostato"
+msgstr "Azzera stato"
 
 #. and now for the action area
 #: ../mail/em-filter-rule.c:488
@@ -11533,20 +11469,20 @@ msgstr "_Crea cartella di ricerca da ricerca..."
 
 #. 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:145
+#: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Messaggi in totale:"
 msgstr[1] "Messaggi in totale:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:158
+#: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Messaggi non letti:"
 msgstr[1] "Messaggi non letti:"
 
-#: ../mail/em-folder-properties.c:289
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Proprietà cartella"
@@ -11752,9 +11688,8 @@ msgid "Mark as _Not Junk"
 msgstr "Contrassenga come atten_dibile"
 
 #: ../mail/em-folder-view.c:1103
-#, fuzzy
 msgid "Mark for Follo_w Up..."
-msgstr "Contrassengal come seg_ue..."
+msgstr "Contrassenga per com_pletamento..."
 
 #: ../mail/em-folder-view.c:1105
 msgid "_Label"
@@ -11766,11 +11701,11 @@ msgstr "_Nessuno"
 
 #: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
-msgstr "Fla_g completata"
+msgstr "_Contrassegna come completato"
 
 #: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
-msgstr "Pu_lisci flag"
+msgstr "Pu_lisci contrassegno"
 
 #: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
@@ -11958,64 +11893,64 @@ msgstr "_Visualizza certificato"
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Scaduto:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b alle %k.%M"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Adatta alla _larghezza"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostra dimensioni _originali"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Allegato"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selezionare una cartella per salvare tutti gli allegati..."
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Salva selezionati..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d alle_gato"
 msgstr[1] "%d alle_gati"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "S_alva"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "S_alva tutti"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Nessun allegato"
 
@@ -13068,7 +13003,6 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL non è supportato in questa compilazione di Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
-#, fuzzy
 msgid "<b>Sig_natures</b>"
 msgstr "<b>Si_gle</b>"
 
@@ -13705,7 +13639,7 @@ msgstr "Trova nel messaggio"
 #: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
-msgstr "Segnalazione che segue"
+msgstr "Contrassegna per completamento"
 
 #: ../mail/mail-dialogs.glade.h:11
 msgid "Folder Subscriptions"
@@ -13732,8 +13666,8 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"I messaggi selezionati come seguenti sono elencati sotto.\n"
-"Selezionare un'azione seguente dal menu \"Segnalazioni\"."
+"I messaggi selezionati per il completamento sono elencati sotto.\n"
+"Selezionare un'azione di completamento dal menu \"Contrassegno\"."
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
@@ -13745,7 +13679,7 @@ msgstr "Sca_de il:"
 
 #: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
-msgstr "_Segnalazione:"
+msgstr "C_ontrassegno:"
 
 #: ../mail/mail-dialogs.glade.h:22
 msgid "_Subscribe"
@@ -13986,7 +13920,7 @@ msgid "Checking for new mail"
 msgstr "Controllo nuova posta"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:681
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Inserire la password per %s"
@@ -14077,7 +14011,6 @@ msgstr ""
 "accodare il suo contentuto, oppure di uscire.\n"
 
 #: ../mail/mail.error.xml.h:6
-#, fuzzy
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
@@ -14204,7 +14137,6 @@ msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Impossibile aprire la destinazione «{2}»."
 
 #: ../mail/mail.error.xml.h:34
-#, fuzzy
 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 "
@@ -14521,7 +14453,6 @@ msgstr ""
 "Le regole sono state aggiornate."
 
 #: ../mail/mail.error.xml.h:104
-#, fuzzy
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14741,15 +14672,15 @@ msgstr "Scadenza"
 
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
-msgstr "Segnalazione di stato"
+msgstr "Stato contrassegno"
 
 #: ../mail/message-list.etspec.h:5
 msgid "Flagged"
-msgstr "Con segnalazione"
+msgstr "Contrassegnato"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Segnalazione che segue"
+msgstr "Contrassegno da completare"
 
 #: ../mail/message-list.etspec.h:8
 msgid "Original Location"
@@ -14775,7 +14706,7 @@ msgstr "Non inoltrare"
 
 #: ../mail/message-tag-followup.c:77
 msgid "Follow-Up"
-msgstr "Segue"
+msgstr "Da completare"
 
 #: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
@@ -15203,8 +15134,8 @@ msgstr "Tipo di autenticazione"
 msgid "Ch_eck for Supported Types"
 msgstr "Verifica _tipi supportati"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15244,7 +15175,7 @@ msgid "Your current password has expired. Please change your password now."
 msgstr ""
 "La password attualmente in uso è scaduta. È opportuno cambiarla subito."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "La password in uso scadrà tra %d giorni"
@@ -15595,7 +15526,6 @@ msgid "Exchange Account is offline."
 msgstr "L'account Exchange è fuori linea."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15610,19 +15540,17 @@ msgid ""
 "{0}\n"
 "  "
 msgstr ""
-"Exchange Connector richiede l'acceso ad una certa\n"
 "funzionalità su Exchange Server che sembra essere\n"
-"disabilitate o bloccata, di solito in modo non\n"
-"intenzionale. L'amministratore del proprio server\n"
-"Exchage dovrebbe abilitare tale funzionalità per\n"
-"consentire l'uso di Ximian Connector.\n"
+"disabilitate o bloccata (di solito in modo non\n"
+"intenzionale). L'amministratore del server Exchange\n"
+"in uso dovrebbe abilitare tale funzionalità per\n"
+"consentire l'uso di Evolution Exchange Connector.\n"
 "\n"
 "Per le informazioni da fornire al proprio \n"
 "amministratore di Exchange, seguire questo collegamento:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
-"   "
+"{0}\n"
+"  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
 msgid "Failed to update delegates:"
@@ -16598,6 +16526,9 @@ msgstr "<b>%s</b> ha declinato il seguente compito assegnato:"
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
+# Exchange/Outlook: Accepted --> Accettato
+#
+# LF
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:710
 #: ../plugins/itip-formatter/itip-view.c:715
@@ -16607,27 +16538,33 @@ msgstr "_Apri calendario"
 msgid "_Accept"
 msgstr "_Accetta"
 
+# Exchage/Outlook: Declined --> Rifiutato
+#
+# LF
 #: ../plugins/itip-formatter/itip-view.c:713
 msgid "_Decline all"
-msgstr "_Declina tutti"
+msgstr "_Rifiuta tutti"
 
 #: ../plugins/itip-formatter/itip-view.c:713
 #: ../plugins/itip-formatter/itip-view.c:718
 #: ../plugins/itip-formatter/itip-view.c:734
 #: ../plugins/itip-formatter/itip-view.c:739
 msgid "_Decline"
-msgstr "_Declina"
+msgstr "_Rifiuta"
 
+# Exchange/Outlook: Tentative --> Provvisorio
+#
+# LF
 #: ../plugins/itip-formatter/itip-view.c:714
 msgid "_Tentative all"
-msgstr ""
+msgstr "_Provvisori tutti"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
 #: ../plugins/itip-formatter/itip-view.c:735
 #: ../plugins/itip-formatter/itip-view.c:740
 msgid "_Tentative"
-msgstr ""
+msgstr "_Provvisorio"
 
 #: ../plugins/itip-formatter/itip-view.c:715
 msgid "_Accept all"
@@ -17099,7 +17036,7 @@ msgstr "Posizioni"
 msgid "_Publish Calendar Information"
 msgstr "_Pubblica informazioni calendario"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Rimuovere veramente questo URL?"
 
@@ -17366,7 +17303,6 @@ msgstr "Assistente di configurazione di Evolution"
 msgid "Welcome"
 msgstr "Benvenuti"
 
-# Novell Translation
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
@@ -17374,9 +17310,7 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"Benvenuti a Evolution. Le schermate successive consentono di connettere "
-"Evolution al proprio conto e-mail e di importare file da altre "
-"applicazioni. \n"
+"Benvenuti in Evolution. Le schermate successive consentono di connettere Evolution ai propri account email e di importare file da altre applicazioni. \n"
 "\n"
 "Fare clic sul pulsante \"Avanti\" per continuare. "
 
@@ -19215,14 +19149,12 @@ msgid "Change the properties of this folder"
 msgstr "Cambia le proprietà di questa cartella"
 
 #: ../ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Collapse All _Threads"
-msgstr "Raggruppa per _discussione"
+msgstr "Comprimi ogni _discussione"
 
 #: ../ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "Collapse all message threads"
-msgstr "Segna tutti i messaggi come letti"
+msgstr "Comprime tutti i messaggi nelle discussioni"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -19235,7 +19167,7 @@ msgstr "Taglia i messaggi selezionati negli appunti"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "E_spandi tutte discussioni"
+msgstr "E_spandi ogni discussione"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
@@ -19243,7 +19175,7 @@ msgstr "Ri_pulisci"
 
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "Espande tutti i messaggi in discussioni"
+msgstr "Espande tutti i messaggi nelle discussioni"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -19327,7 +19259,7 @@ msgstr "Raggruppa per _discussione"
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "_Messaggio"
+msgstr "Me_ssaggio"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -19475,13 +19407,12 @@ msgid "Filter the selected messages for junk status"
 msgstr "Filtra i messaggi selezionati per lo stato indesiderato"
 
 #: ../ui/evolution-mail-message.xml.h:39
-#, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "Segnala messaggi selezionati come seguenti"
+msgstr "Contrassegna i messaggi selezionati per il completamento"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
-msgstr "Se_gue..."
+msgstr "Com_pletamento..."
 
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
@@ -19683,19 +19614,18 @@ msgstr "Non _importante"
 msgid "Zoom _Out"
 msgstr "Rid_uci ingrandimento"
 
+# Messaggio: Inoltra come -> Allegato | In linea | Citato
 #: ../ui/evolution-mail-message.xml.h:101
-#, fuzzy
 msgid "_Attached"
-msgstr "Allega"
+msgstr "_Allegato"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
-msgstr "_Modalità visualizzazione cursore"
+msgstr "M_odalità con cursore"
 
 #: ../ui/evolution-mail-message.xml.h:103
-#, fuzzy
 msgid "_Clear Flag"
-msgstr "Pu_lisci flag"
+msgstr "Pu_lisci contrassegno"
 
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
@@ -19706,9 +19636,8 @@ msgid "_Find in Message..."
 msgstr "Tr_ova nel messaggio..."
 
 #: ../ui/evolution-mail-message.xml.h:109
-#, fuzzy
 msgid "_Flag Completed"
-msgstr "Fla_g completata"
+msgstr "Contrassegna come co_mpletato"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
@@ -20062,7 +19991,7 @@ msgstr "_Inverti selezione"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr ""
+msgstr "Fare clic per cambiare/visualizzare i dettagli di stato del compito"
 
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
@@ -20265,7 +20194,7 @@ msgstr "Mostra/Nasconde la barra di stato"
 
 #: ../ui/evolution.xml.h:38
 msgid "_About"
-msgstr "I_nfomazioni"
+msgstr "I_nformazioni"
 
 #: ../ui/evolution.xml.h:39
 msgid "_Close Window"
@@ -20357,7 +20286,7 @@ msgstr "Per _oggetto"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By _Follow Up Flag"
-msgstr "Per segnato come _seguente"
+msgstr "Per contrassegno di com_pletamento"
 
 #: ../views/mail/galview.xml.h:6
 msgid "_Messages"
@@ -20557,17 +20486,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../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:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Larghezza minima"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../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:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Larghezza minima"
 
@@ -20827,15 +20756,16 @@ msgstr "Sincronizza Record Privati:"
 msgid "Sync Categories:"
 msgstr "Categorie Sync:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Messaggio vuoto"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#, fuzzy
 msgid "Reflow model"
-msgstr ""
+msgstr "Modello di reflow"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Larghezza colonna"
 
@@ -21077,23 +21007,23 @@ msgstr "Colonna con focus"
 msgid "Unselected Column"
 msgstr "Colonna deselezionata"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Colonna barrata"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Colonna sottolineata"
 
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Colonna in grassetto"
 
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Colonna colorata"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Colore di sfondo colonna"
 
@@ -21141,6 +21071,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "_Mostra questi campi nell'ordine:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "Mostra campi"
@@ -21199,6 +21130,10 @@ msgstr "Non ordinato"
 msgid "No grouping"
 msgstr "Non raggruppato"
 
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr "Campi disponibili"
+
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "_Raggruppa per..."
@@ -21261,7 +21196,7 @@ msgstr "%s (%d oggetti)"
 #: ../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:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Colori colonna alternativi"
 
@@ -21269,7 +21204,7 @@ msgstr "Colori colonna alternativi"
 #: ../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:2979 ../widgets/table/e-table-item.c:2980
+#: ../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 "Disegna griglia orizzontale"
@@ -21278,7 +21213,7 @@ msgstr "Disegna griglia orizzontale"
 #: ../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:2986 ../widgets/table/e-table-item.c:2987
+#: ../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 "Disegna griglia verticale"
@@ -21287,7 +21222,7 @@ msgstr "Disegna griglia verticale"
 #: ../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:2993 ../widgets/table/e-table-item.c:2994
+#: ../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 "Disegna focus"
@@ -21296,7 +21231,7 @@ msgstr "Disegna focus"
 #: ../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:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modalità cursore"
 
@@ -21304,7 +21239,7 @@ msgstr "Modalità cursore"
 #: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modello di selezione"
 
@@ -21312,7 +21247,7 @@ msgstr "Modello di selezione"
 #: ../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:3007 ../widgets/table/e-table-item.c:3008
+#: ../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"
@@ -21322,7 +21257,7 @@ msgstr "Lunghezza soglia"
 #: ../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:3041 ../widgets/table/e-table-item.c:3042
+#: ../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"
@@ -21399,15 +21334,15 @@ msgstr "Informazioni ordinamento"
 msgid "Tree"
 msgstr "Albero"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Intestazione tabella"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modello tabella"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Riga cursore"
 
@@ -21581,184 +21516,3 @@ msgstr "Contesto IM"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Gestisci popup"
-
-#~ msgid "Addressbook"
-#~ msgstr "Rubrica"
-
-#~ 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."
-#~ msgstr ""
-#~ "Selezionando quest'opzione, Evolution tenterà di utilizzare SSL/TLS "
-#~ "solamente se ci si trova in un ambiente insicuro. Per esempio se si è, "
-#~ "insieme al server LDAP, dietro ad un firewall funzionante, Evolution non "
-#~ "necessita di utilizzare SSL/TLS dato che la connessione è già sicura."
-
-#~ msgid "Task Table"
-#~ msgstr "Tabella compiti"
-
-#~ msgid "Removal Complete"
-#~ msgstr "Rimozione completata"
-
-#~ msgid "Con_tacts..."
-#~ msgstr "Con_tatti..."
-
-#~ msgid "Memo Table"
-#~ msgstr "Tabella memo"
-
-#~ msgid "Timezone Button"
-#~ msgstr "Pulsante fuso orario"
-
-#~ msgid "The Evolution Groupware Suite"
-#~ msgstr "La suite Evolution per il groupware"
-
-#~ msgid "Mail Accounts Table"
-#~ msgstr "Tabella account di posta"
-
-#~ msgid "Attachment Button"
-#~ msgstr "Pulsante allegati"
-
-#~ msgid "Toggle Attachment Bar"
-#~ msgstr "Commuta barra allegati"
-
-#~ msgid "Filters"
-#~ msgstr "Filtri"
-
-#~ msgid "_Show animated images"
-#~ msgstr "Mostrare i_mmagini animate"
-
-#~ msgid "<b>%s (%s)</b> : %s"
-#~ msgstr "<b>%s (%s)</b> : %s"
-
-#~ msgid "<b>%s (%s)</b>"
-#~ msgstr "<b>%s (%s)</b>"
-
-#~ msgid "<b>%s</b> : %s"
-#~ msgstr "<b>%s</b> : %s"
-
-#~ msgid "<b>%s</b>"
-#~ msgstr "<b>%s</b>"
-
-#~ msgid "Message List"
-#~ msgstr "Elenco messaggi"
-
-#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contatti automatici</span>"
-
-#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-#~ msgstr "<span weight=\"bold\">Contatti di messaggistica istantanea</span>"
-
-#~ msgid "<span weight=\"bold\">Conflict Search</span>"
-#~ msgstr "<span weight=\"bold\">Ricerca conflitti</span>"
-
-#~ msgid "_All day Event"
-#~ msgstr "_Evento intera giornata"
-
-#~ msgid "Previous Button"
-#~ msgstr "Pulsante precedente"
-
-#~ msgid "Text Date Entry"
-#~ msgstr "Inserimento testo data"
-
-#~ msgid "Date Button"
-#~ msgstr "Pulsante data"
-
-#~ msgid "Time Combo Box"
-#~ msgstr "Casella combinata orario"
-
-#~ msgid "Search Text Entry"
-#~ msgstr "Inserimento testo da cercare"
-
-#~ msgid "Advanced..."
-#~ msgstr "Avanzata..."
-
-#~ msgid "Select target addressbook."
-#~ msgstr "Seleziona rubrica di destinazione."
-
-#~ msgid "(none)"
-#~ msgstr "(nessuna)"
-
-#~ msgid "Primary Email"
-#~ msgstr "Email principale"
-
-#~ msgid "Select an Action"
-#~ msgstr "Seleziona un'azione"
-
-#~ msgid "Create a new contact \"%s\""
-#~ msgstr "Crea un nuovo contatto «%s»"
-
-#~ msgid "Add address to existing contact \"%s\""
-#~ msgstr "Aggiungi indirizzo al contatto esistente «%s»"
-
-#~ msgid "Merge E-Mail Address"
-#~ msgstr "Unisci indirizzi email"
-
-#~ msgid "<b>Calendars</b>"
-#~ msgstr "<b>Calendari</b>"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferenze"
-
-#~ msgid "_Configure Alarms"
-#~ msgstr "_Configura allarmi"
-
-#~ msgid "<b>Publishing</b>"
-#~ msgstr "<b>Pubblicazione</b>"
-
-#~ msgid "Publishing Table"
-#~ msgstr "Tabella di pubblicazione"
-
-#~ msgid "_Add URL"
-#~ msgstr "_Aggiungi URL"
-
-# Novell Translation
-#~ msgid "Or_ganizer"
-#~ msgstr "Or_ganizzatore"
-
-#~ msgid "_Description:"
-#~ msgstr "_Descrizione:"
-
-#~ msgid "<b>Dele_gatees</b>"
-#~ msgstr "<b>Dele_gati</b>"
-
-#~ msgid "<b>From:</b>"
-#~ msgstr "<b>Da:</b>"
-
-#~ msgid "<span weight=\"bold\">Basics</span>"
-#~ msgstr "<span weight=\"bold\">Base</span>"
-
-#~ msgid "Classi_fication:"
-#~ msgstr "Classi_ficazione:"
-
-#~ msgid "_Group"
-#~ msgstr "_Gruppo"
-
-#~ msgid "T_erminal Font:"
-#~ msgstr "Carattere del t_erminale:"
-
-#~ msgid "dialog1"
-#~ msgstr "dialogo1"
-
-#~ msgid "Id"
-#~ msgstr "ID"
-
-#~ msgid "Path"
-#~ msgstr "Percorso"
-
-# Novell Translation
-#~ msgid "Evolution Settings"
-#~ msgstr "Impostazioni di Evolution"
-
-#~ msgid "_Select All"
-#~ msgstr "_Seleziona tutto"
-
-#~ msgid "Show Time _Zone"
-#~ msgstr "Mostra _fuso orario"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "I_nformazioni su Evolution..."
-
-#~ msgid "Available Fields"
-#~ msgstr "Campi disponibili"
diff --git a/po/ka.po b/po/ka.po
index 003b0cb30f..ff218ff3f0 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,26 +1,26 @@
-# translation of evolution.po to Georgian
+# translation of evolution.gnome-2-14.po to Georgian
 # Copyright © 2005 Canonical Ltd, and Rosetta Contributors 2005
 # This file is distributed under the same license as the evolution package.
+#
 # Alexander Didebulidze <didebuli@in.tum.de>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-03 06:04+0100\n"
-"PO-Revision-Date: 2006-03-08 22:04+0100\n"
-"Last-Translator: Alexander Didebulidze <didebuli@in.tum.de>\n"
+"POT-Creation-Date: 2006-03-10 06:12+0100\n"
+"PO-Revision-Date: 2006-03-15 00:00+0100\n"
+"Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n"
 "Language-Team: Georgian <gnome@inet.ge>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=1; plural=0"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
-msgstr "evolution მისამართების გწიგნაკი"
+msgstr "ევოლუშენ მისამართების წიგნაკი"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
@@ -34,9 +34,9 @@ msgstr "ახალი კონტაქტების სია"
 
 #: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
+#, fuzzy
 msgid "current addressbook folder has %d card"
-msgid_plural "current addressbook folder has %d cards"
-msgstr[0] ""
+msgstr "წიგნაკი"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -52,8 +52,9 @@ msgid "Contact: "
 msgstr "კონტაქტი: "
 
 #: ../a11y/addressbook/ea-minicard.c:168
+#, fuzzy
 msgid "evolution minicard"
-msgstr ""
+msgstr "Evolution-Minicard"
 
 #: ../a11y/calendar/ea-cal-view-event.c:235
 msgid "It has alarms."
@@ -70,16 +71,17 @@ msgstr "ეს არის შეხვედრა."
 #: ../a11y/calendar/ea-cal-view-event.c:247
 #, fuzzy, c-format
 msgid "Calendar Event: Summary is %s."
-msgstr "კალენდარი შემთხვევა ჯამური."
+msgstr "კალენდარი მოვლენა რეზიუმე წმ."
 
 #: ../a11y/calendar/ea-cal-view-event.c:249
 #, fuzzy
 msgid "Calendar Event: It has no summary."
-msgstr "კალენდარი შემთხვევა არა."
+msgstr "კალენდარი მოვლენა არა."
 
 #: ../a11y/calendar/ea-cal-view-event.c:268
+#, fuzzy
 msgid "calendar view event"
-msgstr ""
+msgstr "კალენდარი მოვლენა"
 
 #: ../a11y/calendar/ea-cal-view-event.c:485
 msgid "Grab Focus"
@@ -90,8 +92,9 @@ msgid "New Appointment"
 msgstr "ახალი ტერმინი"
 
 #: ../a11y/calendar/ea-cal-view.c:303
+#, fuzzy
 msgid "New All Day Event"
-msgstr ""
+msgstr "ახალი ყველა დღე მოვლენა"
 
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
@@ -107,36 +110,40 @@ 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 "a ცხრილი -სკენ და"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
+#, fuzzy
 msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] ""
+msgstr "მოვლენა."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
+#, fuzzy
 msgid "It has no events."
-msgstr ""
+msgstr "არა."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "სამუშაო კვირის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "დღის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
+#, fuzzy
 msgid "calendar view for a work week"
-msgstr ""
+msgstr "კალენდარი a კვირა"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
+#, fuzzy
 msgid "calendar view for one or more days"
-msgstr ""
+msgstr "კალენდარი ან მეტი დღე"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:661
@@ -195,38 +202,43 @@ msgid "Gnome Calendar"
 msgstr "Gnome კალენდარი"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:290
+#, fuzzy
 msgid "search bar"
-msgstr ""
+msgstr "ძიება"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:291
+#, fuzzy
 msgid "evolution calendar search bar"
-msgstr ""
+msgstr "კალენდარი ძიება"
 
 #: ../a11y/calendar/ea-jump-button.c:149
 msgid "Jump button"
 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
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "თვის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "კვირის ხედი: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
+#, fuzzy
 msgid "calendar view for a month"
-msgstr ""
+msgstr "კალენდარი a თვე"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
+#, fuzzy
 msgid "calendar view for one or more weeks"
-msgstr ""
+msgstr "კალენდარი ან მეტი"
 
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:124
 msgid "popup"
@@ -234,12 +246,14 @@ msgstr ""
 
 #. action name
 #: ../a11y/e-table/gal-a11y-e-cell-popup.c:125
+#, fuzzy
 msgid "popup a child"
-msgstr ""
+msgstr "a"
 
 #: ../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"
@@ -259,26 +273,30 @@ msgid "expand"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:172
+#, fuzzy
 msgid "expands the row in the ETree containing this cell"
-msgstr ""
+msgstr "რიგი -"
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:177
 msgid "collapse"
 msgstr ""
 
 #: ../a11y/e-table/gal-a11y-e-cell-tree.c:178
+#, fuzzy
 msgid "collapses the row in the ETree containing this cell"
-msgstr ""
+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:574
+#, fuzzy
 msgid "click to add"
-msgstr ""
+msgstr "-სკენ დამატება"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
@@ -299,30 +317,36 @@ msgid "Calendar: from %s to %s"
 msgstr "კალენდარი: %s-დან %s-მდე"
 
 #: ../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
+#, fuzzy
 msgid "Popup Menu"
-msgstr ""
+msgstr "მხტუნავი მენიუ"
 
 #: ../addressbook/addressbook.error.xml.h:1
+#, fuzzy
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr ""
+msgstr "A -სკენ დამატება a ახალი?"
 
 #: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
 msgid "Address '{0}' already exists."
-msgstr ""
+msgstr "მისამართი."
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Cannot move contact."
@@ -331,76 +355,90 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:4
 #, fuzzy
 msgid "Category editor not available."
-msgstr "კატეგორია."
+msgstr "კატეგორია არა."
 
 #: ../addressbook/addressbook.error.xml.h:5
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
-msgstr ""
+msgstr "შემოწმება -სკენ და a დაიმახსოვრე ჩართულია."
 
 #: ../addressbook/addressbook.error.xml.h:6
+#, fuzzy
 msgid "Could not get schema information for LDAP server."
-msgstr ""
+msgstr "არა სქემა LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:7
+#, fuzzy
 msgid "Could not remove addressbook."
-msgstr ""
+msgstr "არა ამოშლა წიგნაკი."
 
 #: ../addressbook/addressbook.error.xml.h:8
+#, fuzzy
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
-msgstr ""
+msgstr "სისტემა მისამართი Evolution მონაცემები სხვა ფოსტა -სკენ ხშირი მეგობრები და პირადი მეგობრები."
 
 #: ../addressbook/addressbook.error.xml.h:9
+#, fuzzy
 msgid "Delete address book '{0}'?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/addressbook.error.xml.h:10
+#, fuzzy
 msgid "Error loading addressbook."
-msgstr ""
+msgstr "შეცდომა წიგნაკი."
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid "Error saving {0} to {1}: {2}"
-msgstr ""
+msgstr "შეცდომა -სკენ"
 
 #: ../addressbook/addressbook.error.xml.h:12
+#, fuzzy
 msgid "Failed to authenticate with LDAP server."
-msgstr ""
+msgstr "ვერ განხორციელდა -სკენ LDAP."
 
 #: ../addressbook/addressbook.error.xml.h:13
+#, fuzzy
 msgid "GroupWise Address book creation:"
-msgstr ""
+msgstr "მისამართი:"
 
 #: ../addressbook/addressbook.error.xml.h:14
+#, fuzzy
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
+msgstr "LDAP არა სქემა."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
 msgstr "სერვერის ვერსია"
 
 #: ../addressbook/addressbook.error.xml.h:16
+#, fuzzy
 msgid "Some features may not work properly with your current server"
-msgstr ""
+msgstr "არა"
 
 #: ../addressbook/addressbook.error.xml.h:17
+#, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr ""
+msgstr "Evolution წიგნაკი დასრულება."
 
 #: ../addressbook/addressbook.error.xml.h:18
+#, fuzzy
 msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
+msgstr "ნახატი -სკენ და?"
 
 #: ../addressbook/addressbook.error.xml.h:19
+#, fuzzy
 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 ""
+msgstr "LDAP - LDAP არა სუპორტი ან კითხვა ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:20
 msgid "This address book will be removed permanently."
@@ -411,57 +449,68 @@ msgid "This addressbook could not be opened."
 msgstr "ვერ ვხსნი ამ მისამართების წიგნაკს."
 
 #: ../addressbook/addressbook.error.xml.h:22
+#, fuzzy
 msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
+msgstr "წიგნაკი არა ნებისმიერი ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:23
+#, fuzzy
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
-msgstr ""
+msgstr "წიგნაკი ან სახელი ან ქვემოთ."
 
 #: ../addressbook/addressbook.error.xml.h:24
+#, fuzzy
 msgid "This server does not support LDAPv3 schema information."
-msgstr ""
+msgstr "არა სუპორტი სქემა."
 
 #: ../addressbook/addressbook.error.xml.h:25
+#, fuzzy
 msgid "Unable to open addressbook"
-msgstr ""
+msgstr "-სკენ გახსნა წიგნაკი"
 
 #: ../addressbook/addressbook.error.xml.h:26
+#, fuzzy
 msgid "Unable to perform search."
-msgstr ""
+msgstr "-სკენ ძიება."
 
 #: ../addressbook/addressbook.error.xml.h:27
+#, fuzzy
 msgid "Unable to save {0}."
-msgstr ""
+msgstr "-სკენ შენახვა."
 
 #: ../addressbook/addressbook.error.xml.h:28
+#, fuzzy
 msgid "Would you like to save your changes?"
-msgstr ""
+msgstr "-სკენ შენახვა?"
 
 #: ../addressbook/addressbook.error.xml.h:29
+#, fuzzy
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
+msgstr "თქვენ -სკენ a წიგნაკი -სკენ -სკენ შენახვა a კოპირება?"
 
 #: ../addressbook/addressbook.error.xml.h:30
+#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
-msgstr ""
+msgstr "თქვენ დაკავშირება -სკენ და Evolution -თვის -სკენ a"
 
 #: ../addressbook/addressbook.error.xml.h:31
+#, fuzzy
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr ""
+msgstr "თქვენ -სკენ -სკენ შენახვა?"
 
 #: ../addressbook/addressbook.error.xml.h:32
+#, fuzzy
 msgid "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
+msgstr "არა Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
@@ -471,9 +520,8 @@ msgid "_Add"
 msgstr "_დამატება"
 
 #: ../addressbook/addressbook.error.xml.h:34
-#, fuzzy
 msgid "_Discard"
-msgstr "უარყოფა"
+msgstr "_უარყოფა"
 
 #: ../addressbook/addressbook.error.xml.h:35
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
@@ -491,14 +539,15 @@ msgstr "ნაგულისხმევი მისამართი:"
 
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
+#, fuzzy
 msgid "Could not load addressbook"
-msgstr ""
+msgstr "არა წიგნაკი"
 
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 #, fuzzy
 msgid "Could not read pilot's Address application block"
-msgstr "მისამართი"
+msgstr "არა წმ მისამართი პროგრამა"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
@@ -515,7 +564,7 @@ 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
@@ -523,7 +572,7 @@ msgstr "კონფიგურირება"
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
-msgstr ""
+msgstr "კონტაქტები"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #, fuzzy
@@ -533,7 +582,7 @@ msgstr "Evolution მისამართი"
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Address Book address pop-up"
-msgstr "Evolution მისამართი"
+msgstr "Evolution მისამართი ზემოთ"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 #, fuzzy
@@ -551,16 +600,19 @@ msgid "Evolution Address Book component"
 msgstr "Evolution მისამართი"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
+msgstr "Evolution S Mime სერთიფიკატი Control"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
 msgid "Evolution folder settings configuration control"
-msgstr ""
+msgstr "Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
 msgid "Manage your S/MIME certificates here"
-msgstr ""
+msgstr "S"
 
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
@@ -623,18 +675,19 @@ msgid "Address _Book"
 msgstr "მისამართების _წიგნაკი"
 
 #: ../addressbook/gui/component/addressbook-component.c:244
+#, fuzzy
 msgid "Create a new address book"
-msgstr ""
+msgstr "შექმნა a ახალი"
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 #, fuzzy
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "ოპერაცია ვერ/არ ჩატარდა მისამართი."
+msgstr "ვერ განხორციელდა მისამართი ან."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 #, fuzzy
 msgid "Base"
-msgstr "ძირითადი"
+msgstr "ფუძე"
 
 #: ../addressbook/gui/component/addressbook-config.c:530
 #: ../calendar/gui/dialogs/calendar-setup.c:192
@@ -645,7 +698,7 @@ msgstr "_ტიპი:"
 #: ../addressbook/gui/component/addressbook-config.c:632
 #, fuzzy
 msgid "Copy book content locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე ხაზიდან გასვლა"
 
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
@@ -684,8 +737,9 @@ msgid "Searching"
 msgstr "ვეძებ"
 
 #: ../addressbook/gui/component/addressbook-config.c:994
+#, fuzzy
 msgid "Downloading"
-msgstr ""
+msgstr "მიმდინარეობს ჩამოქაჩვა"
 
 #: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
@@ -701,8 +755,9 @@ msgstr ""
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
+#, fuzzy
 msgid "Migrating `%s':"
-msgstr ""
+msgstr "წმ:"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
@@ -720,7 +775,7 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "და Evolution Evolution n Evolution."
+msgstr "და - Evolution Evolution x არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1133
 #, fuzzy
@@ -728,49 +783,49 @@ msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "n Evolution."
+msgstr "- სია არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1142
+#, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "Evolution მონაცემები არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1152
+#, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
+msgstr "Evolution წმ და ფაილი არა Evolution."
 
 #: ../addressbook/gui/component/addressbook-view.c:434
 #: ../mail/em-folder-utils.c:503
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "გადაარქვი -სკენ:"
+msgstr "სახელის გადარქმევა წმ -სკენ:"
 
 #: ../addressbook/gui/component/addressbook-view.c:437
 #: ../mail/em-folder-utils.c:505
-#, fuzzy
 msgid "Rename Folder"
-msgstr "გადაარქვი საქაღალდე"
+msgstr "საქაღალდეს გადარქმევა"
 
 #: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
 #, fuzzy
 msgid "Folder names cannot contain '/'"
-msgstr "საქაღალდე"
+msgstr "საქაღალდე შეიცავს"
 
 #: ../addressbook/gui/component/addressbook-view.c:445
 #, fuzzy
 msgid "A Folder with this name already exists"
-msgstr "A საქაღალდე"
+msgstr "A საქაღალდე სახელი"
 
 #: ../addressbook/gui/component/addressbook-view.c:953
-#, fuzzy
 msgid "_New Address Book"
-msgstr "ახალი მისამართი"
+msgstr "_ახალი საკონტაქტო ანკეტა"
 
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:954
@@ -793,14 +848,13 @@ msgstr "შენახვა."
 #: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
-#, fuzzy
 msgid "_Properties..."
-msgstr "პარამეტრები."
+msgstr "_პარამეტრები..."
 
 #: ../addressbook/gui/component/addressbook-view.c:1345
 #, fuzzy
 msgid "Contact Source Selector"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი წყარო ამრჩევი"
 
 #: ../addressbook/gui/component/addressbook.c:99
 #, fuzzy
@@ -811,53 +865,58 @@ msgstr "LDAP სერვერი"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 #, fuzzy
 msgid "Failed to authenticate.\n"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ n"
+msgstr "ვერ განხორციელდა -სკენ არა"
 
 #: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
+#, fuzzy
 msgid "Enter password for %s (user %s)"
-msgstr ""
+msgstr "შეყვანა წმ წმ"
 
 #: ../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
 msgid "EFolderList XML for the list of completion URIs"
-msgstr ""
+msgstr "სია -"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#, fuzzy
 msgid "EFolderList XML for the list of completion URIs."
-msgstr ""
+msgstr "სია -."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "თანამდებობა ვერტიკალური და და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და სია და - პიქსელი."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 #, fuzzy
 msgid "Show preview pane"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#, fuzzy
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr ""
+msgstr "რიცხვი - ასო-ნიშნები Evolution -სკენ თვითშევსება."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog"
-msgstr "URI"
+msgstr "URI - დიალოგი"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
 #, fuzzy
 msgid "URI for the folder last used in the select names dialog."
-msgstr "URI."
+msgstr "URI - დიალოგი."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
@@ -900,8 +959,9 @@ msgid "<b>Display</b>"
 msgstr "<b>დისპლეი</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
 msgid "<b>Downloading</b>"
-msgstr ""
+msgstr "<b> მიმდინარეობს ჩამოქაჩვა</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
@@ -916,9 +976,8 @@ msgid "<b>Type:</b>"
 msgstr "<b>ტიპი:</b>"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
 msgid "Add Address Book"
-msgstr "დამატება მისამართი"
+msgstr "საკონტაქტო ანკეტის დამატება"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
 #: ../mail/em-account-editor.c:777
@@ -934,8 +993,9 @@ msgid "Basic"
 msgstr "ძირითადი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
+#, fuzzy
 msgid "Distinguished name"
-msgstr ""
+msgstr "სახელი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
@@ -944,12 +1004,12 @@ msgstr "Email მისამართი"
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution -სკენ."
+msgstr "Evolution ელფოსტა -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Find Possible Search Bases"
-msgstr "ძებნა ძებნა"
+msgstr "ძიება ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 msgid "Lo_gin:"
@@ -984,7 +1044,7 @@ msgstr "SSL"
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search Filter"
-msgstr "ძებნა ფილტრი"
+msgstr "ძებნის ფილტრი"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
@@ -1002,11 +1062,12 @@ msgid "Search filter"
 msgstr "ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
-msgstr ""
+msgstr "ძებნა - ძიება არა შეცვლილი ნაგულისხმები ძიება ჩართულია - პირადი ფორმა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
@@ -1020,7 +1081,7 @@ msgstr "Evolution -სკენ LDAP LDAP SSL."
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
-msgstr "Evolution -სკენ LDAP LDAP."
+msgstr "Evolution -სკენ LDAP LDAP TLS."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
@@ -1028,7 +1089,7 @@ msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
-msgstr "სუპორტი SSL და -სკენ."
+msgstr "არა სუპორტი SSL ან TLS და -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
@@ -1046,7 +1107,7 @@ msgstr "ძებნა"
 #: ../mail/em-account-editor.c:308
 #, fuzzy
 msgid "TLS encryption"
-msgstr "აღწერა"
+msgstr "TLS"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
@@ -1054,7 +1115,7 @@ msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr "DN დირექტორია."
+msgstr "ძიება სახელი DN - ელემენტი ცარიელი ძიება ეთ root - ხე."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 #, fuzzy
@@ -1063,20 +1124,21 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr "-სკენ დირექტორია A A."
+msgstr "ძიება ძიება -სკენ ქვემოთ ხე A ძიება - შემცველობა ყველა ძიება A ძიება - შემცველობა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
+msgstr "სახელი - -თვის მაგალითი."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
-msgstr "რიცხვი -სკენ პარამეტრი რიცხვი -სკენ."
+msgstr "რიცხვი - -სკენ რიცხვი -სკენ ქვემოთ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
@@ -1084,14 +1146,14 @@ 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 "Evolution -სკენ შენიშვნა -სკენ Email მისამართი ანონიმი -სკენ."
+msgstr "Evolution -სკენ შენიშვნა -სკენ ელფოსტა მისამართი ანონიმი -სკენ."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
-msgstr "Evolution "
+msgstr "სახელი - Evolution სია "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
@@ -1099,40 +1161,38 @@ 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 Evolution -სკენ -სკენ A კითხვა."
+msgstr "ჩართულია LDAP Evolution -სკენ -სკენ A სია - კითხვა."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 #, fuzzy
 msgid "Using distinguished name (DN)"
-msgstr "DN"
+msgstr "სახელი DN"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
 msgid "Using email address"
-msgstr ""
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:49
-#, fuzzy
 msgid "_Add Address Book"
-msgstr "დამატება მისამართი"
+msgstr "ანკეტის _დამატება"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
 msgid "_Download limit:"
-msgstr "ჩამოტვირთვა:"
+msgstr "_ჩამოტვირთვის ლიმიტი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "_Find Possible Search Bases"
-msgstr "ძებნა ძებნა"
+msgstr "ძიება ძებნა"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
 msgid "_Login method:"
-msgstr "შესვლა:"
+msgstr "_შესვლის მეთოდი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
 #: ../calendar/gui/dialogs/calendar-setup.c:245
@@ -1158,7 +1218,6 @@ msgid "_Server:"
 msgstr "_სერვერი:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:57
-#, fuzzy
 msgid "_Timeout:"
 msgstr "დაყოვნების დრო:"
 
@@ -1173,12 +1232,9 @@ msgstr ""
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1237,8 +1293,9 @@ msgid "<b>Telephone</b>"
 msgstr "<b>ტელეფონი</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#, fuzzy
 msgid "<b>Web Addresses</b>"
-msgstr ""
+msgstr "<b> ვები მისამართები</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
@@ -1247,8 +1304,9 @@ msgstr "<b>სამსახური</b>"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
 #: ../addressbook/gui/widgets/eab-contact-display.c:348
+#, fuzzy
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
@@ -1275,9 +1333,8 @@ msgstr "სურათი"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "MSN მესინჯერი"
+msgstr "MSN მესენჯერი"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
@@ -1320,8 +1377,9 @@ msgid "_Anniversary:"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
 msgid "_Assistant:"
-msgstr ""
+msgstr "ასისტენტი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
@@ -1364,23 +1422,20 @@ msgid "_Free/Busy:"
 msgstr "_თავისუფალი/დაკავებული:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
-#, fuzzy
 msgid "_Home Page:"
-msgstr "სახლი გვერდი:"
+msgstr "_პირადი ვებ გვერდი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-#, fuzzy
 msgid "_Manager:"
-msgstr "მმართველი:"
+msgstr "_მენეჯერი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Notes:"
 msgstr "_შენიშვნები:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#, fuzzy
 msgid "_Office:"
-msgstr "ოფისი:"
+msgstr "_ოფისი:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
@@ -1397,13 +1452,11 @@ msgstr ""
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-#, fuzzy
 msgid "_State/Province:"
-msgstr "მდგომარეობა:"
+msgstr "_ქვეყანა/პროვინცია:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 #: ../addressbook/gui/contact-editor/fullname.glade.h:18
-#, fuzzy
 msgid "_Title:"
 msgstr "_სათაური:"
 
@@ -1414,11 +1467,12 @@ msgstr "_ვიდეო Chat-ი:"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 #, fuzzy
 msgid "_Wants to receive HTML mail"
-msgstr "-სკენ"
+msgstr "-სკენ HTML ფოსტა"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#, 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
@@ -1451,7 +1505,7 @@ msgstr "მისამართი"
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
-msgstr ""
+msgstr "რედაქტირებადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "United States"
@@ -1459,7 +1513,7 @@ msgstr "შეერთებული შტატები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Afghanistan"
-msgstr ""
+msgstr "ავღანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Albania"
@@ -1471,159 +1525,190 @@ msgstr "ალგერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "American Samoa"
-msgstr ""
+msgstr "ამერიკული სამოა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Andorra"
-msgstr ""
+msgstr "ანდორა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Angola"
 msgstr "ანგოლა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#, fuzzy
 msgid "Anguilla"
-msgstr ""
+msgstr "ანგუილა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#, fuzzy
 msgid "Antarctica"
-msgstr ""
+msgstr "ანტარქტიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#, fuzzy
 msgid "Antigua And Barbuda"
-msgstr ""
+msgstr "ბარბუდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
-msgstr ""
+msgstr "არგენტინა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#, fuzzy
 msgid "Armenia"
-msgstr ""
+msgstr "სასომხეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Aruba"
-msgstr ""
+msgstr "არუბა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#, fuzzy
 msgid "Australia"
-msgstr ""
+msgstr "ავსტრალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#, fuzzy
 msgid "Austria"
-msgstr ""
+msgstr "ავსტრია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#, fuzzy
 msgid "Azerbaijan"
-msgstr ""
+msgstr "აზერბაიჯანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#, fuzzy
 msgid "Bahamas"
-msgstr ""
+msgstr "ბაჰამები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#, fuzzy
 msgid "Bahrain"
-msgstr ""
+msgstr "ბაჰრანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#, fuzzy
 msgid "Bangladesh"
-msgstr ""
+msgstr "ბანგლადეში"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#, fuzzy
 msgid "Barbados"
-msgstr ""
+msgstr "ბარბადოსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#, fuzzy
 msgid "Belarus"
-msgstr ""
+msgstr "ბელარუსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#, fuzzy
 msgid "Belgium"
-msgstr ""
+msgstr "ბელგია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#, fuzzy
 msgid "Belize"
-msgstr ""
+msgstr "ბალიზე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#, fuzzy
 msgid "Benin"
-msgstr ""
+msgstr "ბენინი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#, fuzzy
 msgid "Bermuda"
-msgstr ""
+msgstr "ბერმუდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#, fuzzy
 msgid "Bhutan"
-msgstr ""
+msgstr "ბუტანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#, fuzzy
 msgid "Bolivia"
-msgstr ""
+msgstr "ბოლივია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bosnia And Herzegowina"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#, fuzzy
 msgid "Botswana"
-msgstr ""
+msgstr "ბოთსვანა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#, fuzzy
 msgid "Bouvet Island"
-msgstr ""
+msgstr "ბუვეს კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brazil"
 msgstr "ბრაზილია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#, fuzzy
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "ინდოეთის ოკეანეს ბრიტანული ტერიტორიები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#, fuzzy
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "ბრუნეი დარესსალამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#, fuzzy
 msgid "Bulgaria"
-msgstr ""
+msgstr "ბულგარეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#, fuzzy
 msgid "Burkina Faso"
-msgstr ""
+msgstr "ბურკინა ფასო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#, fuzzy
 msgid "Burundi"
-msgstr ""
+msgstr "ბურუნდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#, fuzzy
 msgid "Cambodia"
-msgstr ""
+msgstr "კამბოჯა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#, fuzzy
 msgid "Cameroon"
-msgstr ""
+msgstr "კამერუნი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Canada"
 msgstr "კანადა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#, fuzzy
 msgid "Cape Verde"
-msgstr ""
+msgstr "მწვანე კონცხი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#, fuzzy
 msgid "Cayman Islands"
-msgstr ""
+msgstr "კაიმანის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#, fuzzy
 msgid "Central African Republic"
-msgstr ""
+msgstr "ცენტრალური აფრიკის რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#, fuzzy
 msgid "Chad"
-msgstr ""
+msgstr "ჩადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
@@ -1634,44 +1719,52 @@ msgid "China"
 msgstr "ჩინეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#, fuzzy
 msgid "Christmas Island"
-msgstr ""
+msgstr "შობის კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#, fuzzy
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "კოკოსიური(კილინგის)კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#, fuzzy
 msgid "Colombia"
-msgstr ""
+msgstr "კოლუმბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#, fuzzy
 msgid "Comoros"
-msgstr ""
+msgstr "კომორის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "კონგო"
 
 #: ../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:188
+#, fuzzy
 msgid "Cook Islands"
-msgstr ""
+msgstr "კუკის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#, fuzzy
 msgid "Costa Rica"
-msgstr ""
+msgstr "კოსტა რიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Cote d'Ivoire"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#, fuzzy
 msgid "Croatia"
-msgstr ""
+msgstr "ხორვატია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cuba"
@@ -1687,48 +1780,58 @@ msgid "Czech Republic"
 msgstr "ჩეხური რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#, fuzzy
 msgid "Denmark"
-msgstr ""
+msgstr "დანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#, fuzzy
 msgid "Djibouti"
-msgstr ""
+msgstr "ჯიბუტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#, fuzzy
 msgid "Dominica"
-msgstr ""
+msgstr "დომინიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#, fuzzy
 msgid "Dominican Republic"
-msgstr ""
+msgstr "დომინიკური რესპუბლიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#, fuzzy
 msgid "Ecuador"
-msgstr ""
+msgstr "ეკვადორი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "Egypt"
 msgstr "ეგვიპტე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#, fuzzy
 msgid "El Salvador"
-msgstr ""
+msgstr "ელ სალვადორი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#, fuzzy
 msgid "Equatorial Guinea"
-msgstr ""
+msgstr "ეკვატორული გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#, fuzzy
 msgid "Eritrea"
-msgstr ""
+msgstr "ერითრეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#, fuzzy
 msgid "Estonia"
-msgstr ""
+msgstr "ესტონეტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#, fuzzy
 msgid "Ethiopia"
-msgstr ""
+msgstr "ეთიოპია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
@@ -1751,27 +1854,27 @@ msgid "France"
 msgstr "საფრანგეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-#, fuzzy
 msgid "French Guiana"
 msgstr "ფრანგული გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-#, fuzzy
 msgid "French Polynesia"
 msgstr "ფრანგული პოლინეზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 #, fuzzy
 msgid "French Southern Territories"
-msgstr "ფრანგული"
+msgstr "სამხრეთ·ფრანგული·ტერიტორიები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#, fuzzy
 msgid "Gabon"
-msgstr ""
+msgstr "გაბონი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#, fuzzy
 msgid "Gambia"
-msgstr ""
+msgstr "გამბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
@@ -1782,76 +1885,90 @@ msgid "Germany"
 msgstr "გერმანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#, fuzzy
 msgid "Ghana"
-msgstr ""
+msgstr "განა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#, fuzzy
 msgid "Gibraltar"
-msgstr ""
+msgstr "გიბრალტარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greece"
 msgstr "საბერძნეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#, fuzzy
 msgid "Greenland"
-msgstr ""
+msgstr "გრენლანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#, fuzzy
 msgid "Grenada"
-msgstr ""
+msgstr "გრენადა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#, fuzzy
 msgid "Guadeloupe"
-msgstr ""
+msgstr "გუადელუპე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#, fuzzy
 msgid "Guam"
-msgstr ""
+msgstr "გუამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#, fuzzy
 msgid "Guatemala"
-msgstr ""
+msgstr "გუატემალა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guernsey"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#, fuzzy
 msgid "Guinea"
-msgstr ""
+msgstr "გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#, fuzzy
 msgid "Guinea-bissau"
-msgstr ""
+msgstr "გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#, fuzzy
 msgid "Guyana"
-msgstr ""
+msgstr "გვიანა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#, fuzzy
 msgid "Haiti"
-msgstr ""
+msgstr "ჰაიტი"
 
 #: ../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:232
+#, fuzzy
 msgid "Holy See"
-msgstr ""
+msgstr "წმინდა ზღვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#, fuzzy
 msgid "Honduras"
-msgstr ""
+msgstr "ჰონდურასი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hong Kong"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#, fuzzy
 msgid "Hungary"
-msgstr ""
+msgstr "უნგრეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Iceland"
@@ -1862,24 +1979,28 @@ msgid "India"
 msgstr "ინდოეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
 msgid "Indonesia"
-msgstr ""
+msgstr "ინდონეზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
 msgid "Iran"
 msgstr "ირანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#, fuzzy
 msgid "Iraq"
-msgstr ""
+msgstr "ერაყი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#, fuzzy
 msgid "Ireland"
-msgstr ""
+msgstr "ირლანდია"
 
 #: ../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:243
 msgid "Israel"
@@ -1898,263 +2019,313 @@ msgid "Japan"
 msgstr "იაპონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#, fuzzy
 msgid "Jersey"
-msgstr ""
+msgstr "ჯერსი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#, fuzzy
 msgid "Jordan"
-msgstr ""
+msgstr "იორდანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#, fuzzy
 msgid "Kazakhstan"
-msgstr ""
+msgstr "ყაზახეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#, fuzzy
 msgid "Kenya"
-msgstr ""
+msgstr "კენია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
 msgid "Kiribati"
-msgstr ""
+msgstr "კირიბატი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#, fuzzy
 msgid "Korea, Democratic People's Republic Of"
-msgstr ""
+msgstr "ხალხი წმ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Korea, Republic Of"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#, fuzzy
 msgid "Kuwait"
-msgstr ""
+msgstr "ქუვეითი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#, fuzzy
 msgid "Kyrgyzstan"
-msgstr ""
+msgstr "ყირგიზეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Laos"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#, fuzzy
 msgid "Latvia"
-msgstr ""
+msgstr "ლატვია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#, fuzzy
 msgid "Lebanon"
-msgstr ""
+msgstr "ლიბანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#, fuzzy
 msgid "Lesotho"
-msgstr ""
+msgstr "ლესოტო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#, fuzzy
 msgid "Liberia"
-msgstr ""
+msgstr "ლიბერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
 msgstr "ლიბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#, fuzzy
 msgid "Liechtenstein"
-msgstr ""
+msgstr "ლიხტენშტეინი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#, fuzzy
 msgid "Lithuania"
-msgstr ""
+msgstr "ლიტვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
 msgid "Luxembourg"
-msgstr ""
+msgstr "ლუქსემბურგი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macao"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#, fuzzy
 msgid "Macedonia"
-msgstr ""
+msgstr "მაკედონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#, fuzzy
 msgid "Madagascar"
-msgstr ""
+msgstr "მადაგასკარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#, fuzzy
 msgid "Malawi"
-msgstr ""
+msgstr "მალავი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#, fuzzy
 msgid "Malaysia"
-msgstr ""
+msgstr "მალაზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#, fuzzy
 msgid "Maldives"
-msgstr ""
+msgstr "მალდივები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#, fuzzy
 msgid "Mali"
-msgstr ""
+msgstr "მალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#, fuzzy
 msgid "Malta"
-msgstr ""
+msgstr "მალტა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#, fuzzy
 msgid "Marshall Islands"
-msgstr ""
+msgstr "მარშალის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#, fuzzy
 msgid "Martinique"
-msgstr ""
+msgstr "მარტინიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#, fuzzy
 msgid "Mauritania"
-msgstr ""
+msgstr "მავრიტანია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#, fuzzy
 msgid "Mauritius"
-msgstr ""
+msgstr "მავრიკის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#, fuzzy
 msgid "Mayotte"
-msgstr ""
+msgstr "მაიოტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#, fuzzy
 msgid "Mexico"
-msgstr ""
+msgstr "მექსიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Micronesia"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#, fuzzy
 msgid "Moldova, Republic Of"
-msgstr ""
+msgstr "მოლდოვა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#, fuzzy
 msgid "Monaco"
-msgstr ""
+msgstr "მონაკო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#, fuzzy
 msgid "Mongolia"
-msgstr ""
+msgstr "მონღოლეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#, fuzzy
 msgid "Montserrat"
-msgstr ""
+msgstr "მონსერატტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#, fuzzy
 msgid "Morocco"
-msgstr ""
+msgstr "მოროკო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#, fuzzy
 msgid "Mozambique"
-msgstr ""
+msgstr "მოზამბიკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#, fuzzy
 msgid "Myanmar"
-msgstr ""
+msgstr "მიანმა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#, fuzzy
 msgid "Namibia"
-msgstr ""
+msgstr "ნამიბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#, fuzzy
 msgid "Nauru"
-msgstr ""
+msgstr "ნაურუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#, fuzzy
 msgid "Nepal"
-msgstr ""
+msgstr "ნეპალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#, fuzzy
 msgid "Netherlands"
-msgstr ""
+msgstr "ჰოლანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#, fuzzy
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "ნიდერლანდის ანტილები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#, fuzzy
 msgid "New Caledonia"
 msgstr "ახალი კალედონია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#, fuzzy
 msgid "New Zealand"
 msgstr "ახალი ზელანდია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#, fuzzy
 msgid "Nicaragua"
-msgstr ""
+msgstr "ნიკარაგუა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#, fuzzy
 msgid "Niger"
-msgstr ""
+msgstr "ნიგერი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
 msgstr "ნიგერია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#, fuzzy
 msgid "Niue"
-msgstr ""
+msgstr "ნიუე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#, fuzzy
 msgid "Norfolk Island"
-msgstr ""
+msgstr "ნორფოლკის კუნძული"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#, fuzzy
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "ჩრდილოეთ მარიანის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#, fuzzy
 msgid "Norway"
-msgstr ""
+msgstr "ნორვეგია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#, fuzzy
 msgid "Oman"
-msgstr ""
+msgstr "ომანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#, fuzzy
 msgid "Pakistan"
-msgstr ""
+msgstr "პაკისტანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#, fuzzy
 msgid "Palau"
-msgstr ""
+msgstr "პალაუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#, fuzzy
 msgid "Panama"
-msgstr ""
+msgstr "პანამა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#, fuzzy
 msgid "Papua New Guinea"
 msgstr "პაპუა ახალი გვინეა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#, fuzzy
 msgid "Paraguay"
-msgstr ""
+msgstr "პარაგუაი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "პერუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#, fuzzy
 msgid "Philippines"
-msgstr ""
+msgstr "ფილიპინები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#, fuzzy
 msgid "Pitcairn"
-msgstr ""
+msgstr "პიტკაირნი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Poland"
@@ -2165,110 +2336,127 @@ msgid "Portugal"
 msgstr "პორტუგალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#, fuzzy
 msgid "Puerto Rico"
-msgstr ""
+msgstr "პუერტო რიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#, fuzzy
 msgid "Qatar"
-msgstr ""
+msgstr "ქათარი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#, fuzzy
 msgid "Romania"
-msgstr ""
+msgstr "რუმინეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#, fuzzy
 msgid "Russian Federation"
 msgstr "რუსეთის ფედერაცია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#, fuzzy
 msgid "Rwanda"
-msgstr ""
+msgstr "რუანდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#, fuzzy
 msgid "Saint Kitts And Nevis"
-msgstr ""
+msgstr "ნევისი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#, fuzzy
 msgid "Saint Lucia"
-msgstr ""
+msgstr "წმინდა ლუჩია"
 
 #: ../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:322
+#, fuzzy
 msgid "Samoa"
-msgstr ""
+msgstr "სამოა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#, fuzzy
 msgid "San Marino"
-msgstr ""
+msgstr "სან მარინო"
 
 #: ../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:325
+#, fuzzy
 msgid "Saudi Arabia"
-msgstr ""
+msgstr "საუდიის არაბეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#, fuzzy
 msgid "Senegal"
-msgstr ""
+msgstr "სენეგალი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Serbia And Montenegro"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#, fuzzy
 msgid "Seychelles"
-msgstr ""
+msgstr "სეიშელის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#, fuzzy
 msgid "Sierra Leone"
-msgstr ""
+msgstr "სიერა ლეონი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
 msgstr "სინგაპური"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#, fuzzy
 msgid "Slovakia"
-msgstr ""
+msgstr "სლოვაკეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#, fuzzy
 msgid "Slovenia"
-msgstr ""
+msgstr "სლოვენია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#, fuzzy
 msgid "Solomon Islands"
-msgstr ""
+msgstr "სოლომონის კუნძულები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#, fuzzy
 msgid "Somalia"
-msgstr ""
+msgstr "სომალია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#, fuzzy
 msgid "South Africa"
-msgstr ""
+msgstr "სამხრეთ აფრიკა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 #, fuzzy
 msgid "South Georgia And The South Sandwich Islands"
-msgstr "საქართველო"
+msgstr "საქართველო სენდვიჩი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
 msgstr "ესპანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#, fuzzy
 msgid "Sri Lanka"
-msgstr ""
+msgstr "შრი ლანკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Helena"
@@ -2279,129 +2467,153 @@ msgid "St. Pierre And Miquelon"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#, fuzzy
 msgid "Sudan"
-msgstr ""
+msgstr "სუდანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#, fuzzy
 msgid "Suriname"
-msgstr ""
+msgstr "სურინამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#, fuzzy
 msgid "Svalbard And Jan Mayen Islands"
-msgstr ""
+msgstr "იან"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#, fuzzy
 msgid "Swaziland"
-msgstr ""
+msgstr "სვაზილენდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#, fuzzy
 msgid "Sweden"
-msgstr ""
+msgstr "შვედეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
 msgid "Switzerland"
-msgstr ""
+msgstr "შვეიცარია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Syria"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#, fuzzy
 msgid "Taiwan"
-msgstr ""
+msgstr "ტაივანი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#, fuzzy
 msgid "Tajikistan"
-msgstr ""
+msgstr "ტაჯიკეთი"
 
 #: ../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:351
+#, fuzzy
 msgid "Thailand"
-msgstr ""
+msgstr "ტაილანდი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#, fuzzy
 msgid "Timor-Leste"
-msgstr ""
+msgstr "ტიმორ-ლესტე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#, fuzzy
 msgid "Togo"
-msgstr ""
+msgstr "ტოგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#, fuzzy
 msgid "Tokelau"
-msgstr ""
+msgstr "ტოკელაუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#, fuzzy
 msgid "Tonga"
-msgstr ""
+msgstr "ტონგა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#, fuzzy
 msgid "Trinidad And Tobago"
-msgstr ""
+msgstr "თრინიდადი თობაგო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#, fuzzy
 msgid "Tunisia"
-msgstr ""
+msgstr "ტუნიზია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
 msgstr "თურქეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#, fuzzy
 msgid "Turkmenistan"
-msgstr ""
+msgstr "თურქმენეთი"
 
 #: ../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:361
+#, fuzzy
 msgid "Tuvalu"
-msgstr ""
+msgstr "ტუვალუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#, fuzzy
 msgid "Uganda"
-msgstr ""
+msgstr "უგანდა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Ukraine"
 msgstr "უკრაინა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#, fuzzy
 msgid "United Arab Emirates"
-msgstr ""
+msgstr "შეერთებული არაბული ემირატები"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-#, fuzzy
 msgid "United Kingdom"
 msgstr "დიდი ბრიტანეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#, fuzzy
 msgid "United States Minor Outlying Islands"
-msgstr ""
+msgstr "მცირე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#, fuzzy
 msgid "Uruguay"
-msgstr ""
+msgstr "ურუგვაი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#, fuzzy
 msgid "Uzbekistan"
-msgstr ""
+msgstr "უზბეკეთი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#, fuzzy
 msgid "Vanuatu"
-msgstr ""
+msgstr "ვანუატუ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#, fuzzy
 msgid "Venezuela"
-msgstr ""
+msgstr "ვენესუელა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#, fuzzy
 msgid "Viet Nam"
-msgstr ""
+msgstr "ვიეტნამი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
@@ -2417,20 +2629,24 @@ msgid "Wallis And Futuna Islands"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#, fuzzy
 msgid "Western Sahara"
-msgstr ""
+msgstr "დასავლეთ სახარა"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#, fuzzy
 msgid "Yemen"
-msgstr ""
+msgstr "იემენი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#, fuzzy
 msgid "Zambia"
-msgstr ""
+msgstr "ზამბია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
+#, fuzzy
 msgid "Zimbabwe"
-msgstr ""
+msgstr "ზიმბაბვე"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
 #: ../plugins/exchange-operations/exchange-delegates.c:934
@@ -2442,8 +2658,9 @@ msgid "Name"
 msgstr "სახელი"
 
 #: ../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:65
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
@@ -2454,7 +2671,7 @@ msgstr "Jabber"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "Yahoo Messenger"
-msgstr "Yahoo"
+msgstr "Yahoo შიკრიკი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
@@ -2468,7 +2685,7 @@ msgstr "სერვისი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "ადგილმდებარეობა"
@@ -2503,8 +2720,9 @@ msgid "GroupWise"
 msgstr ""
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#, fuzzy
 msgid "Source Book"
-msgstr ""
+msgstr "წყარო"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:267
 msgid "Target Book"
@@ -2516,12 +2734,14 @@ msgid "Is New Contact"
 msgstr "ახალი კონტაქტი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#, fuzzy
 msgid "Writable Fields"
-msgstr ""
+msgstr "ჩაწერადი"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#, fuzzy
 msgid "Required Fields"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:309
 msgid "Changed"
@@ -2531,25 +2751,26 @@ msgstr ""
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, fuzzy, c-format
 msgid "Contact Editor - %s"
-msgstr "კონტაქტი რედაქტორი"
+msgstr "კონტაქტი რედაქტორი წმ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#, fuzzy
 msgid "Please select an image for this contact"
-msgstr ""
+msgstr "ნახატი"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 #, fuzzy
 msgid "No image"
-msgstr "არა"
+msgstr "არა ნახატი"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "n n"
+msgstr "მცდარი არა არა"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 #, fuzzy
 msgid "Invalid contact."
 msgstr "არასწორი."
@@ -2560,50 +2781,52 @@ msgid "Contact Quick-Add"
 msgstr "კონტაქტი დამატება"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
-#, fuzzy
 msgid "_Edit Full"
-msgstr "რედაქტირება სრული"
+msgstr "სრული _რედაქტირება"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 #, fuzzy
 msgid "_Full name"
-msgstr "სრული"
+msgstr "სრული სახელი"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
-#, fuzzy
 msgid "E-_mail"
-msgstr "E"
+msgstr "ელ-_ფოსტა"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 #, fuzzy
 msgid "_Select Address Book"
-msgstr "მისამართი"
+msgstr "ამორჩევა მისამართი"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
-msgstr ""
+msgstr "წაშლა სია წმ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
-msgstr ""
+msgstr "წაშლა წმ?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
+#, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2614,19 +2837,20 @@ msgid "Ci_ty:"
 msgstr "_ქალაქი:"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
+#, fuzzy
 msgid "Countr_y:"
-msgstr ""
+msgstr "y:"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Full Address"
 msgstr "სრული მისამართი"
 
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:9
+#, fuzzy
 msgid "_ZIP Code:"
-msgstr ""
+msgstr "კოდი:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:2
-#, fuzzy
 msgid "Dr."
 msgstr "დრ."
 
@@ -2652,7 +2876,6 @@ msgid "III"
 msgstr "III"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:8
-#, fuzzy
 msgid "Jr."
 msgstr "უმც."
 
@@ -2677,12 +2900,14 @@ msgid "Sr."
 msgstr "უფრ."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#, fuzzy
 msgid "_First:"
-msgstr ""
+msgstr "პირველი:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#, fuzzy
 msgid "_Last:"
-msgstr ""
+msgstr "ბოლო:"
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
@@ -2720,7 +2945,7 @@ msgstr "\n"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #, fuzzy
 msgid "Add an email to the List"
-msgstr "დამატება -სკენ სია"
+msgstr "დამატება ელფოსტა -სკენ სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
@@ -2731,7 +2956,7 @@ msgstr "კონტაქტი სია რედაქტორი"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
 msgid "Insert email addresses from Address Book"
-msgstr "მისამართი"
+msgstr "ჩამატება ელფოსტა მისამართი"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Members"
@@ -2740,26 +2965,27 @@ msgstr "წევრები"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "Remove an email address from the List"
-msgstr "წაშლა სია"
+msgstr "ამოშლა ელფოსტა სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 #, fuzzy
 msgid "_Hide addresses when sending mail to this list"
-msgstr "-სკენ"
+msgstr "დამალვა ფოსტა -სკენ სია"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
-msgstr "სია:"
+msgstr "სია სახელი:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#, fuzzy
 msgid "_Select"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "ტიპი a:"
+msgstr "ტიპი ელფოსტა ან a სია:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
@@ -2797,14 +3023,14 @@ msgstr "კონტაქტი:"
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 #, fuzzy
 msgid "Duplicate Contact Detected"
-msgstr "კონტაქტი"
+msgstr "დუბლირება კონტაქტი"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
-msgstr "-სკენ?"
+msgstr "ელფოსტა ან სახელი - - -სკენ დამატება?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2813,21 +3039,22 @@ msgstr "ახალი კონტაქტი:"
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 #, fuzzy
 msgid "Original Contact:"
-msgstr "კონტაქტი:"
+msgstr "ორიგინალი კონტაქტი:"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 #, fuzzy
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
-msgstr "-სკენ?"
+msgstr "სახელი ან ელფოსტა - -სკენ დამატება?"
 
 #. We attach subitems below
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:172
 #: ../calendar/gui/cal-search-bar.c:53
+#, fuzzy
 msgid "Any field contains"
-msgstr ""
+msgstr "ნებისმიერი ველი შეიცავს"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../addressbook/gui/widgets/e-addressbook-view.c:171
@@ -2840,7 +3067,7 @@ msgstr "კატეგორია"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 #, fuzzy
 msgid "Email begins with"
-msgstr "Email"
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
@@ -2849,22 +3076,23 @@ msgid "Name begins with"
 msgstr "სახელი"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
 msgid "No contacts"
-msgstr ""
+msgstr "არა"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] ""
+msgstr ""
 
 #: ../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-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
+#, fuzzy
 msgid "Query"
-msgstr ""
+msgstr "გამოკითხვა"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:446
 #, fuzzy
@@ -2887,13 +3115,14 @@ msgid "Error modifying card"
 msgstr "შეცდომა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:230
+#, fuzzy
 msgid "Source"
-msgstr ""
+msgstr "წყარო"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2907,7 +3136,7 @@ msgid "Save as VCard..."
 msgstr "შენახვა."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2915,9 +3144,8 @@ msgid "_Open"
 msgstr "_გახსნა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#, fuzzy
 msgid "_New Contact..."
-msgstr "ახალი კონტაქტი."
+msgstr "ახალი _კონტაქტი..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:960
 #, fuzzy
@@ -2932,12 +3160,12 @@ msgstr "შენახვა."
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #, fuzzy
 msgid "_Forward Contact"
-msgstr "კონტაქტი"
+msgstr "წინ კონტაქტი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:965
 #, fuzzy
 msgid "_Forward Contacts"
-msgstr "წინ"
+msgstr "წინ მეგობრები"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #, fuzzy
@@ -2952,7 +3180,7 @@ msgstr "გაგზავნა შეტყობინება -სკენ
 #: ../addressbook/gui/widgets/e-addressbook-view.c:968
 #, fuzzy
 msgid "Send _Message to Contacts"
-msgstr "გაგზავნა შეტყობინება -სკენ"
+msgstr "გაგზავნა შეტყობინება -სკენ მეგობრები"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
@@ -2961,7 +3189,7 @@ msgstr "_ბეჭდვა"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:972
 #, fuzzy
 msgid "Cop_y to Address Book..."
-msgstr "-სკენ მისამართი."
+msgstr "y -სკენ მისამართი."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:973
 #, fuzzy
@@ -2970,8 +3198,9 @@ msgstr "ორ -სკენ მისამართი."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+#, fuzzy
 msgid "Cu_t"
-msgstr ""
+msgstr "_ამოჭრა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
@@ -2988,16 +3217,14 @@ msgid "_Copy"
 msgstr "_დააკოპირე"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#, fuzzy
 msgid "P_aste"
-msgstr "ჩასმა"
+msgstr "ჩ_ასმა"
 
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1601
 #: ../calendar/gui/cal-search-bar.c:343
-#, fuzzy
 msgid "Any Category"
-msgstr "კატეგორია"
+msgstr "ნებისმიერი კატეგორია"
 
 #. FIXME: Allow range selection in table views, as in minicard view
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1802
@@ -3006,8 +3233,9 @@ msgid "Print cards"
 msgstr "ბეჭდვა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+#, fuzzy
 msgid "Assistant"
-msgstr ""
+msgstr "ასისტენტი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 #, fuzzy
@@ -3017,7 +3245,7 @@ msgstr "ასისტენტი ტელეფონი"
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 #, fuzzy
 msgid "Business Fax"
-msgstr "ფაქსი"
+msgstr "სამუშაო ფაქსი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
@@ -3068,9 +3296,8 @@ msgid "Family Name"
 msgstr "გვარი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-#, fuzzy
 msgid "File As"
-msgstr "ფაილი"
+msgstr "ფაილი როგორც"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 #, fuzzy
@@ -3098,9 +3325,8 @@ msgid "Journal"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#, fuzzy
 msgid "Manager"
-msgstr "მმართველი"
+msgstr "მენეჯერი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #: ../addressbook/gui/widgets/eab-contact-display.c:381
@@ -3117,7 +3343,6 @@ msgid "Note"
 msgstr "შენიშვნა"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#, fuzzy
 msgid "Office"
 msgstr "ოფისი"
 
@@ -3143,12 +3368,13 @@ msgid "Primary Phone"
 msgstr "პირველადი ტელეფონი"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+#, fuzzy
 msgid "Radio"
-msgstr ""
+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:491
+#: ../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"
@@ -3173,7 +3399,6 @@ msgid "Telex"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#, fuzzy
 msgid "Title"
 msgstr "სათაური"
 
@@ -3182,8 +3407,9 @@ msgid "Unit"
 msgstr "ერთეული"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#, fuzzy
 msgid "Web Site"
-msgstr ""
+msgstr "ვები საიტი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
@@ -3223,13 +3449,14 @@ msgid "Has Focus"
 msgstr "ფოკუსი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
 msgid "Field"
-msgstr ""
+msgstr "ველი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:143
 #, fuzzy
 msgid "Field Name"
-msgstr "სახელი"
+msgstr "ველი სახელი"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:150
 #, fuzzy
@@ -3239,12 +3466,12 @@ msgstr "ტექსტი მოდელი"
 #: ../addressbook/gui/widgets/e-minicard-label.c:157
 #, fuzzy
 msgid "Max field name length"
-msgstr "მაქსიმალური"
+msgstr "მაქსიმალური ველი სახელი სიგრძე"
 
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:128
 #, fuzzy
 msgid "Column Width"
-msgstr "სიგანე"
+msgstr "სვეტი სიგანე"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:172
 #, fuzzy
@@ -3254,16 +3481,17 @@ msgid ""
 "Search for the Contact\n"
 "\n"
 "or double-click here to create a new Contact."
-msgstr "n კონტაქტი n double -სკენ a კონტაქტი."
+msgstr "არა კონტაქტი არა ორმაგი -სკენ a ახალი კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:175
+#, fuzzy
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view.\n"
 "\n"
 "Double-click here to create a new Contact."
-msgstr ""
+msgstr "არა არა -სკენ - არა -სკენ a ახალი კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:180
 #, fuzzy
@@ -3271,7 +3499,7 @@ msgid ""
 "\n"
 "\n"
 "Search for the Contact."
-msgstr "n კონტაქტი."
+msgstr "არა კონტაქტი."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 #, fuzzy
@@ -3279,14 +3507,13 @@ msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
-msgstr "n არა -სკენ."
+msgstr "არა არა -სკენ -."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:499
 msgid "Adapter"
 msgstr ""
 
 #: ../addressbook/gui/widgets/e-minicard.c:161
-#, fuzzy
 msgid "Selected"
 msgstr "მონიშნულია"
 
@@ -3307,17 +3534,16 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:276
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
-#, fuzzy
 msgid "List Members"
-msgstr "სია წევრები"
+msgstr "წევრების სია"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:339
 #: ../addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
 msgid "E-mail"
-msgstr ""
+msgstr "ელფოსტა"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:363
-#, fuzzy
 msgid "Position"
 msgstr "თანამდებობა"
 
@@ -3352,7 +3578,6 @@ msgid "personal"
 msgstr ""
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
-#, fuzzy
 msgid "Job Title"
 msgstr "პროფესია"
 
@@ -3376,19 +3601,19 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Repository offline"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "ხაზიდან გასვლა"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "Address Book does not exist"
-msgstr "მისამართი"
+msgstr "მისამართი არა"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../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
@@ -3402,7 +3627,7 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact not found"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი არა"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
 #: ../addressbook/gui/widgets/eab-gui-util.c:60
@@ -3414,7 +3639,7 @@ msgstr "კონტაქტი ID"
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Protocol not supported"
-msgstr "პროტოკოლი"
+msgstr "პროტოკოლი არა"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
@@ -3423,33 +3648,33 @@ msgstr "პროტოკოლი"
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
-#, fuzzy
 msgid "Canceled"
-msgstr "გაუქმებულია"
+msgstr "გაუქმებული"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
 msgid "Could not cancel"
-msgstr ""
+msgstr "არა გაუქმება"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../calendar/gui/comp-editor-factory.c:433
 #, fuzzy
 msgid "Authentication Failed"
-msgstr "აუთენტიფიკაცია ოპერაცია ვერ/არ ჩატარდა"
+msgstr "აუთენტიფიკაცია ვერ განხორციელდა"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 #, fuzzy
 msgid "Authentication Required"
-msgstr "აუთენტიფიკაცია"
+msgstr "აუთენტიფიკაცია აუცილებელია"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "TLS not Available"
-msgstr "მისაწვდომია"
+msgstr "TLS არა ხელმისაწვდომი"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
@@ -3462,7 +3687,7 @@ msgstr "არა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:69
 #, fuzzy
 msgid "Not available in offline mode"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "- ხაზიდან გასვლა რეჟიმი"
 
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
@@ -3474,7 +3699,7 @@ msgstr "სხვა შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:71
 #, fuzzy
 msgid "Invalid server version"
-msgstr "არასწორი ვერსია"
+msgstr "არასწორი"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:94
 #, fuzzy
@@ -3482,21 +3707,22 @@ 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 "ოთ -სკენ კავშირგარეშე რეჟიმი კავშირგარეშე რეჟიმი -სკენ"
+msgstr "ოთ -სკენ გახსნა წიგნაკი არა ხაზიდან გასვლა ან არა ხაზიდან გასვლა წიგნაკი - ხაზზე რეჟიმი -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
-msgstr ""
+msgstr "ოთ -სკენ გახსნა წიგნაკი წმ და -სკენ."
 
 #: ../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 "ოთ -სკენ URI LDAP."
+msgstr "ოთ -სკენ გახსნა წიგნაკი URI ან LDAP."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 #, fuzzy
@@ -3504,14 +3730,14 @@ 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 "ვერსია Evolution LDAP სუპორტი -სკენ -სკენ LDAP Evolution LDAP ჩართული Evolution."
+msgstr "- Evolution არა LDAP სუპორტი - -სკენ -სკენ LDAP - Evolution LDAP ჩართული Evolution."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
-msgstr "ოთ -სკენ URI."
+msgstr "ოთ -სკენ გახსნა წიგნაკი URI ან."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
 #, fuzzy
@@ -3520,7 +3746,7 @@ msgid ""
 "configured to return or Evolution is configured to display.\n"
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
-msgstr "მეტი -სკენ Evolution -სკენ დირექტორია."
+msgstr "მეტი -სკენ ან Evolution -სკენ ძიება მეტი ან - პარამეტრები წიგნაკი."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
 #, fuzzy
@@ -3529,26 +3755,27 @@ msgid ""
 "you have configured for this addressbook.  Please make your search\n"
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
-msgstr "-სკენ დირექტორია."
+msgstr "-სკენ შესრულება ან წიგნაკი ძიება ან - წიგნაკი."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:159
 #, fuzzy
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "-სკენ."
+msgstr "წიგნაკი -სკენ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:162
 #, fuzzy
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "-სკენ."
+msgstr "წიგნაკი -სკენ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:165
+#, fuzzy
 msgid "This query did not complete successfully."
-msgstr ""
+msgstr "არა."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #, fuzzy
 msgid "Error adding list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #: ../addressbook/gui/widgets/eab-gui-util.c:695
@@ -3559,7 +3786,7 @@ msgstr "შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 #, fuzzy
 msgid "Error modifying list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 #, fuzzy
@@ -3569,7 +3796,7 @@ msgstr "შეცდომა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #, fuzzy
 msgid "Error removing list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #: ../addressbook/gui/widgets/eab-gui-util.c:650
@@ -3582,17 +3809,17 @@ msgstr "შეცდომა"
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
 "Do you really want to display this contact?"
-msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
-msgstr[0] "-სკენ?"
+msgstr "გახსნა ახალი ფანჯარა -სკენ გახსნა ახალი -სკენ ყველა -?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
 #, c-format
+#, fuzzy
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
-msgstr ""
+msgstr "წმ -სკენ?"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:325
 #, fuzzy
@@ -3605,8 +3832,7 @@ msgstr "გადაწერა"
 #: ../addressbook/gui/widgets/eab-gui-util.c:370
 #: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
-msgid_plural "contacts"
-msgstr[0] ""
+msgstr ""
 
 #. This is a filename. Translators take note.
 #: ../addressbook/gui/widgets/eab-gui-util.c:420
@@ -3616,15 +3842,17 @@ msgstr ""
 #: ../addressbook/gui/widgets/eab-gui-util.c:457
 #, fuzzy
 msgid "Select Address Book"
-msgstr "მისამართი"
+msgstr "ამორჩევა მისამართი"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:596
+#, fuzzy
 msgid "list"
-msgstr ""
+msgstr "სია"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:756
+#, fuzzy
 msgid "Move contact to"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:758
 #, fuzzy
@@ -3632,8 +3860,9 @@ msgid "Copy contact to"
 msgstr "დააკოპირე -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:761
+#, fuzzy
 msgid "Move contacts to"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:763
 #, fuzzy
@@ -3646,8 +3875,9 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
+#, fuzzy
 msgid "VCard for %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:1033
 #: ../addressbook/gui/widgets/eab-gui-util.c:1051
@@ -3658,7 +3888,7 @@ msgstr "კონტაქტი"
 #: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, fuzzy, c-format
 msgid "Contact information for %s"
-msgstr "კონტაქტი"
+msgstr "კონტაქტი წმ"
 
 #: ../addressbook/gui/widgets/eab-popup-control.c:287
 #, fuzzy
@@ -3667,67 +3897,71 @@ msgstr "მისამართი."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
+#, fuzzy
 msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] ""
+msgstr "სხვა."
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:223
 #: ../addressbook/gui/widgets/eab-vcard-control.c:272
 #, fuzzy
 msgid "Show Full VCard"
-msgstr "ანახე სრული"
+msgstr "ჩვენება სრული"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
 #, fuzzy
 msgid "Show Compact VCard"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../addressbook/gui/widgets/eab-vcard-control.c:277
 #, fuzzy
 msgid "Save in addressbook"
-msgstr "შენახვა"
+msgstr "შენახვა - წიგნაკი"
 
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 #, fuzzy
 msgid "Card View"
-msgstr "კარტი ხედი"
+msgstr "ბარათი ჩვენება"
 
 #: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 #, fuzzy
 msgid "GTK Tree View"
-msgstr "განშტოება ხედი"
+msgstr "განშტოება ჩვენება"
 
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
-#, fuzzy
 msgid "Importing..."
-msgstr "იმპორტი...."
+msgstr "იმპორტი..."
 
 #: ../addressbook/importers/evolution-csv-importer.c:826
+#, fuzzy
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Outlook CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:827
 #, fuzzy
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook და"
+msgstr "Outlook CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:835
+#, fuzzy
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "მოზილა CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:836
+#, fuzzy
 msgid "Mozilla CSV and Tab Importer"
-msgstr ""
+msgstr "მოზილა CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:844
+#, fuzzy
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr ""
+msgstr "Evolution CSV ან ჩანართი"
 
 #: ../addressbook/importers/evolution-csv-importer.c:845
+#, fuzzy
 msgid "Evolution CSV and Tab Importer"
-msgstr ""
+msgstr "Evolution CSV და ჩანართი"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
@@ -3736,21 +3970,21 @@ msgstr ""
 msgid "Importing ..."
 msgstr ""
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 #, fuzzy
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP მონაცემი ფორმატი"
+msgstr "LDAP მონაცემები ფორმატი"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 #, fuzzy
 msgid "Evolution LDIF importer"
 msgstr "Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 #, fuzzy
 msgid "Evolution VCard Importer"
 msgstr "Evolution"
@@ -3781,12 +4015,14 @@ msgid "8 pt. Tahoma"
 msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:3
+#, fuzzy
 msgid "Blank forms at end:"
-msgstr ""
+msgstr "სუფთა ფურცელი ფორმები ეთ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:4
+#, fuzzy
 msgid "Body"
-msgstr ""
+msgstr "ტანი"
 
 #: ../addressbook/printing/e-contact-print.glade.h:5
 #, fuzzy
@@ -3798,19 +4034,20 @@ msgid "Dimensions:"
 msgstr "განზომილებები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:7
+#, fuzzy
 msgid "F_ont..."
-msgstr ""
+msgstr "F."
 
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "შრიფტები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:9
+#, fuzzy
 msgid "Footer:"
-msgstr ""
+msgstr "ქვედა კოლონტიტული:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:10
-#, fuzzy
 msgid "Format"
 msgstr "ფორმატი"
 
@@ -3821,20 +4058,24 @@ msgstr "ფორმატი"
 #: ../widgets/table/e-table-field-chooser.c:91
 #: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
+#, fuzzy
 msgid "Header"
-msgstr ""
+msgstr "ზედა კოლონტიტული"
 
 #: ../addressbook/printing/e-contact-print.glade.h:12
+#, fuzzy
 msgid "Header/Footer"
-msgstr ""
+msgstr "ზედა კოლონტიტული ქვედა კოლონტიტული"
 
 #: ../addressbook/printing/e-contact-print.glade.h:13
+#, fuzzy
 msgid "Headings"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:14
+#, fuzzy
 msgid "Headings for each letter"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
@@ -3843,14 +4084,13 @@ msgstr "სიმაღლე:"
 #: ../addressbook/printing/e-contact-print.glade.h:16
 #, fuzzy
 msgid "Immediately follow each other"
-msgstr "მაშინვე"
+msgstr "მაშინვე სხვა"
 
 #: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr ""
 
 #: ../addressbook/printing/e-contact-print.glade.h:18
-#, fuzzy
 msgid "Landscape"
 msgstr "პეიზაჟი"
 
@@ -3859,15 +4099,16 @@ msgid "Left:"
 msgstr "მარცნივ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:20
+#, fuzzy
 msgid "Letter tabs on side"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../addressbook/printing/e-contact-print.glade.h:21
+#, fuzzy
 msgid "Margins"
-msgstr ""
+msgstr "მინდვრები"
 
 #: ../addressbook/printing/e-contact-print.glade.h:22
-#, fuzzy
 msgid "Number of columns:"
 msgstr "სვეტების რაოდენობა:"
 
@@ -3887,7 +4128,7 @@ msgstr "გვერდი"
 #: ../addressbook/printing/e-contact-print.glade.h:26
 #, fuzzy
 msgid "Page Setup:"
-msgstr "გვერდი ინსტალაცია:"
+msgstr "გვერდი პარამეტრები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
@@ -3911,16 +4152,18 @@ msgid "Print using gray shading"
 msgstr "ბეჭდვა"
 
 #: ../addressbook/printing/e-contact-print.glade.h:32
+#, fuzzy
 msgid "Reverse on even pages"
-msgstr ""
+msgstr "პირიქით ჩართულია"
 
 #: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "მარჯვნივ:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:34
+#, fuzzy
 msgid "Sections:"
-msgstr ""
+msgstr "სექციები:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:35
 #, fuzzy
@@ -3938,12 +4181,12 @@ msgstr "ზომა:"
 #: ../addressbook/printing/e-contact-print.glade.h:37
 #, fuzzy
 msgid "Start on a new page"
-msgstr "გაშვება a"
+msgstr "გაშვება ჩართულია a ახალი პანელი"
 
 #: ../addressbook/printing/e-contact-print.glade.h:38
 #, fuzzy
 msgid "Style name:"
-msgstr "სტილი:"
+msgstr "სტილი სახელი:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
@@ -3969,13 +4212,13 @@ msgstr "კონტაქტი ბეჭდვა სტილი რედა
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
-#, fuzzy
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "საავტორო უფლებები C."
+msgstr "საავტორო უფლებები (C)·2000,·Ximian,·Inc."
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
+#, fuzzy
 msgid "This should test the contact print style editor widget"
-msgstr ""
+msgstr "ბეჭდვა"
 
 #: ../addressbook/printing/test-print.c:52
 #, fuzzy
@@ -3983,26 +4226,31 @@ msgid "Contact Print Test"
 msgstr "კონტაქტი ბეჭდვა ტესტი"
 
 #: ../addressbook/printing/test-print.c:55
+#, fuzzy
 msgid "This should test the contact print code"
-msgstr ""
+msgstr "ბეჭდვა"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#, fuzzy
 msgid "Can not open file"
-msgstr ""
+msgstr "არა გახსნა ფაილი"
 
 #: ../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:72
+#, fuzzy
 msgid "failed to open book"
-msgstr ""
+msgstr "-სკენ გახსნა"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:56
+#, fuzzy
 msgid "Specify the output file instead of standard output"
-msgstr ""
+msgstr "ფაილი -"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "OUTPUTFILE"
@@ -4011,12 +4259,12 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:58
 #, fuzzy
 msgid "List local addressbook folders"
-msgstr "სია"
+msgstr "სია წიგნაკი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 #, fuzzy
 msgid "Show cards as vcard or csv file"
-msgstr "ანახე"
+msgstr "ჩვენება ან ფაილი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
@@ -4025,12 +4273,12 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 #, fuzzy
 msgid "Export in asynchronous mode"
-msgstr "ექსპორტი"
+msgstr "ექსპორტი - რეჟიმი"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 #, fuzzy
 msgid "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "რიცხვი ნაგულისხმევი სიდიდე."
+msgstr "რიცხვი - - ფაილი - რეჟიმი ნაგულისხმები."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -4039,21 +4287,22 @@ msgstr ""
 #: ../addressbook/tools/evolution-addressbook-export.c:91
 #, fuzzy
 msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "ბრძანება ხაზი შეცდომა -სკენ."
+msgstr "ბრძანება ხაზი შეცდომა დახმარება -სკენ."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
 #, fuzzy
 msgid "Only support csv or vcard format."
-msgstr "მხოლოდ სუპორტი."
+msgstr "მხოლოდ სუპორტი ან."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:114
+#, fuzzy
 msgid "In async mode, output must be file."
-msgstr ""
+msgstr "რეჟიმი ფაილი."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:122
 #, fuzzy
 msgid "In normal mode, there is no need for the size option."
-msgstr "არა სიდიდე."
+msgstr "საშუალო რეჟიმი არა."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:153
 #, fuzzy
@@ -4063,161 +4312,188 @@ msgstr "შეცდომა"
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
-msgstr "შეცდომა ნაგულისხმევი."
+msgstr "შეცდომა ნაგულისხმები წიგნაკი."
 
 #: ../addressbook/tools/evolution-addressbook-import.c:67
 #, fuzzy
 msgid "Input File"
-msgstr "შესავალი ფაილი"
+msgstr "შეყვანა ფაილი"
 
 #: ../addressbook/tools/evolution-addressbook-import.c:82
+#, fuzzy
 msgid "No filename provided."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/calendar.error.xml.h:1
+#, fuzzy
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
 "idea of what your appointment is about."
-msgstr ""
+msgstr "a -სკენ - შესახებ."
 
 #: ../calendar/calendar.error.xml.h:2
+#, fuzzy
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr ""
+msgstr "a -სკენ დრო - დრო შესახებ."
 
 #: ../calendar/calendar.error.xml.h:3
+#, fuzzy
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა - და არა."
 
 #: ../calendar/calendar.error.xml.h:4
+#, fuzzy
 msgid "All information in this journal will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა - და არა."
 
 #: ../calendar/calendar.error.xml.h:5
+#, fuzzy
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:6
+#, fuzzy
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია ამოცანები და არა."
 
 #: ../calendar/calendar.error.xml.h:7
+#, fuzzy
 msgid "All information on this appointment will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:8
+#, fuzzy
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "ყველა ჩართულია ელემენტი და არა."
 
 #: ../calendar/calendar.error.xml.h:9
+#, fuzzy
 msgid "All information on this meeting will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია და არა."
 
 #: ../calendar/calendar.error.xml.h:10
+#, fuzzy
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
+msgstr "ყველა ჩართულია დრო და არა."
 
 #: ../calendar/calendar.error.xml.h:11
+#, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr ""
+msgstr "-სკენ წაშლა დრო?"
 
 #: ../calendar/calendar.error.xml.h:12
+#, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:13
+#, fuzzy
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr ""
+msgstr "-სკენ წაშლა ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:14
+#, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:15
+#, fuzzy
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:16
+#, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr ""
+msgstr "-სკენ წაშლა ამოცანები?"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
 msgid "Are you sure you want to delete this appointment?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:18
+#, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
-msgstr ""
+msgstr "-სკენ წაშლა ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:19
+#, fuzzy
 msgid "Are you sure you want to delete this meeting?"
-msgstr ""
+msgstr "-სკენ წაშლა?"
 
 #: ../calendar/calendar.error.xml.h:20
+#, fuzzy
 msgid "Are you sure you want to delete this task?"
-msgstr ""
+msgstr "-სკენ წაშლა დრო?"
 
 #: ../calendar/calendar.error.xml.h:21
+#, fuzzy
 msgid "Are you sure you want to send the appointment without a summary?"
-msgstr ""
+msgstr "-სკენ a?"
 
 #: ../calendar/calendar.error.xml.h:22
+#, fuzzy
 msgid "Are you sure you want to send the task without a summary?"
-msgstr ""
+msgstr "-სკენ დრო a?"
 
 #: ../calendar/calendar.error.xml.h:23
 #, fuzzy
 msgid "Cannot create a new event"
-msgstr "a"
+msgstr "a ახალი მოვლენა"
 
 #: ../calendar/calendar.error.xml.h:24
+#, fuzzy
 msgid "Delete calendar '{0}'?"
-msgstr ""
+msgstr "წაშლა კალენდარი?"
 
 #: ../calendar/calendar.error.xml.h:25
+#, fuzzy
 msgid "Delete memo list '{0}'?"
-msgstr ""
+msgstr "წაშლა სია?"
 
 #: ../calendar/calendar.error.xml.h:26
+#, fuzzy
 msgid "Delete task list '{0}'?"
-msgstr ""
+msgstr "წაშლა დრო სია?"
 
 #: ../calendar/calendar.error.xml.h:27
-#, fuzzy
 msgid "Do _not Send"
-msgstr "გაგზავნა"
+msgstr "არ _გააგზავნო"
 
 #: ../calendar/calendar.error.xml.h:28
+#, fuzzy
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ შენახვა?"
 
 #: ../calendar/calendar.error.xml.h:29
+#, fuzzy
 msgid "Download in progress. Do you want to save the task?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ შენახვა დრო?"
 
 #: ../calendar/calendar.error.xml.h:30
 #, fuzzy
 msgid "Editor could not be loaded."
-msgstr "რედაქტორი."
+msgstr "რედაქტორი არა."
 
 #: ../calendar/calendar.error.xml.h:31
 #, fuzzy
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "Email -სკენ და -სკენ მიღება."
+msgstr "ელფოსტა გაგზავნილი -სკენ ყველა და -სკენ მიღება დრო."
 
 #: ../calendar/calendar.error.xml.h:32
 #, fuzzy
 msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Email -სკენ და -სკენ."
+msgstr "ელფოსტა გაგზავნილი -სკენ ყველა და -სკენ."
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
@@ -4226,180 +4502,194 @@ msgstr "შეცდომა კალენდრის ჩატვირთ�
 #: ../calendar/calendar.error.xml.h:34
 #, fuzzy
 msgid "Error loading memo list"
-msgstr "შეცდომა"
+msgstr "შეცდომა სია"
 
 #: ../calendar/calendar.error.xml.h:35
 #, fuzzy
 msgid "Error loading task list"
-msgstr "შეცდომა"
+msgstr "შეცდომა დრო სია"
 
 #: ../calendar/calendar.error.xml.h:36
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the journal has been deleted."
-msgstr "a."
+msgstr "არა a სხვა არა."
 
 #: ../calendar/calendar.error.xml.h:37
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
-msgstr "a."
+msgstr "არა a სხვა არა."
 
 #: ../calendar/calendar.error.xml.h:38
 #, fuzzy
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "a."
+msgstr "არა a სხვა არა დრო."
 
 #: ../calendar/calendar.error.xml.h:39
+#, fuzzy
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
-msgstr ""
+msgstr "გაგზავნა სხვა -სკენ ზემოთ -სკენ თარიღი."
 
 #: ../calendar/calendar.error.xml.h:40
+#, fuzzy
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
-msgstr ""
+msgstr "გაგზავნა სხვა -სკენ დრო ზემოთ -სკენ თარიღი."
 
 #: ../calendar/calendar.error.xml.h:41
+#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
-msgstr ""
+msgstr "ვიმახსოვრებ - -."
 
 #: ../calendar/calendar.error.xml.h:42
+#, fuzzy
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
-msgstr ""
+msgstr "ვიმახსოვრებ დრო - -."
 
 #: ../calendar/calendar.error.xml.h:43
+#, fuzzy
 msgid "Some features may not work properly with your current server."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/calendar.error.xml.h:44
 #, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolution."
+msgstr "Evolution კალენდარი დასრულება."
 
 #: ../calendar/calendar.error.xml.h:45
 #, fuzzy
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr "Evolution."
+msgstr "Evolution ამოცანები დასრულება."
 
 #: ../calendar/calendar.error.xml.h:46
 #, fuzzy
 msgid "The calendar is not marked for offline usage."
-msgstr "კავშირგარეშე რეჟიმი."
+msgstr "კალენდარი არა ხაზიდან გასვლა."
 
 #: ../calendar/calendar.error.xml.h:47
+#, fuzzy
 msgid "The calendar you have selected is read-only"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../calendar/calendar.error.xml.h:48
 #, fuzzy
 msgid "The memo list is not marked for offline usage"
-msgstr "კავშირგარეშე რეჟიმი"
+msgstr "სია არა ხაზიდან გასვლა"
 
 #: ../calendar/calendar.error.xml.h:49
 #, fuzzy
 msgid "The task list is not marked for offline usage."
-msgstr "კავშირგარეშე რეჟიმი."
+msgstr "დრო სია არა ხაზიდან გასვლა."
 
 #: ../calendar/calendar.error.xml.h:50
+#, fuzzy
 msgid "This calendar will be removed permanently."
-msgstr ""
+msgstr "კალენდარი."
 
 #: ../calendar/calendar.error.xml.h:51
+#, fuzzy
 msgid "This memo list will be removed permanently."
-msgstr ""
+msgstr "სია."
 
 #: ../calendar/calendar.error.xml.h:52
+#, fuzzy
 msgid "This task list will be removed permanently."
-msgstr ""
+msgstr "დრო სია."
 
 #: ../calendar/calendar.error.xml.h:53
+#, fuzzy
 msgid "Would you like to save your changes to this appointment?"
-msgstr ""
+msgstr "-სკენ შენახვა -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:54
 #, fuzzy
 msgid "Would you like to save your changes to this memo?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ შენახვა -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:55
+#, fuzzy
 msgid "Would you like to save your changes to this task?"
-msgstr ""
+msgstr "-სკენ შენახვა -სკენ დრო?"
 
 #: ../calendar/calendar.error.xml.h:56
+#, fuzzy
 msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr ""
+msgstr "-სკენ a ელემენტი?"
 
 #: ../calendar/calendar.error.xml.h:57
 #, fuzzy
 msgid "Would you like to send all the participants a cancelation notice?"
-msgstr "-სკენ a?"
+msgstr "-სკენ ყველა a?"
 
 #: ../calendar/calendar.error.xml.h:58
+#, fuzzy
 msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgstr "-სკენ -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:59
 #, fuzzy
 msgid "Would you like to send this task to participants?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ დრო -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:60
+#, fuzzy
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgstr "-სკენ -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:61
 #, fuzzy
 msgid "Would you like to send updated task information to participants?"
-msgstr "-სკენ -სკენ?"
+msgstr "-სკენ დრო -სკენ?"
 
 #: ../calendar/calendar.error.xml.h:62
+#, fuzzy
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
-msgstr ""
+msgstr "თქვენ დაკავშირება -სკენ და Evolution -თვის -სკენ a."
 
 #: ../calendar/calendar.error.xml.h:63
 #, fuzzy
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "თქვენ."
+msgstr "თქვენ არა."
 
 #: ../calendar/calendar.error.xml.h:64
 #, fuzzy
 msgid "You have changed this task, but not yet saved it."
-msgstr "თქვენ."
+msgstr "თქვენ დრო არა."
 
 #: ../calendar/calendar.error.xml.h:65
 #, fuzzy
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "თქვენ -სკენ."
+msgstr "თქვენ -სკენ არა."
 
 #: ../calendar/calendar.error.xml.h:66
 #, fuzzy
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Evolution."
+msgstr "არა Evolution."
 
 #: ../calendar/calendar.error.xml.h:67
 #, fuzzy
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Evolution."
+msgstr "ამოცანები არა Evolution."
 
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
-#, fuzzy
 msgid "_Discard Changes"
-msgstr "უარყოფა"
+msgstr "_ცვლილებების უარყოფა"
 
 #: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
@@ -4407,7 +4697,6 @@ msgid "_Save"
 msgstr "_შენახვა"
 
 #: ../calendar/calendar.error.xml.h:70
-#, fuzzy
 msgid "_Save Changes"
 msgstr "ცვლილებების _შენახვა"
 
@@ -4417,9 +4706,8 @@ msgid "_Send"
 msgstr "_გაგზავნა"
 
 #: ../calendar/calendar.error.xml.h:72
-#, fuzzy
 msgid "_Send Notice"
-msgstr "გაგზავნა შენიშვნა"
+msgstr "_შენიშვნის გაგზავნა"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
@@ -4433,7 +4721,7 @@ msgstr "შეიყვანეთ პაროლი"
 #: ../calendar/conduits/calendar/calendar-conduit.c:255
 #, fuzzy
 msgid "Split Multi-Day Events:"
-msgstr "დღე:"
+msgstr "დღე მოვლენები:"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1432
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
@@ -4441,48 +4729,49 @@ msgstr "დღე:"
 #: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:1032
 #: ../calendar/conduits/todo/todo-conduit.c:1033
+#, fuzzy
 msgid "Could not start evolution-data-server"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
-msgstr "კალენდარი"
+msgstr "არა წმ კალენდარი პროგრამა"
 
 #: ../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 "მისამართი"
+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 "მისამართი"
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/conduits/todo/todo-conduit.c:239
-#, fuzzy
 msgid "Default Priority:"
 msgstr "ნაგულისხმევი პრიორიტეტი:"
 
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
+#, fuzzy
 msgid "Could not read pilot's ToDo application block"
-msgstr ""
+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 "მისამართი"
+msgstr "არა წმ პროგრამა"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:1969
 #, fuzzy
 msgid "Calendar and Tasks"
-msgstr "კალენდარი და დავალებანი"
+msgstr "კალენდარი და ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1291
@@ -4492,12 +4781,12 @@ msgstr "კალენდრები"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 #, fuzzy
 msgid "Configure your timezone, Calendar and Task List here "
-msgstr "კონფიგურირება კალენდარი და სია "
+msgstr "გამართვა კალენდარი და ამოცანა სია "
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 #, fuzzy
 msgid "Evolution Calendar and Tasks"
-msgstr "Evolution კალენდარი და დავალებანი"
+msgstr "Evolution კალენდარი და ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 #, fuzzy
@@ -4512,27 +4801,27 @@ msgstr "Evolution კალენდარი"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Calendar/Task editor"
-msgstr "Evolution კალენდარი"
+msgstr "Evolution კალენდარი ამოცანა"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
 msgid "Evolution's Calendar component"
-msgstr "Evolution კალენდარი"
+msgstr "Evolution წმ კალენდარი"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
 msgid "Evolution's Memos component"
-msgstr "Evolution"
+msgstr "Evolution წმ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 #, fuzzy
 msgid "Evolution's Tasks component"
-msgstr "Evolution დავალებანი"
+msgstr "Evolution წმ ამოცანები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 #, fuzzy
 msgid "Memo_s"
-msgstr "წევრები"
+msgstr "წმ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
 #: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
@@ -4543,7 +4832,7 @@ msgid "Memos"
 msgstr "წევრები"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
@@ -4552,7 +4841,6 @@ msgstr "წევრები"
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-#, fuzzy
 msgid "Tasks"
 msgstr "დავალებანი"
 
@@ -4566,13 +4854,11 @@ msgid "_Tasks"
 msgstr "_დავალებანი"
 
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
 msgid "Evolution Calendar alarm notification service"
-msgstr ""
+msgstr "Evolution კალენდარი"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "წუთი"
@@ -4590,9 +4876,8 @@ msgstr[0] "საათი"
 msgstr[1] "საათი"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
-#, fuzzy
 msgid "Start time"
-msgstr "გაშვება"
+msgstr "დაწყების დრო"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4605,7 +4890,6 @@ msgstr "შეხვედრები"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
-#, fuzzy
 msgid "Location:"
 msgstr "მდებარეობა:"
 
@@ -4633,8 +4917,9 @@ msgid "_Snooze"
 msgstr ""
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
+#, fuzzy
 msgid "location of appointment"
-msgstr ""
+msgstr "-"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1107
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1250
@@ -4646,7 +4931,7 @@ msgstr "არა."
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 #, fuzzy
 msgid "No description available."
-msgstr "აღწერა არ არის"
+msgstr "აღწერილობა მიუწვდომელია."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 #, fuzzy
@@ -4655,8 +4940,9 @@ msgstr "არა."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
+#, fuzzy
 msgid "You have %d alarms"
-msgstr ""
+msgstr "თქვენ"
 
 #. FIXME
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1344
@@ -4665,12 +4951,13 @@ msgid "Warning"
 msgstr "გაფრთხილება"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#, fuzzy
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
-msgstr ""
+msgstr "Evolution არა სუპორტი კალენდარი -სკენ ელფოსტა Evolution საშუალო დიალოგი."
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, fuzzy, c-format
@@ -4682,91 +4969,59 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Evolution კალენდარი -სკენ -სკენ პროგრამა n\n"
-" n -სკენ პროგრამა?"
+"Evolution კალენდარი შესახებ -სკენ -სკენ პროგრამა არა\n"
+" წმ არა -სკენ პროგრამა?"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 #, fuzzy
 msgid "Do not ask me about this program again."
-msgstr "პროგრამა."
+msgstr "არა შესახებ პროგრამა."
 
 #: ../calendar/gui/alarm-notify/notify-main.c:140
+#, fuzzy
 msgid "Could not initialize Bonobo"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
+#, fuzzy
 msgid "Could not create the alarm notify service factory"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/alarm-notify/util.c:41
+#, fuzzy
 msgid "invalid time"
-msgstr ""
-
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, fuzzy, c-format
-msgid "(%ld seconds)"
-msgstr "წამი"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d·%s·%d·%s)"
+msgstr "მცდარი"
 
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d·%s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u წამი"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u წუთი"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u წუთი"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d საათი"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "%u საათი"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d წუთი"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u საათი"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%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
@@ -4776,12 +5031,12 @@ msgstr "კითხვა"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 #, fuzzy
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "ფონი დღეს."
+msgstr "ფონი - ამოცანები დღეს -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 #, fuzzy
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
-msgstr "ფონი."
+msgstr "ფონი - ამოცანები -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 #, fuzzy
@@ -4791,25 +5046,27 @@ msgstr "კალენდრები -სკენ"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
 #, fuzzy
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "ფერი -სკენ სტრიქონი დრო ნაგულისხმევი."
+msgstr "ფერი -სკენ ხაზი - დრო ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 #, fuzzy
 msgid "Color to draw the Marcus Bains line in the Day View."
-msgstr "ფერი -სკენ ხაზი დღე ხედი."
+msgstr "ფერი -სკენ ხაზი - დღე ჩვენება."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#, fuzzy
 msgid "Compress weekends in month view"
-msgstr ""
+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
 #, fuzzy
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr "დღეები და საათი."
+msgstr "დღეები ჩართულია და - საათი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 #, fuzzy
@@ -4829,7 +5086,7 @@ msgstr "ნაგულისხმევი"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 #, fuzzy
 msgid "Free/busy server URLs"
-msgstr "თავისუფალი"
+msgstr "თავისუფალი ვებმისამართები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 #, fuzzy
@@ -4839,17 +5096,17 @@ msgstr "თავისუფალი URL"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 #, fuzzy
 msgid "Hide completed tasks"
-msgstr "დამალვა"
+msgstr "დამალვა დასრულებულია ამოცანები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 #, fuzzy
 msgid "Hide task units"
-msgstr "დამალვა"
+msgstr "დამალვა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 #, fuzzy
 msgid "Hide task value"
-msgstr "დამალვა"
+msgstr "დამალვა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 #, fuzzy
@@ -4859,49 +5116,52 @@ msgstr "ჰორიზონტალური"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 #, fuzzy
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "საათი -სკენ."
+msgstr "საათი ჩართულია - ოთხი საათი -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 #, fuzzy
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "საათი -სკენ."
+msgstr "საათი ჩართულია - ოთხი საათი -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 #, fuzzy
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr "დღე და სამსახური წუთი."
+msgstr "- დღე და სამსახური კვირა - წუთი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#, fuzzy
 msgid "Last alarm time"
-msgstr ""
+msgstr "ბოლო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 #, fuzzy
 msgid "List of server URLs for free/busy publishing."
-msgstr "სია."
+msgstr "სია - ვებმისამართები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 #, fuzzy
 msgid "Marcus Bains Line"
-msgstr "სტრიქონი"
+msgstr "ხაზი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 #, fuzzy
 msgid "Marcus Bains Line Color - Day View"
-msgstr "სტრიქონი ფერი დღე ხედი"
+msgstr "ხაზი ფერი დღე ჩვენება"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 #, fuzzy
 msgid "Marcus Bains Line Color - Time bar"
-msgstr "სტრიქონი ფერი დრო"
+msgstr "ხაზი ფერი დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
 msgid "Minute the workday ends on, 0 to 59."
-msgstr ""
+msgstr "წუთი ჩართულია -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#, fuzzy
 msgid "Minute the workday starts on, 0 to 59."
-msgstr ""
+msgstr "წუთი ჩართულია -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 #, fuzzy
@@ -4916,50 +5176,52 @@ msgstr "თვე ვერტიკალური"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Number of units for determining a default reminder."
-msgstr "a ნაგულისხმევი."
+msgstr "ნომერი - a ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#, fuzzy
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
+msgstr "ნომერი - -სკენ ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#, fuzzy
 msgid "Overdue tasks color"
-msgstr ""
+msgstr "ამოცანები"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr "თანამდებობა ჰორიზონტალური თარიღი და პიქსელი."
+msgstr "პოზიცია - ჰორიზონტალური თარიღი კალენდარი და დრო სია არა - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 #, fuzzy
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "თანამდებობა ჰორიზონტალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ჰორიზონტალური და თარიღი კალენდარი და დრო სია - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
-msgstr "თანამდებობა ვერტიკალური და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური დრო სია და დრო - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 #, fuzzy
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr "თანამდებობა ვერტიკალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და თარიღი კალენდარი და დრო სია - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 #, fuzzy
 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 "თანამდებობა ვერტიკალური და თარიღი და პიქსელი."
+msgstr "პოზიცია - ვერტიკალური და თარიღი კალენდარი და დრო სია არა - თვე - პიქსელი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 #, fuzzy
@@ -4967,87 +5229,96 @@ msgid "Programs that are allowed to be run by alarms."
 msgstr "პროგრამები -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#, fuzzy
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება RSVP ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#, fuzzy
 msgid "Show Role field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება როლი ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 #, fuzzy
 msgid "Show appointment end times in week and month views"
-msgstr "ანახე და"
+msgstr "ჩვენება - კვირა და თვე"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#, fuzzy
 msgid "Show categories field in the event/meeting/task editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 #, fuzzy
 msgid "Show display alarms in notification tray"
-msgstr "ანახე"
+msgstr "ჩვენება -"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#, fuzzy
 msgid "Show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 #: ../mail/evolution-mail.schemas.in.in.h:73
 #, fuzzy
 msgid "Show the \"Preview\" pane"
-msgstr "ანახე წინასწარ ნახვა"
+msgstr "ჩვენება წინასწარ ნახვა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
 #: ../mail/evolution-mail.schemas.in.in.h:74
 #, fuzzy
 msgid "Show the \"Preview\" pane."
-msgstr "ანახე წინასწარ ნახვა."
+msgstr "ჩვენება წინასწარ ნახვა."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#, fuzzy
 msgid "Show timezone field in the event/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#, fuzzy
 msgid "Show type field in the event/task/meeting editor"
-msgstr ""
+msgstr "ჩვენება ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 #, fuzzy
 msgid "Show week numbers in date navigator"
-msgstr "ანახე თარიღი"
+msgstr "ჩვენება კვირა - თარიღი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 #, fuzzy
 msgid "Tasks due today color"
-msgstr "დავალებანი დღეს"
+msgstr "ამოცანები დღეს"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 #, fuzzy
 msgid "Tasks vertical pane position"
-msgstr "დავალებანი ვერტიკალური"
+msgstr "ამოცანები ვერტიკალური"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
+#, fuzzy
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
-msgstr ""
+msgstr "URL -სკენ a u - ფოსტა და."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 #, fuzzy
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "ნაგულისხმევი -სკენ და ახალი."
+msgstr "ნაგულისხმები -სკენ და - კალენდარი ახალი იორქი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#, fuzzy
 msgid "Time divisions"
-msgstr ""
+msgstr "დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#, fuzzy
 msgid "Time the last alarm ran, in time_t."
-msgstr ""
+msgstr "დრო -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
@@ -5056,102 +5327,109 @@ msgstr "დროის ზონა"
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 #, fuzzy
 msgid "Twenty four hour time format"
-msgstr "საათი"
+msgstr "ოთხი საათი"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 #, fuzzy
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr "ერთეული a ნაგულისხმევი წუთი საათი დღე."
+msgstr "ერთეული a ნაგულისხმები წუთი საათი ან დღე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 #, fuzzy
 msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "ერთეული -სკენ წუთი საათი დღე."
+msgstr "ერთეული -სკენ ამოცანები წუთი საათი ან დღე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#, fuzzy
 msgid "Week start"
-msgstr ""
+msgstr "კვირა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 #, fuzzy
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
-msgstr "კვირა -სკენ შაბათი."
+msgstr "კვირა ჩართულია კვირა -სკენ შაბათი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 #, fuzzy
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "-სკენ."
+msgstr "ან არა -სკენ."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 #, fuzzy
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr "-სკენ."
+msgstr "-სკენ ან დრო."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 #, fuzzy
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
-msgstr "-სკენ და."
+msgstr "-სკენ და ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 #, fuzzy
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
-msgstr "-სკენ შაბათი და კვირა."
+msgstr "-სკენ - თვე შაბათი და კვირა - -."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 #, fuzzy
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "-სკენ და."
+msgstr "-სკენ - - კვირა და თვე."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#, fuzzy
 msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr ""
+msgstr "-სკენ ხაზი ხაზი ეთ - კალენდარი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#, fuzzy
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
+msgstr "-სკენ დასრულებულია ამოცანები - ამოცანები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 #, fuzzy
 msgid "Whether to set a default reminder for appointments."
-msgstr "-სკენ a ნაგულისხმევი."
+msgstr "-სკენ a ნაგულისხმები."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#, fuzzy
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ RSVP ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 #, fuzzy
 msgid "Whether to show categories field in the event/meeting editor"
-msgstr "-სკენ"
+msgstr "-სკენ ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#, fuzzy
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#, fuzzy
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#, fuzzy
 msgid "Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
+msgstr "-სკენ - ოთხი საათი - am pm."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 #, fuzzy
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr "-სკენ"
+msgstr "-სკენ ველი - მოვლენა"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 #, fuzzy
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr "-სკენ ტიპი"
+msgstr "-სკენ ველი - მოვლენა დრო"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 #, fuzzy
 msgid "Whether to show week numbers in the date navigator."
-msgstr "-სკენ თარიღი."
+msgstr "-სკენ კვირა - თარიღი."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 #, fuzzy
@@ -5181,22 +5459,22 @@ msgstr "წუთი"
 #: ../calendar/gui/cal-search-bar.c:48
 #, fuzzy
 msgid "Summary contains"
-msgstr "ჯამური"
+msgstr "რეზიუმე შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:49
 #, fuzzy
 msgid "Description contains"
-msgstr "აღწერა"
+msgstr "აღწერა შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:51
 #, fuzzy
 msgid "Comment contains"
-msgstr "კომენტარი"
+msgstr "კომენტარი შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:52
 #, fuzzy
 msgid "Location contains"
-msgstr "ადგილმდებარეობა"
+msgstr "ადგილმდებარეობა შეიცავს"
 
 #: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
@@ -5229,11 +5507,12 @@ msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
-msgstr "-სკენ."
+msgstr "ყველა - არა -სკენ."
 
 #: ../calendar/gui/calendar-commands.c:354
+#, fuzzy
 msgid "Purge events older than"
-msgstr ""
+msgstr "გასუფთავება"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
@@ -5254,11 +5533,12 @@ msgstr "დღე"
 #: ../calendar/gui/tasks-component.c:217
 #, fuzzy
 msgid "On The Web"
-msgstr "ჩართ."
+msgstr "ჩართ. ვები"
 
 #: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
+#, fuzzy
 msgid "Birthdays & Anniversaries"
-msgstr ""
+msgstr "დაბადების დღეები"
 
 #. Create the weather group
 #: ../calendar/gui/calendar-component.c:259
@@ -5274,22 +5554,22 @@ msgstr "ახალი კალენდარი"
 #: ../calendar/gui/calendar-component.c:840
 #, fuzzy
 msgid "Failed upgrading calendars."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა."
 
 #: ../calendar/gui/calendar-component.c:1139
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა კალენდარი წმ და"
 
 #: ../calendar/gui/calendar-component.c:1152
 #, fuzzy
 msgid "There is no calendar available for creating events and meetings"
-msgstr "არა და"
+msgstr "არა კალენდარი და"
 
 #: ../calendar/gui/calendar-component.c:1266
 #, fuzzy
 msgid "Calendar Source Selector"
-msgstr "კალენდარი"
+msgstr "კალენდარი წყარო ამრჩევი"
 
 #: ../calendar/gui/calendar-component.c:1457
 #, fuzzy
@@ -5297,13 +5577,14 @@ msgid "New appointment"
 msgstr "ახალი"
 
 #: ../calendar/gui/calendar-component.c:1458
+#, fuzzy
 msgid "_Appointment"
-msgstr ""
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/calendar-component.c:1459
 #, fuzzy
 msgid "Create a new appointment"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
@@ -5317,12 +5598,12 @@ msgstr "M"
 #: ../calendar/gui/calendar-component.c:1467
 #, fuzzy
 msgid "Create a new meeting request"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/calendar-component.c:1473
 #, fuzzy
 msgid "New all day appointment"
-msgstr "ახალი დღე"
+msgstr "ახალი ყველა დღე"
 
 #: ../calendar/gui/calendar-component.c:1474
 #, fuzzy
@@ -5332,7 +5613,7 @@ msgstr "ყველა დღე A"
 #: ../calendar/gui/calendar-component.c:1475
 #, fuzzy
 msgid "Create a new all-day appointment"
-msgstr "შექმნა a დღე"
+msgstr "შექმნა a ახალი ყველა დღე"
 
 #: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
@@ -5347,38 +5628,37 @@ msgid "Create a new calendar"
 msgstr "შექმენი ახალი კალენდარი"
 
 #: ../calendar/gui/calendar-view-factory.c:109
-#, fuzzy
 msgid "Day View"
-msgstr "დღე ხედი"
+msgstr "დღის ხედი"
 
 #: ../calendar/gui/calendar-view-factory.c:112
 #, fuzzy
 msgid "Work Week View"
-msgstr "სამსახური ხედი"
+msgstr "სამსახური კვირა ჩვენება"
 
 #: ../calendar/gui/calendar-view-factory.c:115
 #, fuzzy
 msgid "Week View"
-msgstr "ხედი"
+msgstr "კვირა ჩვენება"
 
 #: ../calendar/gui/calendar-view-factory.c:118
-#, fuzzy
 msgid "Month View"
-msgstr "თვე ხედი"
+msgstr "თვის ხედი"
 
 #: ../calendar/gui/comp-editor-factory.c:415
 #, fuzzy
 msgid "Error while opening the calendar"
-msgstr "შეცდომა"
+msgstr "შეცდომა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:421
+#, fuzzy
 msgid "Method not supported when opening the calendar"
-msgstr ""
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:427
 #, fuzzy
 msgid "Permission denied to open the calendar"
-msgstr "-სკენ"
+msgstr "-სკენ გახსნა კალენდარი"
 
 #: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
@@ -5398,8 +5678,9 @@ msgid "<b>Options</b>"
 msgstr "<b>ოფციები</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
 msgid "<b>Repeat</b>"
-msgstr ""
+msgstr "<b> გამეორება</b>"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
@@ -5424,12 +5705,13 @@ msgstr ""
 #: ../calendar/gui/e-alarm-list.c:446
 #, fuzzy
 msgid "Play a sound"
-msgstr "დაკვრა a"
+msgstr "ხმის დაკვრა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 #: ../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:458
@@ -5438,7 +5720,6 @@ msgid "Run a program"
 msgstr "გაშვება a პროგრამა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
-#, fuzzy
 msgid "Send To:"
 msgstr "გაგზავნა ვის:"
 
@@ -5446,7 +5727,7 @@ msgstr "გაგზავნა ვის:"
 #: ../calendar/gui/e-alarm-list.c:454
 #, fuzzy
 msgid "Send an email"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა ელფოსტა"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
@@ -5457,8 +5738,9 @@ msgid "_Program:"
 msgstr "_პროგრამა:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
 msgid "_Repeat the alarm"
-msgstr ""
+msgstr "გამეორება"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Sound:"
@@ -5480,8 +5762,9 @@ msgid "day(s)"
 msgstr "დღე"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#, fuzzy
 msgid "end of appointment"
-msgstr ""
+msgstr "-"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "extra times every"
@@ -5496,25 +5779,26 @@ msgid "minute(s)"
 msgstr "წუთი"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#, fuzzy
 msgid "start of appointment"
-msgstr ""
+msgstr "-"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 #, fuzzy
 msgid "Action/Trigger"
 msgstr "მოქმედება"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
-#, fuzzy
 msgid "A_dd"
-msgstr "A"
+msgstr "და_მატება"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 #: ../ui/evolution-event-editor.xml.h:1
+#, fuzzy
 msgid "Alarms"
-msgstr ""
+msgstr "სიგნალები"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
@@ -5523,18 +5807,21 @@ msgstr ""
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
 #: ../widgets/misc/e-attachment.glade.h:6
+#, fuzzy
 msgid "Suggest automatic display of attachment"
-msgstr ""
+msgstr "კარნახი ავტომატური -"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
+#, fuzzy
 msgid "Attach file(s)"
-msgstr ""
+msgstr "ფაილი წმ"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
 #: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
+#, fuzzy
 msgid "Attachment Properties"
-msgstr ""
+msgstr "პარამეტრები"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:269
@@ -5560,7 +5847,7 @@ msgstr "MIME ტიპი:"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 #, fuzzy
 msgid "Selected Calendars for Alarms"
-msgstr "კალენდრები"
+msgstr "მონიშნული კალენდრები სიგნალები"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
@@ -5579,7 +5866,7 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy, no-c-format
 msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i> u და და</i>"
+msgstr "<i> u და და ელფოსტა</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
@@ -5600,7 +5887,7 @@ msgstr "<span weight=\"bold\">საერთო</span>"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\"> სია</span>"
+msgstr "<span weight=\"bold\"> ამოცანა სია</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
@@ -5610,14 +5897,13 @@ msgstr "<span weight=\"bold\"> დრო</span>"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\"> სამსახური</span>"
+msgstr "<span weight=\"bold\"> სამსახური კვირა</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Day _ends:"
 msgstr "დღე _მთავრდება:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#, fuzzy
 msgid "Display"
 msgstr "დისპლეი"
 
@@ -5670,13 +5956,13 @@ msgstr ""
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
 #: ../mail/mail-config.glade.h:106
-#, fuzzy
 msgid "Pick a color"
-msgstr "აირჩიე ფერი"
+msgstr "ფერის ამორჩევა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#, fuzzy
 msgid "S_un"
-msgstr ""
+msgstr "S"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
@@ -5685,17 +5971,19 @@ msgid "Saturday"
 msgstr "შაბათი"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#, fuzzy
 msgid "Select the calendars for alarm notification"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#, fuzzy
 msgid "Sh_ow a reminder"
-msgstr ""
+msgstr "a"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "Show week _numbers in date navigator"
-msgstr "ანახე თარიღი"
+msgstr "ჩვენება კვირა - თარიღი"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 #: ../calendar/gui/dialogs/recurrence-page.c:1086
@@ -5704,15 +5992,16 @@ msgid "Sunday"
 msgstr "კვირა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#, fuzzy
 msgid "T_asks due today:"
-msgstr ""
+msgstr "T დღეს:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#, fuzzy
 msgid "T_hu"
-msgstr ""
+msgstr "T"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
 msgid "Template:"
 msgstr "შაბლონი:"
 
@@ -5746,8 +6035,9 @@ msgstr "ოთხშაბათი"
 
 #. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#, fuzzy
 msgid "Wee_k starts on:"
-msgstr ""
+msgstr "ჩართულია:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
@@ -5768,38 +6058,43 @@ msgid "_Ask for confirmation when deleting items"
 msgstr "კითხვა"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#, fuzzy
 msgid "_Compress weekends in month view"
-msgstr ""
+msgstr "შეკუნშვა - თვე"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_დღე იწყება:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#, fuzzy
 msgid "_Fri"
-msgstr ""
+msgstr "პარ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "_Hide completed tasks after"
-msgstr "დამალვა"
+msgstr "დამალვა დასრულებულია ამოცანები"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#, fuzzy
 msgid "_Mon"
-msgstr ""
+msgstr "ორშ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#, fuzzy
 msgid "_Overdue tasks:"
-msgstr ""
+msgstr "ამოცანები:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#, fuzzy
 msgid "_Sat"
-msgstr ""
+msgstr "შაბ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 #, fuzzy
 msgid "_Show appointment end times in week and month view"
-msgstr "ანახე და"
+msgstr "ჩვენება - კვირა და თვე"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 #, fuzzy
@@ -5807,12 +6102,14 @@ msgid "_Time divisions:"
 msgstr "დრო:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#, fuzzy
 msgid "_Tue"
-msgstr ""
+msgstr "სამ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#, fuzzy
 msgid "_Wed"
-msgstr ""
+msgstr "ოთხ"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
@@ -5821,17 +6118,17 @@ msgstr ""
 #: ../calendar/gui/dialogs/calendar-setup.c:288
 #, fuzzy
 msgid "Copy calendar contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე კალენდარი ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:291
 #, fuzzy
 msgid "Copy task list contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე დრო სია ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:293
 #, fuzzy
 msgid "Copy memo list contents locally for offline operation"
-msgstr "დააკოპირე კავშირგარეშე რეჟიმი"
+msgstr "დააკოპირე სია ხაზიდან გასვლა"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
@@ -5841,7 +6138,7 @@ msgstr "_ფერი:"
 #: ../calendar/gui/dialogs/calendar-setup.c:381
 #, fuzzy
 msgid "Tasks List"
-msgstr "დავალებანი სია"
+msgstr "ამოცანები სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:392
 #, fuzzy
@@ -5860,7 +6157,7 @@ msgstr "ახალი კალენდარი"
 #: ../calendar/gui/dialogs/calendar-setup.c:529
 #, fuzzy
 msgid "Task List Properties"
-msgstr "სია პარამეტრები"
+msgstr "ამოცანა სია პარამეტრები"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
@@ -5876,17 +6173,16 @@ msgstr "დამატება კალენდარი"
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:3
 #, fuzzy
 msgid "Add Task List"
-msgstr "დამატება სია"
+msgstr "დამატება ამოცანა სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
 msgid "_Add Calendar"
-msgstr "დამატება კალენდარი"
+msgstr "კალენდარის _დამატება"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Task List"
-msgstr "დამატება სია"
+msgstr "დამატება ამოცანა სია"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:9
 #: ../plugins/calendar-http/calendar-http.c:271
@@ -5907,78 +6203,94 @@ msgid "weeks"
 msgstr ""
 
 #: ../calendar/gui/dialogs/changed-comp.c:60
+#, fuzzy
 msgid "This event has been deleted."
-msgstr ""
+msgstr "მოვლენა."
 
 #: ../calendar/gui/dialogs/changed-comp.c:64
+#, fuzzy
 msgid "This task has been deleted."
-msgstr ""
+msgstr "დრო."
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
+#, fuzzy
 msgid "This journal entry has been deleted."
-msgstr ""
+msgstr "ელემენტი."
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
+#, fuzzy
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
+msgstr "წმ თქვენ და დახურვა?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
+#, fuzzy
 msgid "%s  You have made no changes, close the editor?"
-msgstr ""
+msgstr "წმ თქვენ არა დახურვა?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:84
+#, fuzzy
 msgid "This event has been changed."
-msgstr ""
+msgstr "მოვლენა."
 
 #: ../calendar/gui/dialogs/changed-comp.c:88
+#, fuzzy
 msgid "This task has been changed."
-msgstr ""
+msgstr "დრო."
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
+#, fuzzy
 msgid "This journal entry has been changed."
-msgstr ""
+msgstr "ელემენტი."
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
+#, fuzzy
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
+msgstr "წმ თქვენ და?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
+#, fuzzy
 msgid "%s  You have made no changes, update the editor?"
-msgstr ""
+msgstr "წმ თქვენ არა?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
+#, fuzzy
 msgid "Validation error: %s"
-msgstr ""
+msgstr "შეცდომა წმ"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
+#, fuzzy
 msgid " to "
-msgstr ""
+msgstr "მდე"
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
+#, fuzzy
 msgid " (Completed "
-msgstr ""
+msgstr "დასრულებულია "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "შესრულებულია "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
+#, fuzzy
 msgid " (Due "
-msgstr ""
+msgstr "ვადა "
 
 #: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
+#, fuzzy
 msgid "Due "
-msgstr ""
+msgstr "ვადა "
 
 #: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
+#, fuzzy
 msgid "Attached message - %s"
-msgstr ""
+msgstr "წმ"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
@@ -5986,8 +6298,7 @@ msgstr ""
 #: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] ""
+msgstr ""
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
@@ -6000,31 +6311,31 @@ msgstr "_გადატანა"
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 #, fuzzy
 msgid "Cancel _Drag"
-msgstr "გაუქმება გადათრევა"
+msgstr "შეწყვეტა გადათრევა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
+#, fuzzy
 msgid "Could not update object"
-msgstr ""
+msgstr "არა ობიექტი"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] ""
+msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 #, fuzzy
 msgid "Hide Attachment _Bar"
-msgstr "არა"
+msgstr "დამალვა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 #, fuzzy
 msgid "Show Attachment _Bar"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
@@ -6035,146 +6346,168 @@ msgstr "ანახე"
 msgid "_Remove"
 msgstr "_წაშლა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_პარამეტრები"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 #, fuzzy
 msgid "_Add attachment..."
 msgstr "დამატება."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 #, fuzzy
 msgid "Show Attachments"
-msgstr "ანახე"
+msgstr "ჩვენება დანართები"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+#, fuzzy
 msgid "Press space key to toggle attachment bar"
-msgstr ""
+msgstr "გასაღები -სკენ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 #, fuzzy
 msgid "Edit Appointment"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება შეხვედრა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
+#, fuzzy
 msgid "Meeting - %s"
-msgstr ""
+msgstr "შეხვედრა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
+#, fuzzy
 msgid "Appointment - %s"
-msgstr ""
+msgstr "შეხვედრა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, fuzzy, c-format
 msgid "Assigned Task - %s"
-msgstr "ამოცანა"
+msgstr "მინიჭებული ამოცანა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, fuzzy, c-format
 msgid "Task - %s"
-msgstr "ამოცანა"
+msgstr "ამოცანა წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
+#, fuzzy
 msgid "Journal entry - %s"
-msgstr ""
+msgstr "ელემენტი წმ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
+#, fuzzy
 msgid "No summary"
-msgstr ""
+msgstr "არა"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
 #: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr ""
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
+#, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
+msgstr "ცვლილებები -სკენ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
+#, fuzzy
 msgid "Unable to use current version!"
-msgstr ""
+msgstr "-სკენ!"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
+#, fuzzy
 msgid "Could not open source"
-msgstr ""
+msgstr "არა გახსნა"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
+#, fuzzy
 msgid "Could not open destination"
-msgstr ""
+msgstr "არა გახსნა"
 
 #: ../calendar/gui/dialogs/copy-source-dialog.c:78
+#, fuzzy
 msgid "Destination is read only"
-msgstr ""
+msgstr "დაშორება"
 
 #: ../calendar/gui/dialogs/delete-error.c:54
+#, fuzzy
 msgid "The event could not be deleted due to a corba error"
-msgstr ""
+msgstr "მოვლენა არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:57
+#, fuzzy
 msgid "The task could not be deleted due to a corba error"
-msgstr ""
+msgstr "დრო არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
+#, fuzzy
 msgid "The journal entry could not be deleted due to a corba error"
-msgstr ""
+msgstr "ელემენტი არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
+#, fuzzy
 msgid "The item could not be deleted due to a corba error"
-msgstr ""
+msgstr "არა -სკენ a შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
+#, fuzzy
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
+msgstr "მოვლენა არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:73
+#, fuzzy
 msgid "The task could not be deleted because permission was denied"
-msgstr ""
+msgstr "დრო არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
+#, fuzzy
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr ""
+msgstr "ელემენტი არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
+#, fuzzy
 msgid "The item could not be deleted because permission was denied"
-msgstr ""
+msgstr "არა"
 
 #: ../calendar/gui/dialogs/delete-error.c:86
+#, fuzzy
 msgid "The event could not be deleted due to an error"
-msgstr ""
+msgstr "მოვლენა არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:89
+#, fuzzy
 msgid "The task could not be deleted due to an error"
-msgstr ""
+msgstr "დრო არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
+#, fuzzy
 msgid "The journal entry could not be deleted due to an error"
-msgstr ""
+msgstr "ელემენტი არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
+#, fuzzy
 msgid "The item could not be deleted due to an error"
-msgstr ""
+msgstr "არა -სკენ შეცდომა"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
@@ -6187,8 +6520,9 @@ msgid "Delegate To:"
 msgstr "ვის:"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#, fuzzy
 msgid "Enter Delegate"
-msgstr ""
+msgstr "შეყვანა"
 
 #: ../calendar/gui/dialogs/event-editor.c:547
 #, fuzzy
@@ -6201,110 +6535,114 @@ msgid "Recurrence"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
+#, fuzzy
 msgid "This event has alarms"
-msgstr ""
+msgstr "მოვლენა"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "კალე_ნდარი:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer:"
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 #, fuzzy
 msgid "_Delegatees"
 msgstr "_წაშალე"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 #, fuzzy
 msgid "Atte_ndees"
 msgstr "სია"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 #, fuzzy
 msgid "Event with no start date"
-msgstr "შემთხვევა არა თარიღი"
+msgstr "მოვლენა არა თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 #, fuzzy
 msgid "Event with no end date"
-msgstr "შემთხვევა არა თარიღი"
+msgstr "მოვლენა არა თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:852
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "გაშვება თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 #, fuzzy
 msgid "End date is wrong"
 msgstr "ბოლოში თარიღი"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
+#, fuzzy
 msgid "Start time is wrong"
-msgstr ""
+msgstr "გაშვება"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
+#, fuzzy
 msgid "End time is wrong"
-msgstr ""
+msgstr "ბოლოში"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:909
 #, fuzzy
 msgid "The organizer selected no longer has an account."
-msgstr "არა."
+msgstr "არა ანგარიში."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr ""
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
 #: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_დამატება"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
+#, fuzzy
 msgid "Unable to open the calendar '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა კალენდარი წმ."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
+#, fuzzy
 msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] ""
+msgstr "დღე"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
+#, fuzzy
 msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] ""
+msgstr "საათი"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
+#, fuzzy
 msgid "%d minute before appointement"
-msgid_plural "%d minutes before appointment"
-msgstr[0] ""
+msgstr "წუთი"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 #, fuzzy
 msgid "Customize"
 msgstr "გამართვა"
@@ -6314,7 +6652,7 @@ msgstr "გამართვა"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6329,17 +6667,18 @@ msgstr "გამართვა"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
 #: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
-#, fuzzy
 msgid "None"
 msgstr "არა"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+#, fuzzy
 msgid "1 day before appointment"
-msgstr ""
+msgstr "დღე"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
 msgid "1 hour before appointment"
-msgstr ""
+msgstr "საათი"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
@@ -6364,13 +6703,14 @@ msgstr "სხვა:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 #: ../calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
 msgid "D_escription:"
-msgstr ""
+msgstr "D:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #, fuzzy
 msgid "Event Description"
-msgstr "შემთხვევა აღწერა"
+msgstr "მოვლენა აღწერა"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
@@ -6387,9 +6727,8 @@ msgid "_Alarm"
 msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
-#, fuzzy
 msgid "_Time:"
-msgstr "დრო:"
+msgstr "_დრო:"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
@@ -6413,7 +6752,7 @@ msgstr "ვის"
 #: ../calendar/gui/dialogs/meeting-page.c:313
 #, fuzzy
 msgid "From:"
-msgstr "ვისგან:"
+msgstr "საიდან:"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6422,25 +6761,27 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:2
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
 msgid "Click here to add an attendee"
-msgstr ""
+msgstr "-სკენ დამატება"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:3
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
 msgid "Common Name"
-msgstr "სახელი"
+msgstr "ჩვეულებრივი სახელი"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
 msgid "Delegated From"
-msgstr "ვისგან"
+msgstr "-დან"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:5
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+#, fuzzy
 msgid "Delegated To"
-msgstr ""
+msgstr "ვის"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:6
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
@@ -6454,14 +6795,15 @@ msgstr ""
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+#, fuzzy
 msgid "RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6477,9 +6819,8 @@ msgid "C_hange Organizer"
 msgstr "C"
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
 msgid "Co_ntacts..."
-msgstr "კონტაქტებ:"
+msgstr "კო_ნტაქტები..."
 
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
@@ -6497,8 +6838,9 @@ msgstr "ორ"
 
 #: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
+#, fuzzy
 msgid "Unable to open memos in '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა - წმ."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:439
@@ -6509,7 +6851,7 @@ msgstr "_ჯგუფი:"
 #: ../calendar/gui/dialogs/memo-page.glade.h:3
 #, fuzzy
 msgid "_Memo Content:"
-msgstr "მოკ-შე"
+msgstr "შიგთავსი:"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -6529,7 +6871,7 @@ msgstr "კალენდარი ჯგუფი"
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
 #, fuzzy
 msgid "Calendar Location"
-msgstr "კალენდარი ადგილმდებარეობა"
+msgstr "კალენდარი მდებარეობა"
 
 #: ../calendar/gui/dialogs/new-calendar.glade.h:6
 #, fuzzy
@@ -6539,38 +6881,42 @@ msgstr "კალენდარი სახელი"
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 #, fuzzy
 msgid "<b>Task List Options</b>"
-msgstr "<b> სია ოფციები</b>"
+msgstr "<b> ამოცანა სია ოფციები</b>"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
 #, fuzzy
 msgid "Add New Task List"
-msgstr "დამატება ახალი სია"
+msgstr "დამატება ახალი ამოცანა სია"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
 #, fuzzy
 msgid "Task List Group"
-msgstr "სია ჯგუფი"
+msgstr "ამოცანა სია ჯგუფი"
 
 #: ../calendar/gui/dialogs/new-task-list.glade.h:5
 #, fuzzy
 msgid "Task List Name"
-msgstr "სია სახელი"
+msgstr "ამოცანა სია სახელი"
 
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, fuzzy
 msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a მოვლენა -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, fuzzy
 msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr ""
+msgstr "თქვენ a მოვლენა -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, fuzzy
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a დრო -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
+#, fuzzy
 msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr ""
+msgstr "თქვენ a ელემენტი -სკენ?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 #, fuzzy
@@ -6578,12 +6924,14 @@ msgid "This Instance Only"
 msgstr "Instance მხოლოდ"
 
 #: ../calendar/gui/dialogs/recur-comp.c:94
+#, fuzzy
 msgid "This and Prior Instances"
-msgstr ""
+msgstr "და წინა"
 
 #: ../calendar/gui/dialogs/recur-comp.c:100
+#, fuzzy
 msgid "This and Future Instances"
-msgstr ""
+msgstr "და მომავალი"
 
 #: ../calendar/gui/dialogs/recur-comp.c:105
 #, fuzzy
@@ -6591,35 +6939,48 @@ msgid "All Instances"
 msgstr "ყველა"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
+#, fuzzy
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+msgstr "შეიცავს Evolution რედაქტირება."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 #, fuzzy
 msgid "Recurrence date is invalid"
-msgstr "თარიღი"
+msgstr "თარიღი მცდარი"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
 #: ../calendar/gui/dialogs/recurrence-page.c:928
+#, fuzzy
 msgid "on"
-msgstr ""
+msgstr "ჩართულია"
 
 #. 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:992
+#, fuzzy
 msgid "first"
-msgstr ""
+msgstr "პირველი"
+
+#. 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:998
+msgid "second"
+msgstr "წამი"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1003
+#, fuzzy
 msgid "third"
-msgstr ""
+msgstr "მესამე"
 
 #. 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
@@ -6648,24 +7009,27 @@ msgstr "სხვა თარიღი"
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1047
+#, fuzzy
 msgid "1st to 10th"
-msgstr ""
+msgstr "1 -სკენ 10"
 
 #. 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:1053
+#, fuzzy
 msgid "11th to 20th"
-msgstr ""
+msgstr "11 -სკენ 20"
 
 #. 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:1059
+#, fuzzy
 msgid "21st to 31st"
-msgstr ""
+msgstr "21 -სკენ 31"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
@@ -6675,8 +7039,9 @@ msgstr "დღე"
 #. * (dropdown menu options are in [square brackets])."
 #.
 #: ../calendar/gui/dialogs/recurrence-page.c:1219
+#, fuzzy
 msgid "on the"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
@@ -6720,24 +7085,27 @@ msgstr ""
 #. 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
+#, fuzzy
 msgid "month(s)"
-msgstr ""
+msgstr "თვე"
 
 #. 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
+#, fuzzy
 msgid "week(s)"
-msgstr ""
+msgstr "კვირები"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#, fuzzy
 msgid "year(s)"
-msgstr ""
+msgstr "წელი"
 
 #: ../calendar/gui/dialogs/task-details-page.c:411
 #: ../calendar/gui/dialogs/task-details-page.c:431
 #, fuzzy
 msgid "Completed date is wrong"
-msgstr "შესრულებულია თარიღი"
+msgstr "დასრულებულია თარიღი"
 
 #: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
@@ -6818,7 +7186,7 @@ msgstr "დაუდგენელი"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 #, fuzzy
 msgid "_Date completed:"
-msgstr "თარიღი:"
+msgstr "თარიღი დასრულებულია:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:14
 #: ../widgets/misc/e-send-options.glade.h:31
@@ -6831,24 +7199,24 @@ msgstr "_ვებ გვერდი:"
 
 #: ../calendar/gui/dialogs/task-editor.c:426
 #: ../calendar/gui/tasks-component.c:1171
-#, fuzzy
 msgid "_Task"
-msgstr "ამოცანა"
+msgstr "_ამოცანა"
 
 #: ../calendar/gui/dialogs/task-editor.c:430
 #, fuzzy
 msgid "Task Details"
-msgstr "დეტალები"
+msgstr "ამოცანა ცნობები"
 
 #: ../calendar/gui/dialogs/task-page.c:825
 #, fuzzy
 msgid "Due date is wrong"
-msgstr "თარიღი"
+msgstr "ვადა თარიღი"
 
 #: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
+#, fuzzy
 msgid "Unable to open tasks in '%s'."
-msgstr ""
+msgstr "-სკენ გახსნა ამოცანები - წმ."
 
 #: ../calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
@@ -6866,14 +7234,13 @@ msgid "Sta_rt date:"
 msgstr "თარიღი:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
 msgid "Time zone:"
-msgstr "დრო:"
+msgstr "დროის სარტყელი:"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #, fuzzy
 msgid "_Due date:"
-msgstr "თარიღი:"
+msgstr "ვადა თარიღი:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 #, fuzzy
@@ -6883,26 +7250,26 @@ msgstr "<b> თავისუფალი დაკავებული C</b>"
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
 #, fuzzy
 msgid "<b>Publishing Frequency</b>"
-msgstr "<b> სიხშირე</b>"
+msgstr "<b> გამომცემლობა სიხშირე</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "<b> ადგილმდებარეობა</b>"
+msgstr "<b> გამომცემლობა მდებარეობა</b>"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
 msgid "Free/Busy Publishing Settings"
-msgstr "თავისუფალი დაკავებული პარამეტრები"
+msgstr "თავისუფალი დაკავებული გამომცემლობა პარამეტრები"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
 msgid "_Daily"
-msgstr ""
+msgstr "ყოველდღიურად"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
 msgid "_Manual"
-msgstr "ხელით"
+msgstr "_მანუალური"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:23
@@ -6921,8 +7288,9 @@ msgid "_Username:"
 msgstr "_მომხმარებელი:"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#, fuzzy
 msgid "_Weekly"
-msgstr ""
+msgstr "ყოველკვირეულად"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
@@ -6930,105 +7298,87 @@ msgstr ""
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d დღე"
-msgstr[1] ""
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:402
 #, c-format
+#, fuzzy
 msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, fuzzy, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d საათი"
-msgstr[1] ""
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, fuzzy, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d წუთი"
-msgstr[1] ""
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, fuzzy, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d წამი"
-msgstr[1] ""
+msgstr "კვირა"
 
 #: ../calendar/gui/e-alarm-list.c:464
 #, fuzzy
 msgid "Unknown action to be performed"
-msgstr "უცნობი -სკენ"
+msgstr "უცნობი მოქმედება -სკენ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:478
 #, c-format
+#, fuzzy
 msgid "%s %s before the start of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:483
 #, c-format
+#, fuzzy
 msgid "%s %s after the start of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:490
 #, c-format
+#, fuzzy
 msgid "%s at the start of the appointment"
-msgstr ""
+msgstr "წმ ეთ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:501
 #, c-format
+#, fuzzy
 msgid "%s %s before the end of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:506
 #, c-format
+#, fuzzy
 msgid "%s %s after the end of the appointment"
-msgstr ""
+msgstr "წმ წმ -"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:513
 #, c-format
+#, fuzzy
 msgid "%s at the end of the appointment"
-msgstr ""
+msgstr "წმ ეთ -"
 
 #. 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
+#, fuzzy
 msgid "%s at %s"
-msgstr ""
+msgstr "წმ ეთ წმ"
 
 #. 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
 #, fuzzy, c-format
 msgid "%s for an unknown trigger type"
-msgstr "უცნობი ტიპი"
+msgstr "წმ უცნობი"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, fuzzy, c-format
 msgid "Click to open %s"
-msgstr "-სკენ"
+msgstr "-სკენ გახსნა წმ"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
@@ -7048,7 +7398,7 @@ msgstr "უსახელო"
 #: ../calendar/gui/e-itip-control.glade.h:11
 #, fuzzy
 msgid "Summary:"
-msgstr "ჯამური:"
+msgstr "რეზიუმე:"
 
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
@@ -7059,7 +7409,7 @@ msgstr "გაშვება თარიღი:"
 #: ../calendar/gui/e-cal-component-preview.c:217
 #, fuzzy
 msgid "Due Date:"
-msgstr "თარიღი:"
+msgstr "ვადა თარიღი:"
 
 #. write status
 #. Status
@@ -7082,7 +7432,6 @@ msgstr "საზოგადო"
 
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:365
-#, fuzzy
 msgid "Private"
 msgstr "პრივატი"
 
@@ -7094,18 +7443,16 @@ 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
-#, fuzzy
 msgid "Start Date"
-msgstr "გაშვება თარიღი"
+msgstr "გაშვების თარიღი"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
-#, fuzzy
 msgid "Summary"
 msgstr "ჯამური"
 
@@ -7126,7 +7473,7 @@ msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
-msgstr "n"
+msgstr "- არა"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
@@ -7145,7 +7492,7 @@ 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:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
@@ -7164,45 +7511,45 @@ msgid "Recurring"
 msgstr ""
 
 #: ../calendar/gui/e-cal-model.c:922
+#, fuzzy
 msgid "Assigned"
-msgstr ""
+msgstr "მინიჭებული"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "შენახვა როგორც..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 #, fuzzy
 msgid "Select folder to save selected attachments..."
-msgstr "-სკენ."
+msgstr "ამორჩევა -სკენ შენახვა."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, fuzzy, c-format
 msgid "untitled_image.%s"
-msgstr "უსახელო "
+msgstr "უსახელო  ნახატი წმ"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
-#, fuzzy
 msgid "_Save As..."
-msgstr "შენახვა."
+msgstr "_შენახვა როგორც..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 #, fuzzy
 msgid "Set as _Background"
 msgstr "დააყენე როგორც ფონი"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 #, fuzzy
 msgid "_Save Selected"
-msgstr "შენახვა"
+msgstr "შენახვა მონიშნული"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, fuzzy, c-format
 msgid "Open in %s..."
-msgstr "გახსენი."
+msgstr "გახსნა - წმ."
 
 #: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
@@ -7286,7 +7633,7 @@ msgstr "_ბეჭდვა..."
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 #, fuzzy
 msgid "C_ut"
-msgstr "C"
+msgstr "ამ_ოჭრა"
 
 #: ../calendar/gui/e-calendar-table.c:1183
 #: ../calendar/gui/e-calendar-view.c:1584
@@ -7300,37 +7647,40 @@ msgstr "_ჩასმა"
 #: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 #, fuzzy
 msgid "_Assign Task"
-msgstr "მიანიჭე"
+msgstr "მიანიჭე ამოცანა"
 
 #: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
+#, fuzzy
 msgid "_Forward as iCalendar"
-msgstr ""
+msgstr "წინ iCalendar"
 
 #: ../calendar/gui/e-calendar-table.c:1189
+#, fuzzy
 msgid "_Mark as Complete"
-msgstr ""
+msgstr "შესრულებულია"
 
 #: ../calendar/gui/e-calendar-table.c:1190
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
-msgstr "დავალებანი შესრულებულია"
+msgstr "მონიშნული ამოცანები შესრულებულია"
 
 #: ../calendar/gui/e-calendar-table.c:1195
 #, fuzzy
 msgid "_Delete Selected Tasks"
-msgstr "წაშლა დავალებანი"
+msgstr "წაშლა მონიშნული ამოცანები"
 
 #: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Click to add a task"
-msgstr "-სკენ a"
+msgstr "-სკენ დამატება a დრო"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
+#, fuzzy
 msgid "% Complete"
-msgstr ""
+msgstr "% დასრულდა"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
@@ -7339,7 +7689,7 @@ msgstr "შესრულებულია"
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
-msgstr "თარიღი"
+msgstr "დასრულება თარიღი"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
@@ -7373,22 +7723,22 @@ msgstr "ვაკოპირებ ელემენტებს"
 #: ../calendar/gui/e-calendar-view.c:1575
 #, fuzzy
 msgid "New _Appointment..."
-msgstr "ახალი."
+msgstr "ახალი შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1576
 #, fuzzy
 msgid "New All Day _Event"
-msgstr "ახალი ყველა დღე შემთხვევა"
+msgstr "ახალი ყველა დღე მოვლენა"
 
 #: ../calendar/gui/e-calendar-view.c:1577
 #, fuzzy
 msgid "New _Meeting"
-msgstr "ახალი"
+msgstr "ახალი შეხვედრა"
 
 #: ../calendar/gui/e-calendar-view.c:1578
 #, fuzzy
 msgid "New _Task"
-msgstr "ახალი"
+msgstr "ახალი ამოცანა"
 
 #. FIXME: hook in this somehow
 #: ../calendar/gui/e-calendar-view.c:1588
@@ -7398,17 +7748,16 @@ msgstr "_ახლანდელი ხადი"
 #: ../calendar/gui/e-calendar-view.c:1590
 #, fuzzy
 msgid "Select T_oday"
-msgstr "დღეს"
+msgstr "ამორჩევა T"
 
 #: ../calendar/gui/e-calendar-view.c:1591
-#, fuzzy
 msgid "_Select Date..."
-msgstr "თარიღი."
+msgstr "_თარიღის ამორჩევა..."
 
 #: ../calendar/gui/e-calendar-view.c:1607
 #, fuzzy
 msgid "Cop_y to Calendar..."
-msgstr "-სკენ კალენდარი."
+msgstr "y -სკენ კალენდარი."
 
 #: ../calendar/gui/e-calendar-view.c:1608
 #, fuzzy
@@ -7416,22 +7765,23 @@ msgid "Mo_ve to Calendar..."
 msgstr "ორ -სკენ კალენდარი."
 
 #: ../calendar/gui/e-calendar-view.c:1609
+#, fuzzy
 msgid "_Delegate Meeting..."
-msgstr ""
+msgstr "შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1610
+#, fuzzy
 msgid "_Schedule Meeting..."
-msgstr ""
+msgstr "დაგეგმვა შეხვედრა."
 
 #: ../calendar/gui/e-calendar-view.c:1611
 #, fuzzy
 msgid "_Forward as iCalendar..."
-msgstr "წინ."
+msgstr "წინ iCalendar."
 
 #: ../calendar/gui/e-calendar-view.c:1612
-#, fuzzy
 msgid "_Reply"
-msgstr "პასუხი"
+msgstr "_პასუხი"
 
 #: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
@@ -7442,7 +7792,7 @@ msgstr "პასუხი ყველ_ას"
 #: ../calendar/gui/e-calendar-view.c:1618
 #, fuzzy
 msgid "Make this Occurrence _Movable"
-msgstr "მოვლენა"
+msgstr "Make მოვლენა"
 
 #: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 #, fuzzy
@@ -7457,14 +7807,15 @@ msgstr "წაშლა ყველა"
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
+#, fuzzy
 msgid "Organizer: %s <%s>"
-msgstr ""
+msgstr "წმ წმ"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-view.c:2034
 #, fuzzy, c-format
 msgid "Organizer: %s"
-msgstr "C"
+msgstr "წმ"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
@@ -7494,7 +7845,7 @@ msgid ""
 "The date must be entered in the format: \n"
 "\n"
 "%s"
-msgstr "თარიღი n n"
+msgstr "თარიღი - არა არა წმ"
 
 #. 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.
@@ -7531,7 +7882,7 @@ msgstr "pm"
 #: ../calendar/gui/e-itip-control.c:759
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
-msgstr "კი"
+msgstr "დიახ"
 
 #: ../calendar/gui/e-itip-control.c:770
 #, c-format
@@ -7542,15 +7893,15 @@ msgstr[1] "ყოველი მე-%d-ე დღე"
 
 #: ../calendar/gui/e-itip-control.c:775
 #, c-format
+#, fuzzy
 msgid "Every week"
-msgid_plural "Every %d weeks"
-msgstr[0] ""
+msgstr "კვირა"
 
 #: ../calendar/gui/e-itip-control.c:777
 #, c-format
+#, fuzzy
 msgid "Every week on "
-msgid_plural "Every %d weeks on "
-msgstr[0] ""
+msgstr "კვირა ჩართულია "
 
 #: ../calendar/gui/e-itip-control.c:785
 msgid " and "
@@ -7559,39 +7910,41 @@ msgstr " და "
 #: ../calendar/gui/e-itip-control.c:792
 #, fuzzy, c-format
 msgid "The %s day of "
-msgstr "დღე "
+msgstr "წმ დღე - "
 
 #: ../calendar/gui/e-itip-control.c:805
 #, c-format
+#, fuzzy
 msgid "The %s %s of "
-msgstr ""
+msgstr "წმ წმ - "
 
 #: ../calendar/gui/e-itip-control.c:812
 #, c-format
+#, fuzzy
 msgid "every month"
-msgid_plural "every %d months"
-msgstr[0] ""
+msgstr "თვე"
 
 #: ../calendar/gui/e-itip-control.c:816
 #, c-format
+#, fuzzy
 msgid "Every year"
-msgid_plural "Every %d years"
-msgstr[0] ""
+msgstr "წელი"
 
 #: ../calendar/gui/e-itip-control.c:827
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
-msgstr[0] "a"
-msgstr[1] ""
+msgstr[0] "a -"
 
 #: ../calendar/gui/e-itip-control.c:836
+#, fuzzy
 msgid ", ending on "
-msgstr ""
+msgstr "ჩართულია "
 
 #: ../calendar/gui/e-itip-control.c:857
+#, fuzzy
 msgid "Starts"
-msgstr ""
+msgstr "იწყება"
 
 #: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
@@ -7599,18 +7952,20 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
+#, fuzzy
 msgid "Due"
-msgstr ""
+msgstr "ვადა"
 
 #: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 #, fuzzy
 msgid "iCalendar Information"
-msgstr "ინფორმაცია"
+msgstr "iCalendar ინფორმაცია"
 
 #. Title
 #: ../calendar/gui/e-itip-control.c:961
+#, fuzzy
 msgid "iCalendar Error"
-msgstr ""
+msgstr "iCalendar შეცდომა"
 
 #: ../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
@@ -7620,14 +7975,15 @@ msgstr ""
 #: ../plugins/itip-formatter/itip-view.c:407
 #, fuzzy
 msgid "An unknown person"
-msgstr "უცნობი"
+msgstr "უცნობი პირადი ფორმა"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1084
+#, fuzzy
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
+msgstr "<br> და მოქმედება მენიუ."
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
@@ -7651,109 +8007,116 @@ msgid "Declined"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1224
+#, fuzzy
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
+msgstr "არა -"
 
 #: ../calendar/gui/e-itip-control.c:1226
+#, fuzzy
 msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr ""
+msgstr "დრო არა - დრო"
 
 #: ../calendar/gui/e-itip-control.c:1305
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published meeting information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1306
 #, fuzzy
 msgid "Meeting Information"
-msgstr "ინფორმაცია"
+msgstr "შეხვედრა ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:1312
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> - წმ ეთ a."
 
 #: ../calendar/gui/e-itip-control.c:1314
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> ეთ a."
 
 #: ../calendar/gui/e-itip-control.c:1315
+#, fuzzy
 msgid "Meeting Proposal"
-msgstr ""
+msgstr "შეხვედრა"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1321
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr "<b></b> -სკენ -სკენ."
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ."
 
 #: ../calendar/gui/e-itip-control.c:1322
 #, fuzzy
 msgid "Meeting Update"
-msgstr "განახლება"
+msgstr "შეხვედრა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1326
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b></b> -სკენ."
+msgstr "<b> წმ</b> -სკენ."
 
 #: ../calendar/gui/e-itip-control.c:1327
 #, fuzzy
 msgid "Meeting Update Request"
-msgstr "განახლება"
+msgstr "შეხვედრა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1334
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a."
 
 #: ../calendar/gui/e-itip-control.c:1335
+#, fuzzy
 msgid "Meeting Reply"
-msgstr ""
+msgstr "შეხვედრა პასუხი"
 
 #: ../calendar/gui/e-itip-control.c:1342
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a."
 
 #: ../calendar/gui/e-itip-control.c:1343
 #, fuzzy
 msgid "Meeting Cancelation"
-msgstr "ინფორმაცია"
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/e-itip-control.c:1353 ../calendar/gui/e-itip-control.c:1430
 #: ../calendar/gui/e-itip-control.c:1470
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი."
 
 #: ../calendar/gui/e-itip-control.c:1354
 #, fuzzy
 msgid "Bad Meeting Message"
-msgstr "შეტყობინება"
+msgstr "შეხვედრა შეტყობინება"
 
 #: ../calendar/gui/e-itip-control.c:1381
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published task information."
-msgstr ""
+msgstr "<b> წმ</b> დრო."
 
 #: ../calendar/gui/e-itip-control.c:1382
 #, fuzzy
 msgid "Task Information"
-msgstr "ინფორმაცია"
+msgstr "ამოცანა ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:1389
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> წმ -სკენ a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1391
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1392
 #, fuzzy
@@ -7764,37 +8127,37 @@ msgstr "ამოცანა"
 #: ../calendar/gui/e-itip-control.c:1398
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
-msgstr "<b></b> -სკენ -სკენ."
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ დრო."
 
 #: ../calendar/gui/e-itip-control.c:1399
 #, fuzzy
 msgid "Task Update"
-msgstr "განახლება"
+msgstr "ამოცანა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1403
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b></b> -სკენ."
+msgstr "<b> წმ</b> -სკენ დრო."
 
 #: ../calendar/gui/e-itip-control.c:1404
 #, fuzzy
 msgid "Task Update Request"
-msgstr "განახლება"
+msgstr "ამოცანა განახლება"
 
 #: ../calendar/gui/e-itip-control.c:1411
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1412
 #, fuzzy
 msgid "Task Reply"
-msgstr "პასუხი"
+msgstr "ამოცანა პასუხი"
 
 #: ../calendar/gui/e-itip-control.c:1419
 #, fuzzy, c-format
 msgid "<b>%s</b> has canceled a task."
-msgstr "<b></b> a."
+msgstr "<b> წმ</b> a დრო."
 
 #: ../calendar/gui/e-itip-control.c:1420
 #, fuzzy
@@ -7804,12 +8167,13 @@ msgstr "ამოცანა"
 #: ../calendar/gui/e-itip-control.c:1431
 #, fuzzy
 msgid "Bad Task Message"
-msgstr "შეტყობინება"
+msgstr "ამოცანა შეტყობინება"
 
 #: ../calendar/gui/e-itip-control.c:1455
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published free/busy information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1456
 #, fuzzy
@@ -7818,8 +8182,9 @@ msgstr "თავისუფალი დაკავებული ინფ�
 
 #: ../calendar/gui/e-itip-control.c:1460
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../calendar/gui/e-itip-control.c:1461
 #, fuzzy
@@ -7829,7 +8194,7 @@ msgstr "თავისუფალი დაკავებული"
 #: ../calendar/gui/e-itip-control.c:1465
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b></b> -სკენ a."
+msgstr "<b> წმ</b> -სკენ a."
 
 #: ../calendar/gui/e-itip-control.c:1466
 #, fuzzy
@@ -7844,67 +8209,70 @@ msgstr "თავისუფალი დაკავებული შეტ�
 #: ../calendar/gui/e-itip-control.c:1546
 #, fuzzy
 msgid "The message does not appear to be properly formed"
-msgstr "-სკენ"
+msgstr "არა -სკენ"
 
 #: ../calendar/gui/e-itip-control.c:1605
+#, fuzzy
 msgid "The message contains only unsupported requests."
-msgstr ""
+msgstr "შეიცავს."
 
 #: ../calendar/gui/e-itip-control.c:1638
 #, fuzzy
 msgid "The attachment does not contain a valid calendar message"
-msgstr "a"
+msgstr "არა შეიცავს a კალენდარი"
 
 #: ../calendar/gui/e-itip-control.c:1670
+#, fuzzy
 msgid "The attachment has no viewable calendar items"
-msgstr ""
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/e-itip-control.c:1904
 #, fuzzy
 msgid "Update complete\n"
-msgstr "განახლება n"
+msgstr "განახლება არა"
 
 #: ../calendar/gui/e-itip-control.c:1932
 #, fuzzy
 msgid "Object is invalid and cannot be updated\n"
-msgstr "და n"
+msgstr "ობიექტი მცდარი და არა"
 
 #: ../calendar/gui/e-itip-control.c:1942
 #, fuzzy
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "a დამატება?"
+msgstr "არა a დამატება?"
 
 #: ../calendar/gui/e-itip-control.c:1954
 #, fuzzy
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "n"
+msgstr "არა - მცდარი არა"
 
 #: ../calendar/gui/e-itip-control.c:1971
 #, fuzzy
 msgid "Attendee status updated\n"
-msgstr "n"
+msgstr "არა"
 
 #: ../calendar/gui/e-itip-control.c:1974
 #: ../plugins/itip-formatter/itip-formatter.c:1029
 #, fuzzy
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "არა"
+msgstr "არა არა"
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
+#, fuzzy
 msgid "Item sent!\n"
-msgstr ""
+msgstr "ელემენტი გაგზავნილი არა"
 
 #: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
+#, fuzzy
 msgid "The item could not be sent!\n"
-msgstr ""
+msgstr "არა გაგზავნილი არა"
 
 #: ../calendar/gui/e-itip-control.c:2130
 #, fuzzy
 msgid "Choose an action:"
-msgstr "არჩევა:"
+msgstr "მოქმედება:"
 
 #: ../calendar/gui/e-itip-control.c:2202
-#, fuzzy
 msgid "Update"
 msgstr "განახლება"
 
@@ -7914,13 +8282,15 @@ msgid "Accept"
 msgstr "მიიღე"
 
 #: ../calendar/gui/e-itip-control.c:2231
+#, fuzzy
 msgid "Tentatively accept"
-msgstr ""
+msgstr "მიღება"
 
 #: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
+#, fuzzy
 msgid "Decline"
-msgstr ""
+msgstr "უარი"
 
 #: ../calendar/gui/e-itip-control.c:2261
 #, fuzzy
@@ -7935,7 +8305,7 @@ msgstr "განახლება"
 #: ../calendar/gui/e-itip-control.c:2317
 #, fuzzy
 msgid "Send Latest Information"
-msgstr "გაგზავნა ინფორმაცია"
+msgstr "გაგზავნა უახლესი ინფორმაცია"
 
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
 #: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
@@ -7949,8 +8319,9 @@ msgid "%P %%"
 msgstr ""
 
 #: ../calendar/gui/e-itip-control.glade.h:3
+#, fuzzy
 msgid "--to--"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../calendar/gui/e-itip-control.glade.h:4
 #, fuzzy
@@ -7964,11 +8335,12 @@ msgstr "თარიღი:"
 #: ../calendar/gui/e-itip-control.glade.h:7
 #, fuzzy
 msgid "Loading Calendar"
-msgstr "კალენდარი"
+msgstr "ჩატვირვა კალენდარი"
 
 #: ../calendar/gui/e-itip-control.glade.h:8
+#, fuzzy
 msgid "Loading calendar..."
-msgstr ""
+msgstr "ჩატვირვა კალენდარი."
 
 #: ../calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7991,8 +8363,9 @@ msgstr "სკამი"
 
 #: ../calendar/gui/e-meeting-list-view.c:71
 #: ../calendar/gui/e-meeting-list-view.c:154
+#, fuzzy
 msgid "Required Participants"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-list-view.c:72
 #, fuzzy
@@ -8034,8 +8407,9 @@ msgstr "სკამი"
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/e-meeting-store.c:767
+#, fuzzy
 msgid "Required Participant"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
@@ -8069,7 +8443,7 @@ msgid "Delegated"
 msgstr ""
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr ""
 
@@ -8096,13 +8470,14 @@ msgstr "%a·%m/%d/%Y"
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:450
+#, fuzzy
 msgid "%m/%d/%Y"
-msgstr ""
+msgstr "Y"
 
 #: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 #, fuzzy
 msgid "Out of Office"
-msgstr "ოფისი"
+msgstr "- ოფისი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:413
 #, fuzzy
@@ -8115,18 +8490,19 @@ msgid "A_ttendees..."
 msgstr "A."
 
 #: ../calendar/gui/e-meeting-time-sel.c:444
+#, fuzzy
 msgid "O_ptions"
-msgstr ""
+msgstr "O"
 
 #: ../calendar/gui/e-meeting-time-sel.c:461
 #, fuzzy
 msgid "Show _only working hours"
-msgstr "ანახე საათი"
+msgstr "ჩვენება საათი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:471
 #, fuzzy
 msgid "Show _zoomed out"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../calendar/gui/e-meeting-time-sel.c:486
 #, fuzzy
@@ -8153,16 +8529,17 @@ msgstr "ყველა და"
 #: ../calendar/gui/e-meeting-time-sel.c:560
 #, fuzzy
 msgid "All _people and one resource"
-msgstr "ყველა და"
+msgstr "ყველა და რესურსი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:569
+#, fuzzy
 msgid "_Required people"
-msgstr ""
+msgstr "აუცილებელია"
 
 #: ../calendar/gui/e-meeting-time-sel.c:578
 #, fuzzy
 msgid "Required people and _one resource"
-msgstr "და"
+msgstr "აუცილებელია და რესურსი"
 
 #: ../calendar/gui/e-meeting-time-sel.c:614
 #, fuzzy
@@ -8177,72 +8554,81 @@ msgstr "ბოლოში:"
 #: ../calendar/gui/e-memo-table.c:870
 #, fuzzy
 msgid "_Delete Selected Memos"
-msgstr "წაშლა"
+msgstr "წაშლა მონიშნული"
 
 #: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 #, fuzzy
 msgid "Click to add a memo"
-msgstr "-სკენ a"
+msgstr "-სკენ დამატება a"
 
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
 msgstr ""
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
+#, fuzzy
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
+"შეცდომა ჩართულია წმ\n"
+" წმ"
 
 #: ../calendar/gui/e-memos.c:772
 #, fuzzy
 msgid "Loading memos"
-msgstr "გადატანის პროცესში"
+msgstr "ჩატვირვა"
 
 #: ../calendar/gui/e-memos.c:853
 #, fuzzy, c-format
 msgid "Opening memos at %s"
-msgstr "გახსნა %s"
+msgstr "ეთ წმ"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
+#, fuzzy
 msgid "Deleting selected objects..."
-msgstr ""
+msgstr "ვშლი."
 
 #: ../calendar/gui/e-pub-utils.c:322
 #, c-format
+#, fuzzy
 msgid "Enter the password for %s"
-msgstr ""
+msgstr "შეყვანა წმ"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
+#, fuzzy
 msgid "Loading tasks"
-msgstr ""
+msgstr "ჩატვირვა ამოცანები"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
+#, fuzzy
 msgid "Opening tasks at %s"
-msgstr ""
+msgstr "ამოცანები ეთ წმ"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
+#, fuzzy
 msgid "Completing tasks..."
-msgstr ""
+msgstr "ამოცანები."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr ""
 
 #: ../calendar/gui/e-timezone-entry.c:133
 #, fuzzy
 msgid "Select Timezone"
-msgstr "დროის ზონა"
+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:1509
+#, fuzzy
 msgid "%d %B"
-msgstr ""
+msgstr "B"
 
 #: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
@@ -8251,12 +8637,12 @@ msgstr ""
 #: ../calendar/gui/gnome-cal.c:2234
 #, fuzzy
 msgid "_Custom View"
-msgstr "სხვა ხედი"
+msgstr "სხვა ჩვენება"
 
 #: ../calendar/gui/gnome-cal.c:2235
 #, fuzzy
 msgid "_Save Custom View"
-msgstr "შენახვა სხვა ხედი"
+msgstr "შენახვა სხვა ჩვენება"
 
 #: ../calendar/gui/gnome-cal.c:2240
 #, fuzzy
@@ -8265,13 +8651,15 @@ msgstr "ხედები."
 
 #: ../calendar/gui/gnome-cal.c:2402
 #, c-format
+#, fuzzy
 msgid "Loading appointments at %s"
-msgstr ""
+msgstr "ჩატვირვა ეთ წმ"
 
 #: ../calendar/gui/gnome-cal.c:2421
 #, c-format
+#, fuzzy
 msgid "Loading tasks at %s"
-msgstr ""
+msgstr "ჩატვირვა ამოცანები ეთ წმ"
 
 #: ../calendar/gui/gnome-cal.c:2525
 #, fuzzy, c-format
@@ -8327,9 +8715,8 @@ msgid "October"
 msgstr "ოქტომბერი"
 
 #: ../calendar/gui/goto-dialog.glade.h:12
-#, fuzzy
 msgid "Select Date"
-msgstr "თარიღი"
+msgstr "თარიღის ამორჩევა"
 
 #: ../calendar/gui/goto-dialog.glade.h:13
 msgid "September"
@@ -8338,7 +8725,7 @@ msgstr "სექტემბერი"
 #: ../calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
 msgid "_Select Today"
-msgstr "დღეს"
+msgstr "ამორჩევა დღეს"
 
 #: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:563
@@ -8352,7 +8739,7 @@ msgstr ""
 #: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 #, fuzzy
 msgid "Event information"
-msgstr "შემთხვევა"
+msgstr "მოვლენა"
 
 #: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 #, fuzzy
@@ -8378,9 +8765,8 @@ msgid "Updated"
 msgstr ""
 
 #: ../calendar/gui/itip-utils.c:696
-#, fuzzy
 msgid "Refresh"
-msgstr "განაახლე"
+msgstr "განახლება"
 
 #: ../calendar/gui/itip-utils.c:700
 msgid "Counter-proposal"
@@ -8389,15 +8775,17 @@ msgstr ""
 #: ../calendar/gui/itip-utils.c:772
 #, fuzzy, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "თავისუფალი დაკავებული -სკენ"
+msgstr "თავისუფალი დაკავებული წმ -სკენ წმ"
 
 #: ../calendar/gui/itip-utils.c:782
+#, fuzzy
 msgid "iCalendar information"
-msgstr ""
+msgstr "iCalendar"
 
 #: ../calendar/gui/itip-utils.c:937
+#, fuzzy
 msgid "You must be an attendee of the event."
-msgstr ""
+msgstr "თქვენ - მოვლენა."
 
 #: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
 #: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
@@ -8427,28 +8815,27 @@ msgstr[1] "%d წუთი"
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ""
+msgstr ""
 
 #: ../calendar/gui/memos-component.c:575
 #, fuzzy
 msgid "Failed upgrading memos."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა."
 
 #: ../calendar/gui/memos-component.c:871
 #, fuzzy, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა სია წმ და"
 
 #: ../calendar/gui/memos-component.c:884
 #, fuzzy
 msgid "There is no calendar available for creating memos"
-msgstr "არა"
+msgstr "არა კალენდარი"
 
 #: ../calendar/gui/memos-component.c:972
 #, fuzzy
 msgid "Memo Source Selector"
-msgstr "ამოცანა"
+msgstr "წყარო ამრჩევი"
 
 #: ../calendar/gui/memos-component.c:1155
 #, fuzzy
@@ -8456,19 +8843,18 @@ msgid "New memo"
 msgstr "ახალი"
 
 #: ../calendar/gui/memos-component.c:1156
-#, fuzzy
 msgid "_Memo"
 msgstr "_წაშლა"
 
 #: ../calendar/gui/memos-component.c:1157
 #, fuzzy
 msgid "Create a new memo"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი"
 
 #: ../calendar/gui/memos-component.c:1163
 #, fuzzy
 msgid "New memo list"
-msgstr "ახალი"
+msgstr "ახალი სია"
 
 #: ../calendar/gui/memos-component.c:1164
 #, fuzzy
@@ -8478,7 +8864,7 @@ msgstr "ამოცანა"
 #: ../calendar/gui/memos-component.c:1165
 #, fuzzy
 msgid "Create a new memo list"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი სია"
 
 #: ../calendar/gui/memos-control.c:340
 #, fuzzy
@@ -8486,12 +8872,13 @@ msgid "Print Memos"
 msgstr "ბეჭდვა"
 
 #: ../calendar/gui/migration.c:162
+#, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "და - Evolution დრო Evolution x არა Evolution."
 
 #: ../calendar/gui/migration.c:166
 #, fuzzy
@@ -8500,154 +8887,182 @@ msgid ""
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr "და Evolution Evolution n Evolution."
+msgstr "და - Evolution კალენდარი Evolution x არა Evolution."
 
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
+#, fuzzy
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
+msgstr "-სკენ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
 #, c-format
+#, fuzzy
 msgid "Unable to migrate calendar `%s'"
-msgstr ""
+msgstr "-სკენ კალენდარი წმ"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:962
 #, c-format
+#, fuzzy
 msgid "Unable to migrate tasks `%s'"
-msgstr ""
-
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, fuzzy, c-format
-msgid "(%d seconds)"
-msgstr "წამი"
+msgstr "-სკენ ამოცანები წმ"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "1st"
-msgstr ""
+msgstr "1"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "2nd"
-msgstr ""
+msgstr "2"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "3rd"
-msgstr ""
+msgstr "3"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "4th"
-msgstr ""
+msgstr "4"
 
 #: ../calendar/gui/print.c:493
+#, fuzzy
 msgid "5th"
-msgstr ""
+msgstr "5"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "6th"
-msgstr ""
+msgstr "6"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "7th"
-msgstr ""
+msgstr "7"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "8th"
-msgstr ""
+msgstr "8"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "9th"
-msgstr ""
+msgstr "9"
 
 #: ../calendar/gui/print.c:494
+#, fuzzy
 msgid "10th"
-msgstr ""
+msgstr "10"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "11th"
-msgstr ""
+msgstr "11"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "12th"
-msgstr ""
+msgstr "12"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "13th"
-msgstr ""
+msgstr "13"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "14th"
-msgstr ""
+msgstr "14"
 
 #: ../calendar/gui/print.c:495
+#, fuzzy
 msgid "15th"
-msgstr ""
+msgstr "15"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "16th"
-msgstr ""
+msgstr "16"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "17th"
-msgstr ""
+msgstr "17"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "18th"
-msgstr ""
+msgstr "18"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "19th"
-msgstr ""
+msgstr "19"
 
 #: ../calendar/gui/print.c:496
+#, fuzzy
 msgid "20th"
-msgstr ""
+msgstr "20"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "21st"
-msgstr ""
+msgstr "21"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "22nd"
-msgstr ""
+msgstr "22"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "23rd"
-msgstr ""
+msgstr "23"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "24th"
-msgstr ""
+msgstr "24"
 
 #: ../calendar/gui/print.c:497
+#, fuzzy
 msgid "25th"
-msgstr ""
+msgstr "25"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "26th"
-msgstr ""
+msgstr "26"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "27th"
-msgstr ""
+msgstr "27"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "28th"
-msgstr ""
+msgstr "28"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "29th"
-msgstr ""
+msgstr "29"
 
 #: ../calendar/gui/print.c:498
+#, fuzzy
 msgid "30th"
-msgstr ""
+msgstr "30"
 
 #: ../calendar/gui/print.c:499
+#, fuzzy
 msgid "31st"
-msgstr ""
+msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
 #: ../calendar/gui/print.c:574
@@ -8682,7 +9097,7 @@ msgstr "შა"
 #: ../calendar/gui/print.c:1923
 #, fuzzy
 msgid "Selected day (%a %b %d %Y)"
-msgstr "დღე a"
+msgstr "მონიშნული დღე a Y"
 
 #: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
@@ -8700,33 +9115,33 @@ msgstr "%a %b %d %Y"
 #: ../calendar/gui/print.c:1960
 #, fuzzy, c-format
 msgid "Selected week (%s - %s)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული კვირა წმ წმ"
 
 #. Month
 #: ../calendar/gui/print.c:1968
 #, fuzzy
 msgid "Selected month (%b %Y)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული თვე Y"
 
 #. Year
 #: ../calendar/gui/print.c:1975
 #, fuzzy
 msgid "Selected year (%Y)"
-msgstr "მონიშნულია"
+msgstr "მონიშნული წელი Y"
 
 #: ../calendar/gui/print.c:2304
+#, fuzzy
 msgid "Appointment"
-msgstr ""
+msgstr "შეხვედრა"
 
 #: ../calendar/gui/print.c:2306
-#, fuzzy
 msgid "Task"
 msgstr "ამოცანა"
 
 #: ../calendar/gui/print.c:2328
-#, fuzzy, c-format
+#, c-format
 msgid "Summary: %s"
-msgstr "ჯამური"
+msgstr "ჯამური: %s"
 
 #: ../calendar/gui/print.c:2379
 #, c-format
@@ -8754,8 +9169,9 @@ msgid "Categories: %s"
 msgstr "კატეგორიები: %s"
 
 #: ../calendar/gui/print.c:2445
+#, fuzzy
 msgid "Contacts: "
-msgstr ""
+msgstr "მეგობრები "
 
 #: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
 #: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
@@ -8766,53 +9182,53 @@ msgstr "ბეჭდვა წინასწარ ნახვა"
 #: ../calendar/gui/print.c:2620
 #, fuzzy
 msgid "Print Item"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა ელემენტი"
 
 #: ../calendar/gui/tasks-component.c:441
 #, fuzzy
 msgid "_New Task List"
-msgstr "ახალი სია"
+msgstr "ახალი ამოცანა სია"
 
 #: ../calendar/gui/tasks-component.c:517
 #, c-format
+#, fuzzy
 msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] ""
+msgstr "დრო"
 
 #: ../calendar/gui/tasks-component.c:566
 #, fuzzy
 msgid "Failed upgrading tasks."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა ამოცანები."
 
 #: ../calendar/gui/tasks-component.c:877
 #, fuzzy, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "-სკენ და"
+msgstr "-სკენ გახსნა დრო სია წმ და"
 
 #: ../calendar/gui/tasks-component.c:890
 #, fuzzy
 msgid "There is no calendar available for creating tasks"
-msgstr "არა"
+msgstr "არა კალენდარი ამოცანები"
 
 #: ../calendar/gui/tasks-component.c:987
 #, fuzzy
 msgid "Task Source Selector"
-msgstr "ამოცანა"
+msgstr "ამოცანა წყარო ამრჩევი"
 
 #: ../calendar/gui/tasks-component.c:1170
 #, fuzzy
 msgid "New task"
-msgstr "ახალი"
+msgstr "ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1172
 #, fuzzy
 msgid "Create a new task"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1178
 #, fuzzy
 msgid "New assigned task"
-msgstr "ახალი"
+msgstr "ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1179
 #, fuzzy
@@ -8822,34 +9238,35 @@ msgstr "ამოცანა"
 #: ../calendar/gui/tasks-component.c:1180
 #, fuzzy
 msgid "Create a new assigned task"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო"
 
 #: ../calendar/gui/tasks-component.c:1186
 #, fuzzy
 msgid "New task list"
-msgstr "ახალი"
+msgstr "ახალი დრო სია"
 
 #: ../calendar/gui/tasks-component.c:1187
-#, fuzzy
 msgid "Task l_ist"
-msgstr "ამოცანა"
+msgstr "ამოცანათა ს_ია"
 
 #: ../calendar/gui/tasks-component.c:1188
 #, fuzzy
 msgid "Create a new task list"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი დრო სია"
 
 #: ../calendar/gui/tasks-control.c:438
+#, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
-msgstr ""
+msgstr "ყველა ამოცანები დასრულებულია არა -სკენ ამოცანები არა ამოცანები?"
 
 #: ../calendar/gui/tasks-control.c:441
+#, fuzzy
 msgid "Do not ask me again."
-msgstr ""
+msgstr "არა."
 
 #: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
@@ -8867,12 +9284,14 @@ msgstr "შეხვედრები და"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#, fuzzy
 msgid "Opening calendar"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../calendar/importers/icalendar-importer.c:444
+#, fuzzy
 msgid "iCalendar files (.ics)"
-msgstr ""
+msgstr "iCalendar ფაილი"
 
 #: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
@@ -8881,11 +9300,12 @@ msgstr "ევოლუშენ iCalendar იმპორტერი"
 #: ../calendar/importers/icalendar-importer.c:521
 #, fuzzy
 msgid "Reminder!"
-msgstr "შენიშვნები"
+msgstr "შემხსენებელი!"
 
 #: ../calendar/importers/icalendar-importer.c:573
+#, fuzzy
 msgid "vCalendar files (.vcf)"
-msgstr ""
+msgstr "vCalendar ფაილი"
 
 #: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
@@ -8894,7 +9314,7 @@ msgstr "ევოლუშენ vCalendar იმპორტერი"
 #: ../calendar/importers/icalendar-importer.c:736
 #, fuzzy
 msgid "Calendar Events"
-msgstr "კალენდარი"
+msgstr "კალენდარი მოვლენები"
 
 #: ../calendar/importers/icalendar-importer.c:773
 #, fuzzy
@@ -8907,7 +9327,6 @@ msgstr "Evolution კალენდარი"
 #. * Don't include in any C files.
 #.
 #: ../calendar/zones.h:7
-#, fuzzy
 msgid "Africa/Abidjan"
 msgstr "აფრიკა/აბიჯანი"
 
@@ -8916,7 +9335,6 @@ msgid "Africa/Accra"
 msgstr "აფრიკა/აკრა"
 
 #: ../calendar/zones.h:9
-#, fuzzy
 msgid "Africa/Addis_Ababa"
 msgstr "აფრიკა/ადის-აბება"
 
@@ -8933,7 +9351,6 @@ msgid "Africa/Bamako"
 msgstr "აფრიკა/ბამაკო"
 
 #: ../calendar/zones.h:13
-#, fuzzy
 msgid "Africa/Bangui"
 msgstr "აფრიკა/ბანგი"
 
@@ -8946,7 +9363,6 @@ msgid "Africa/Bissau"
 msgstr "აფრიკა/ბისაუ"
 
 #: ../calendar/zones.h:16
-#, fuzzy
 msgid "Africa/Blantyre"
 msgstr "აფრიკა/ბლანტირი"
 
@@ -8979,7 +9395,6 @@ msgid "Africa/Dakar"
 msgstr "აფრიკა/დაკარი"
 
 #: ../calendar/zones.h:24
-#, fuzzy
 msgid "Africa/Dar_es_Salaam"
 msgstr "აფრიკა/დარ_ეს_სალამი"
 
@@ -8992,7 +9407,6 @@ msgid "Africa/Douala"
 msgstr "აფრიკა/დუალა"
 
 #: ../calendar/zones.h:27
-#, fuzzy
 msgid "Africa/El_Aaiun"
 msgstr "აფრიკა/ელ_აიუნი"
 
@@ -9009,17 +9423,14 @@ msgid "Africa/Harare"
 msgstr "აფრიკა/ჰარარე"
 
 #: ../calendar/zones.h:31
-#, fuzzy
 msgid "Africa/Johannesburg"
 msgstr "აფრიკა/იოჰანესბურგი"
 
 #: ../calendar/zones.h:32
-#, fuzzy
 msgid "Africa/Kampala"
-msgstr "აფრიკა/კამპარა"
+msgstr "აფრიკა/კამპალა"
 
 #: ../calendar/zones.h:33
-#, fuzzy
 msgid "Africa/Khartoum"
 msgstr "აფრიკა/ხართუმი"
 
@@ -9028,7 +9439,6 @@ msgid "Africa/Kigali"
 msgstr "აფრიკა/კიგალი"
 
 #: ../calendar/zones.h:35
-#, fuzzy
 msgid "Africa/Kinshasa"
 msgstr "აფრიკა/კინშასა"
 
@@ -9037,7 +9447,6 @@ msgid "Africa/Lagos"
 msgstr "აფრიკა/ლაგოსი"
 
 #: ../calendar/zones.h:37
-#, fuzzy
 msgid "Africa/Libreville"
 msgstr "აფრიკა/ლიბრევილი"
 
@@ -9050,7 +9459,6 @@ msgid "Africa/Luanda"
 msgstr "აფრიკა/ლუანდა"
 
 #: ../calendar/zones.h:40
-#, fuzzy
 msgid "Africa/Lubumbashi"
 msgstr "აფრიკა/ლუბუმბაში"
 
@@ -9071,17 +9479,14 @@ msgid "Africa/Maseru"
 msgstr "აფრიკა/მასერუ"
 
 #: ../calendar/zones.h:45
-#, fuzzy
 msgid "Africa/Mbabane"
 msgstr "აფრიკა/მაბაბანე"
 
 #: ../calendar/zones.h:46
-#, fuzzy
 msgid "Africa/Mogadishu"
 msgstr "აფრიკა/მოდადიშუ"
 
 #: ../calendar/zones.h:47
-#, fuzzy
 msgid "Africa/Monrovia"
 msgstr "აფრიკა/მონროვია"
 
@@ -9090,22 +9495,18 @@ msgid "Africa/Nairobi"
 msgstr "აფრიკა/ნაირობი"
 
 #: ../calendar/zones.h:49
-#, fuzzy
 msgid "Africa/Ndjamena"
-msgstr "აფრიკა/ნჯამენა"
+msgstr "აფრიკა/ნჯამენი"
 
 #: ../calendar/zones.h:50
-#, fuzzy
 msgid "Africa/Niamey"
 msgstr "აფრიკა/ნიამეი"
 
 #: ../calendar/zones.h:51
-#, fuzzy
 msgid "Africa/Nouakchott"
 msgstr "აფრიკა/ნოუაკჩთი"
 
 #: ../calendar/zones.h:52
-#, fuzzy
 msgid "Africa/Ouagadougou"
 msgstr "აფრიკა/ოუაგადოუგოუ"
 
@@ -9114,12 +9515,10 @@ msgid "Africa/Porto-Novo"
 msgstr "აფრიკა/პოტო-ნოვო"
 
 #: ../calendar/zones.h:54
-#, fuzzy
 msgid "Africa/Sao_Tome"
 msgstr "აფრიკა/საო-თომე"
 
 #: ../calendar/zones.h:55
-#, fuzzy
 msgid "Africa/Timbuktu"
 msgstr "აფრიკა/ტიმბუქტუ"
 
@@ -9132,7 +9531,6 @@ msgid "Africa/Tunis"
 msgstr "აფრიკა/ტუნისი"
 
 #: ../calendar/zones.h:58
-#, fuzzy
 msgid "Africa/Windhoek"
 msgstr "აფრიკა/ვინდუკი"
 
@@ -9141,22 +9539,18 @@ msgid "America/Adak"
 msgstr "ამერიკა/ადაკი"
 
 #: ../calendar/zones.h:60
-#, fuzzy
 msgid "America/Anchorage"
 msgstr "ამერიკა/ანკორიჯი"
 
 #: ../calendar/zones.h:61
-#, fuzzy
 msgid "America/Anguilla"
 msgstr "ამერიკა/ანგილა"
 
 #: ../calendar/zones.h:62
-#, fuzzy
 msgid "America/Antigua"
 msgstr "ამერიკა/ანტიგა"
 
 #: ../calendar/zones.h:63
-#, fuzzy
 msgid "America/Araguaina"
 msgstr "ამერიკა/არაგვიანა"
 
@@ -9165,7 +9559,6 @@ msgid "America/Aruba"
 msgstr "ამერიკა/არუბა"
 
 #: ../calendar/zones.h:65
-#, fuzzy
 msgid "America/Asuncion"
 msgstr "ამერიკა/ასუნსიონი"
 
@@ -9182,7 +9575,6 @@ msgid "America/Belize"
 msgstr "ამერიკა/ბელიზი"
 
 #: ../calendar/zones.h:69
-#, fuzzy
 msgid "America/Boa_Vista"
 msgstr "ამერიკა/ბოა_ვიშტა"
 
@@ -9191,12 +9583,10 @@ msgid "America/Bogota"
 msgstr "ამერიკა/ბოგოტა"
 
 #: ../calendar/zones.h:71
-#, fuzzy
 msgid "America/Boise"
 msgstr "ამერიკა/ბოისე"
 
 #: ../calendar/zones.h:72
-#, fuzzy
 msgid "America/Buenos_Aires"
 msgstr "ამერიკა/ბუენოს_აირესი"
 
@@ -9205,7 +9595,6 @@ msgid "America/Cambridge_Bay"
 msgstr "ამერიკა/კემბრიჯ-ბეი"
 
 #: ../calendar/zones.h:74
-#, fuzzy
 msgid "America/Cancun"
 msgstr "ამერიკა/კანკუნი"
 
@@ -9214,17 +9603,14 @@ msgid "America/Caracas"
 msgstr "ამერიკა/კარაკასი"
 
 #: ../calendar/zones.h:76
-#, fuzzy
 msgid "America/Catamarca"
 msgstr "ამერიკა/კატამარკა"
 
 #: ../calendar/zones.h:77
-#, fuzzy
 msgid "America/Cayenne"
 msgstr "ამერიკა/კეიენი"
 
 #: ../calendar/zones.h:78
-#, fuzzy
 msgid "America/Cayman"
 msgstr "ამერიკა/კაიმანი"
 
@@ -9233,12 +9619,10 @@ msgid "America/Chicago"
 msgstr "ამერიკა/ჩიკაგო"
 
 #: ../calendar/zones.h:80
-#, fuzzy
 msgid "America/Chihuahua"
 msgstr "ამერიკა/ჩიხუახუა"
 
 #: ../calendar/zones.h:81
-#, fuzzy
 msgid "America/Cordoba"
 msgstr "ამერიკა/კორდობა"
 
@@ -9247,27 +9631,22 @@ msgid "America/Costa_Rica"
 msgstr "ამერიკა/კოსტა_რიკა"
 
 #: ../calendar/zones.h:83
-#, fuzzy
 msgid "America/Cuiaba"
 msgstr "ამერიკა/კუიაბა"
 
 #: ../calendar/zones.h:84
-#, fuzzy
 msgid "America/Curacao"
 msgstr "ამერიკა/კიურასაო"
 
 #: ../calendar/zones.h:85
-#, fuzzy
 msgid "America/Danmarkshavn"
 msgstr "ამერიკა/დენმარკშავნი"
 
 #: ../calendar/zones.h:86
-#, fuzzy
 msgid "America/Dawson"
 msgstr "ამერიკა/დოუსონი"
 
 #: ../calendar/zones.h:87
-#, fuzzy
 msgid "America/Dawson_Creek"
 msgstr "ამერიკა/დოუსონ_კრიკი"
 
@@ -9280,47 +9659,38 @@ msgid "America/Detroit"
 msgstr "ამერიკა/დეტროიტი"
 
 #: ../calendar/zones.h:90
-#, fuzzy
 msgid "America/Dominica"
 msgstr "ამერიკა/დომინიკა"
 
 #: ../calendar/zones.h:91
-#, fuzzy
 msgid "America/Edmonton"
 msgstr "ამერიკა/ედმონტონი"
 
 #: ../calendar/zones.h:92
-#, fuzzy
 msgid "America/Eirunepe"
 msgstr "ამერიკა/ეირუნეპა"
 
 #: ../calendar/zones.h:93
-#, fuzzy
 msgid "America/El_Salvador"
 msgstr "ამერიკა/ელ_სალვადორი"
 
 #: ../calendar/zones.h:94
-#, fuzzy
 msgid "America/Fortaleza"
 msgstr "ამერიკა/ფორტალეზა"
 
 #: ../calendar/zones.h:95
-#, fuzzy
 msgid "America/Glace_Bay"
 msgstr "ამერიკა/გლას_ბეი"
 
 #: ../calendar/zones.h:96
-#, fuzzy
 msgid "America/Godthab"
 msgstr "ამერიკა/გოდსაბი"
 
 #: ../calendar/zones.h:97
-#, fuzzy
 msgid "America/Goose_Bay"
 msgstr "ამერიკა/გოს_-ბაი"
 
 #: ../calendar/zones.h:98
-#, fuzzy
 msgid "America/Grand_Turk"
 msgstr "ამერიკა/გრანდ-ტურკი"
 
@@ -9337,17 +9707,14 @@ msgid "America/Guatemala"
 msgstr "ამერიკა/გვატემალა"
 
 #: ../calendar/zones.h:102
-#, fuzzy
 msgid "America/Guayaquil"
 msgstr "ამერიკა/გუაიაკილი"
 
 #: ../calendar/zones.h:103
-#, fuzzy
 msgid "America/Guyana"
 msgstr "ამერიკა/გუიანა"
 
 #: ../calendar/zones.h:104
-#, fuzzy
 msgid "America/Halifax"
 msgstr "ამერიკა/ჰალიფაქსი"
 
@@ -9356,7 +9723,6 @@ msgid "America/Havana"
 msgstr "ამერიკა/ჰავანა"
 
 #: ../calendar/zones.h:106
-#, fuzzy
 msgid "America/Hermosillo"
 msgstr "ამერიკა/ჰერმოსილო"
 
@@ -9365,17 +9731,14 @@ msgid "America/Indiana/Indianapolis"
 msgstr "ამერიკა/ინდიანა/ინდიანაპოლისი"
 
 #: ../calendar/zones.h:108
-#, fuzzy
 msgid "America/Indiana/Knox"
 msgstr "ამერიკა/ინდიანა/ნოკსი"
 
 #: ../calendar/zones.h:109
-#, fuzzy
 msgid "America/Indiana/Marengo"
 msgstr "ამერიკა/ინდიანა/მარენგო"
 
 #: ../calendar/zones.h:110
-#, fuzzy
 msgid "America/Indiana/Vevay"
 msgstr "ამერიკა/ინდიანა/ვევაი"
 
@@ -9384,42 +9747,34 @@ msgid "America/Indianapolis"
 msgstr "ამერიკა/ინდიანაპოლისი"
 
 #: ../calendar/zones.h:112
-#, fuzzy
 msgid "America/Inuvik"
 msgstr "ამერიკა/ინუიკი"
 
 #: ../calendar/zones.h:113
-#, fuzzy
 msgid "America/Iqaluit"
 msgstr "ამერიკა/იქალუიტი"
 
 #: ../calendar/zones.h:114
-#, fuzzy
 msgid "America/Jamaica"
 msgstr "ამერიკა/იამაიკა"
 
 #: ../calendar/zones.h:115
-#, fuzzy
 msgid "America/Jujuy"
 msgstr "ამერიკა/იუიუი"
 
 #: ../calendar/zones.h:116
-#, fuzzy
 msgid "America/Juneau"
 msgstr "ამერიკა/იუნო"
 
 #: ../calendar/zones.h:117
-#, fuzzy
 msgid "America/Kentucky/Louisville"
 msgstr "ამერიკა/კენტუკი/ლუიზვილი"
 
 #: ../calendar/zones.h:118
-#, fuzzy
 msgid "America/Kentucky/Monticello"
 msgstr "ამერიკა/კენტუკი/მონტიჩელო"
 
 #: ../calendar/zones.h:119
-#, fuzzy
 msgid "America/La_Paz"
 msgstr "ამერიკა/ლა-პაზი"
 
@@ -9428,72 +9783,58 @@ msgid "America/Lima"
 msgstr "ამერიკა/ლიმა"
 
 #: ../calendar/zones.h:121
-#, fuzzy
 msgid "America/Los_Angeles"
 msgstr "ამერიკა/ლოს_ანჯელესი"
 
 #: ../calendar/zones.h:122
-#, fuzzy
 msgid "America/Louisville"
 msgstr "ამერიკა/ლუიზვიილ"
 
 #: ../calendar/zones.h:123
-#, fuzzy
 msgid "America/Maceio"
 msgstr "ამერიკა/მასეიო"
 
 #: ../calendar/zones.h:124
-#, fuzzy
 msgid "America/Managua"
 msgstr "ამერიკა/მანაგუა"
 
 #: ../calendar/zones.h:125
-#, fuzzy
 msgid "America/Manaus"
 msgstr "ამერიკა/მანაუსი"
 
 #: ../calendar/zones.h:126
-#, fuzzy
 msgid "America/Martinique"
 msgstr "ამერიკა/მარტინიკე"
 
 #: ../calendar/zones.h:127
-#, fuzzy
 msgid "America/Mazatlan"
 msgstr "ამერიკა/მაზატლანი"
 
 #: ../calendar/zones.h:128
-#, fuzzy
 msgid "America/Mendoza"
 msgstr "ამერიკა/მენდოზა"
 
 #: ../calendar/zones.h:129
-#, fuzzy
 msgid "America/Menominee"
 msgstr "ამერიკა/მენომინე"
 
 #: ../calendar/zones.h:130
-#, fuzzy
 msgid "America/Merida"
 msgstr "ამერიკა/მერიდა"
 
 #: ../calendar/zones.h:131
-#, fuzzy
 msgid "America/Mexico_City"
-msgstr "ამერიკა/მეხიკო"
+msgstr "ამერიკა/მეხიკო _სითი"
 
 #: ../calendar/zones.h:132
-#, fuzzy
 msgid "America/Miquelon"
 msgstr "ამერიკა/მიქელონი"
 
 #: ../calendar/zones.h:133
-#, fuzzy
 msgid "America/Monterrey"
 msgstr "ამერიკა/მონტერეი"
 
 #: ../calendar/zones.h:134
-#, fuzzy
 msgid "America/Montevideo"
 msgstr "ამერიკა/მონტევიდეო"
 
@@ -9502,12 +9843,10 @@ msgid "America/Montreal"
 msgstr "ამერიკა/მონრეალი"
 
 #: ../calendar/zones.h:136
-#, fuzzy
 msgid "America/Montserrat"
 msgstr "ამერიკა/მონტსერატი"
 
 #: ../calendar/zones.h:137
-#, fuzzy
 msgid "America/Nassau"
 msgstr "ამერიკა/ნასაუ"
 
@@ -9517,7 +9856,6 @@ msgid "America/New_York"
 msgstr "ამერიკა/ნიუ_იორკი"
 
 #: ../calendar/zones.h:139
-#, fuzzy
 msgid "America/Nipigon"
 msgstr "ამერიკა/ნიპიგონი"
 
@@ -9526,12 +9864,10 @@ msgid "America/Nome"
 msgstr "ამერიკა/ნომე"
 
 #: ../calendar/zones.h:141
-#, fuzzy
 msgid "America/Noronha"
 msgstr "ამერიკა/ნორონჰა"
 
 #: ../calendar/zones.h:142
-#, fuzzy
 msgid "America/North_Dakota/Center"
 msgstr "ამერიკა/ჩრდ_დაკოტა/ცენტრი"
 
@@ -9540,127 +9876,102 @@ msgid "America/Panama"
 msgstr "ამერიკა/პანამა"
 
 #: ../calendar/zones.h:144
-#, fuzzy
 msgid "America/Pangnirtung"
 msgstr "ამერიკა/პანგრინტუნი"
 
 #: ../calendar/zones.h:145
-#, fuzzy
 msgid "America/Paramaribo"
 msgstr "ამერიკა/პარამარიბო"
 
 #: ../calendar/zones.h:146
-#, fuzzy
 msgid "America/Phoenix"
 msgstr "ამერიკა/ფენიქსი"
 
 #: ../calendar/zones.h:147
-#, fuzzy
 msgid "America/Port-au-Prince"
 msgstr "ამერიკა/პორტ-ო-პრინსი"
 
 #: ../calendar/zones.h:148
-#, fuzzy
 msgid "America/Port_of_Spain"
 msgstr "ამერიკა/სპეინ_პორტი"
 
 #: ../calendar/zones.h:149
-#, fuzzy
 msgid "America/Porto_Velho"
 msgstr "ამერიკა/პორტო_ველჰო"
 
 #: ../calendar/zones.h:150
-#, fuzzy
 msgid "America/Puerto_Rico"
 msgstr "ამერიკა/პუერტო_რიკო"
 
 #: ../calendar/zones.h:151
-#, fuzzy
 msgid "America/Rainy_River"
 msgstr "ამერიკა/რეინი_რივერი"
 
 #: ../calendar/zones.h:152
-#, fuzzy
 msgid "America/Rankin_Inlet"
 msgstr "ამერიკა/რანკინ_ინლეტი"
 
 #: ../calendar/zones.h:153
-#, fuzzy
 msgid "America/Recife"
 msgstr "ამერიკა/რესიფე"
 
 #: ../calendar/zones.h:154
-#, fuzzy
 msgid "America/Regina"
 msgstr "ამერიკა/რეჯინა"
 
 #: ../calendar/zones.h:155
-#, fuzzy
 msgid "America/Rio_Branco"
 msgstr "ამერიკა/რიო_ბრანკო"
 
 #: ../calendar/zones.h:156
-#, fuzzy
 msgid "America/Rosario"
 msgstr "ამერიკა/როსარიო"
 
 #: ../calendar/zones.h:157
-#, fuzzy
 msgid "America/Santiago"
 msgstr "ამერიკა/სანტიაგო"
 
 #: ../calendar/zones.h:158
-#, fuzzy
 msgid "America/Santo_Domingo"
 msgstr "ამერიკა/სანტო_დომინგო"
 
 #: ../calendar/zones.h:159
-#, fuzzy
 msgid "America/Sao_Paulo"
 msgstr "ამერიკა/სანპაულო"
 
 #: ../calendar/zones.h:160
-#, fuzzy
 msgid "America/Scoresbysund"
 msgstr "ამერიკა/სკორესბისუნდი"
 
 #: ../calendar/zones.h:161
-#, fuzzy
 msgid "America/Shiprock"
 msgstr "ამერიკა/სიპროკი"
 
 #: ../calendar/zones.h:162
-#, fuzzy
 msgid "America/St_Johns"
 msgstr "ამერიკა/სენტ_ჯონსი"
 
 #: ../calendar/zones.h:163
-#, fuzzy
 msgid "America/St_Kitts"
 msgstr "ამერიკა/სენტ_კიდსი"
 
 #: ../calendar/zones.h:164
-#, fuzzy
 msgid "America/St_Lucia"
 msgstr "ამერიკა/სენტ_ლუისი"
 
 #: ../calendar/zones.h:165
-#, fuzzy
 msgid "America/St_Thomas"
 msgstr "ამერიკა/სენტ_ტომასი"
 
 #: ../calendar/zones.h:166
-#, fuzzy
 msgid "America/St_Vincent"
-msgstr "ამერიკა/სენტ_ვისენტი"
+msgstr "ამერიკა/სენტ_ვინსენტი"
 
 #: ../calendar/zones.h:167
-#, fuzzy
 msgid "America/Swift_Current"
 msgstr "ამერიკა/სვიფტ_ქარენთი"
 
 #: ../calendar/zones.h:168
-#, fuzzy
 msgid "America/Tegucigalpa"
 msgstr "ამერიკა/ტეგუსიგალპა"
 
@@ -9669,47 +9980,38 @@ msgid "America/Thule"
 msgstr "ამერიკა/ტულე"
 
 #: ../calendar/zones.h:170
-#, fuzzy
 msgid "America/Thunder_Bay"
 msgstr "ამერიკა/სანდერ_ბეი"
 
 #: ../calendar/zones.h:171
-#, fuzzy
 msgid "America/Tijuana"
 msgstr "ამერიკა/ტიხუანა"
 
 #: ../calendar/zones.h:172
-#, fuzzy
 msgid "America/Tortola"
 msgstr "ამერიკა/ტორტოლა"
 
 #: ../calendar/zones.h:173
-#, fuzzy
 msgid "America/Vancouver"
 msgstr "ამერიკა/ვანკუვერი"
 
 #: ../calendar/zones.h:174
-#, fuzzy
 msgid "America/Whitehorse"
 msgstr "ამერიკა/ვიტჰორს"
 
 #: ../calendar/zones.h:175
-#, fuzzy
 msgid "America/Winnipeg"
 msgstr "ამერიკა/ვინიპეგი"
 
 #: ../calendar/zones.h:176
-#, fuzzy
 msgid "America/Yakutat"
 msgstr "ამერიკა/იაკუტა"
 
 #: ../calendar/zones.h:177
-#, fuzzy
 msgid "America/Yellowknife"
-msgstr "ამერიკა/იელოკნფტი"
+msgstr "ამერიკა/იელოუნაიფი"
 
 #: ../calendar/zones.h:178
-#, fuzzy
 msgid "Antarctica/Casey"
 msgstr "ანტარქტიდა/კეისი"
 
@@ -9718,42 +10020,34 @@ msgid "Antarctica/Davis"
 msgstr "ანტარქტიდა/დეივისი"
 
 #: ../calendar/zones.h:180
-#, fuzzy
 msgid "Antarctica/DumontDUrville"
-msgstr "ანტარქტიდა/დუმონტდურვილე"
+msgstr "ანტარქტიდა/დუმონტდურვილი"
 
 #: ../calendar/zones.h:181
-#, fuzzy
 msgid "Antarctica/Mawson"
 msgstr "ანტარქტიდა/მოუსონი"
 
 #: ../calendar/zones.h:182
-#, fuzzy
 msgid "Antarctica/McMurdo"
 msgstr "ანტარქტიდა/მაკმურდო"
 
 #: ../calendar/zones.h:183
-#, fuzzy
 msgid "Antarctica/Palmer"
 msgstr "ანტარქტიდა/პალმერი"
 
 #: ../calendar/zones.h:184
-#, fuzzy
 msgid "Antarctica/South_Pole"
 msgstr "ანტარქტიდა/სამხრეთ_პოლუსი"
 
 #: ../calendar/zones.h:185
-#, fuzzy
 msgid "Antarctica/Syowa"
 msgstr "ანტარქტიდა/სიოვა"
 
 #: ../calendar/zones.h:186
-#, fuzzy
 msgid "Antarctica/Vostok"
 msgstr "ანტარქტიდა/ვოსტოკი"
 
 #: ../calendar/zones.h:187
-#, fuzzy
 msgid "Arctic/Longyearbyen"
 msgstr "აცტეკი/ლონგიერბიენი"
 
@@ -9762,27 +10056,22 @@ msgid "Asia/Aden"
 msgstr "აზია/ადენი"
 
 #: ../calendar/zones.h:189
-#, fuzzy
 msgid "Asia/Almaty"
 msgstr "აზია/ალმაატა"
 
 #: ../calendar/zones.h:190
-#, fuzzy
 msgid "Asia/Amman"
 msgstr "აზია/ამანი"
 
 #: ../calendar/zones.h:191
-#, fuzzy
 msgid "Asia/Anadyr"
-msgstr "აზია/ანადირ"
+msgstr "აზია/ანადირი"
 
 #: ../calendar/zones.h:192
-#, fuzzy
 msgid "Asia/Aqtau"
 msgstr "აზია/აქტაუ"
 
 #: ../calendar/zones.h:193
-#, fuzzy
 msgid "Asia/Aqtobe"
 msgstr "აზია/აქტობა"
 
@@ -9795,7 +10084,6 @@ msgid "Asia/Baghdad"
 msgstr "აზია/ბაღდადი"
 
 #: ../calendar/zones.h:196
-#, fuzzy
 msgid "Asia/Bahrain"
 msgstr "აზია/ბაჰრეინი"
 
@@ -9816,7 +10104,6 @@ msgid "Asia/Bishkek"
 msgstr "აზია/ბიშკეკი"
 
 #: ../calendar/zones.h:201
-#, fuzzy
 msgid "Asia/Brunei"
 msgstr "აზია/ბრუნეი"
 
@@ -9825,12 +10112,10 @@ msgid "Asia/Calcutta"
 msgstr "აზია/კალკუტა"
 
 #: ../calendar/zones.h:203
-#, fuzzy
 msgid "Asia/Choibalsan"
 msgstr "აზია/ჩოიბალსანი"
 
 #: ../calendar/zones.h:204
-#, fuzzy
 msgid "Asia/Chongqing"
 msgstr "აზია/ჩუცინი"
 
@@ -9839,12 +10124,10 @@ msgid "Asia/Colombo"
 msgstr "აზია/კოლომბო"
 
 #: ../calendar/zones.h:206
-#, fuzzy
 msgid "Asia/Damascus"
 msgstr "აზია/დამასკო"
 
 #: ../calendar/zones.h:207
-#, fuzzy
 msgid "Asia/Dhaka"
 msgstr "აზია/დაკა"
 
@@ -9861,12 +10144,10 @@ msgid "Asia/Dushanbe"
 msgstr "აზია/დუშანბე"
 
 #: ../calendar/zones.h:211
-#, fuzzy
 msgid "Asia/Gaza"
 msgstr "აზია/ღაზა"
 
 #: ../calendar/zones.h:212
-#, fuzzy
 msgid "Asia/Harbin"
 msgstr "აზია/ჰარბინი"
 
@@ -9875,7 +10156,6 @@ msgid "Asia/Hong_Kong"
 msgstr "აზია/ჰონგ_კონგი"
 
 #: ../calendar/zones.h:214
-#, fuzzy
 msgid "Asia/Hovd"
 msgstr "აზია/ჰოვდი"
 
@@ -9892,7 +10172,6 @@ msgid "Asia/Jakarta"
 msgstr "აზია/ჯაკარტა"
 
 #: ../calendar/zones.h:218
-#, fuzzy
 msgid "Asia/Jayapura"
 msgstr "აზია/ჯაიაპურა"
 
@@ -9909,32 +10188,26 @@ msgid "Asia/Kamchatka"
 msgstr "აზია/კამჩატკა"
 
 #: ../calendar/zones.h:222
-#, fuzzy
 msgid "Asia/Karachi"
 msgstr "აზია/კარაჩი"
 
 #: ../calendar/zones.h:223
-#, fuzzy
 msgid "Asia/Kashgar"
 msgstr "აზია/ყაშგარი"
 
 #: ../calendar/zones.h:224
-#, fuzzy
 msgid "Asia/Katmandu"
 msgstr "აზია/კატმანდუ"
 
 #: ../calendar/zones.h:225
-#, fuzzy
 msgid "Asia/Krasnoyarsk"
 msgstr "აზია/კრასნოიარსკი"
 
 #: ../calendar/zones.h:226
-#, fuzzy
 msgid "Asia/Kuala_Lumpur"
 msgstr "აზია/კუალა_ლიმპური"
 
 #: ../calendar/zones.h:227
-#, fuzzy
 msgid "Asia/Kuching"
 msgstr "აზია/კუჩინი"
 
@@ -9955,7 +10228,6 @@ msgid "Asia/Magadan"
 msgstr "აზია/მაგადანი"
 
 #: ../calendar/zones.h:232
-#, fuzzy
 msgid "Asia/Makassar"
 msgstr "აზია/მაქასარი"
 
@@ -9964,7 +10236,6 @@ msgid "Asia/Manila"
 msgstr "აზია/მანილა"
 
 #: ../calendar/zones.h:234
-#, fuzzy
 msgid "Asia/Muscat"
 msgstr "აზია/მუსკატი"
 
@@ -9985,37 +10256,30 @@ msgid "Asia/Oral"
 msgstr "აზია/ორალი"
 
 #: ../calendar/zones.h:239
-#, fuzzy
 msgid "Asia/Phnom_Penh"
 msgstr "აზია/პნომპენი"
 
 #: ../calendar/zones.h:240
-#, fuzzy
 msgid "Asia/Pontianak"
 msgstr "აზია/პონტიანაკი"
 
 #: ../calendar/zones.h:241
-#, fuzzy
 msgid "Asia/Pyongyang"
 msgstr "აზია/პიონგიანგი"
 
 #: ../calendar/zones.h:242
-#, fuzzy
 msgid "Asia/Qatar"
-msgstr "აზია/კატარი"
+msgstr "აზია/ქატარი"
 
 #: ../calendar/zones.h:243
-#, fuzzy
 msgid "Asia/Qyzylorda"
 msgstr "აზია/ყიზილორდა"
 
 #: ../calendar/zones.h:244
-#, fuzzy
 msgid "Asia/Rangoon"
 msgstr "აზია/რანგონი"
 
 #: ../calendar/zones.h:245
-#, fuzzy
 msgid "Asia/Riyadh"
 msgstr "აზია/ერრიადი"
 
@@ -10028,12 +10292,10 @@ msgid "Asia/Sakhalin"
 msgstr "აზია/სახალინი"
 
 #: ../calendar/zones.h:248
-#, fuzzy
 msgid "Asia/Samarkand"
 msgstr "აზია/სამარყანდი"
 
 #: ../calendar/zones.h:249
-#, fuzzy
 msgid "Asia/Seoul"
 msgstr "აზია/სეული"
 
@@ -10058,12 +10320,10 @@ msgid "Asia/Tbilisi"
 msgstr "აზია/თბილისი"
 
 #: ../calendar/zones.h:255
-#, fuzzy
 msgid "Asia/Tehran"
 msgstr "აზია/თეირანი"
 
 #: ../calendar/zones.h:256
-#, fuzzy
 msgid "Asia/Thimphu"
 msgstr "აზია/ტიმფუ"
 
@@ -10072,22 +10332,18 @@ msgid "Asia/Tokyo"
 msgstr "აზია/ტოკიო"
 
 #: ../calendar/zones.h:258
-#, fuzzy
 msgid "Asia/Ujung_Pandang"
 msgstr "აზია/უჯუნ_პანდანგი"
 
 #: ../calendar/zones.h:259
-#, fuzzy
 msgid "Asia/Ulaanbaatar"
 msgstr "აზია/ულანბატორი"
 
 #: ../calendar/zones.h:260
-#, fuzzy
 msgid "Asia/Urumqi"
 msgstr "აზია/ურუმქი"
 
 #: ../calendar/zones.h:261
-#, fuzzy
 msgid "Asia/Vientiane"
 msgstr "აზია/ვიენტიანა"
 
@@ -10100,7 +10356,6 @@ msgid "Asia/Yakutsk"
 msgstr "აზია/იაკუტსკი"
 
 #: ../calendar/zones.h:264
-#, fuzzy
 msgid "Asia/Yekaterinburg"
 msgstr "აზია/ეკატერინბურგი"
 
@@ -10109,32 +10364,26 @@ msgid "Asia/Yerevan"
 msgstr "აზია/ერევანი"
 
 #: ../calendar/zones.h:266
-#, fuzzy
 msgid "Atlantic/Azores"
 msgstr "ატლანტიკა/აზორები"
 
 #: ../calendar/zones.h:267
-#, fuzzy
 msgid "Atlantic/Bermuda"
-msgstr "ატლანტიკა/ბერმუდი"
+msgstr "ატლანტიკა/ბერმუდა"
 
 #: ../calendar/zones.h:268
-#, fuzzy
 msgid "Atlantic/Canary"
 msgstr "ატლანტიკა/კანარი"
 
 #: ../calendar/zones.h:269
-#, fuzzy
 msgid "Atlantic/Cape_Verde"
-msgstr "ატლანტიკა/კაპე-ვერდე"
+msgstr "ატლანტიკა/მწვანე-კონცხი"
 
 #: ../calendar/zones.h:270
-#, fuzzy
 msgid "Atlantic/Faeroe"
 msgstr "ატლანტიკა/ფარერები"
 
 #: ../calendar/zones.h:271
-#, fuzzy
 msgid "Atlantic/Jan_Mayen"
 msgstr "ატლანტიკა/იან_მაიენი"
 
@@ -10143,7 +10392,6 @@ msgid "Atlantic/Madeira"
 msgstr "ატლანტიკა/მედეირა"
 
 #: ../calendar/zones.h:273
-#, fuzzy
 msgid "Atlantic/Reykjavik"
 msgstr "ატლანტიკა/რეიკიავიკი"
 
@@ -10152,57 +10400,46 @@ msgid "Atlantic/South_Georgia"
 msgstr "ატლანტიკა/სამხრეთ ჯორჯია"
 
 #: ../calendar/zones.h:275
-#, fuzzy
 msgid "Atlantic/St_Helena"
-msgstr "ატლანტიკა/წმ.ელენე"
+msgstr "ატლანტიკა/წმ._ელენე"
 
 #: ../calendar/zones.h:276
-#, fuzzy
 msgid "Atlantic/Stanley"
 msgstr "ატლანტიკა/სტენლი"
 
 #: ../calendar/zones.h:277
-#, fuzzy
 msgid "Australia/Adelaide"
 msgstr "ავსტრალია/ადელაიდა"
 
 #: ../calendar/zones.h:278
-#, fuzzy
 msgid "Australia/Brisbane"
 msgstr "ავსტრალია/ბრისბენი"
 
 #: ../calendar/zones.h:279
-#, fuzzy
 msgid "Australia/Broken_Hill"
 msgstr "ავსტრალია/ბროკენ-ჰილი"
 
 #: ../calendar/zones.h:280
-#, fuzzy
 msgid "Australia/Darwin"
 msgstr "ავსტრალია/დარვინი"
 
 #: ../calendar/zones.h:281
-#, fuzzy
 msgid "Australia/Hobart"
 msgstr "ავსტრალია/ჰაბარტო"
 
 #: ../calendar/zones.h:282
-#, fuzzy
 msgid "Australia/Lindeman"
 msgstr "ავსტრალია/ლინდემანი"
 
 #: ../calendar/zones.h:283
-#, fuzzy
 msgid "Australia/Lord_Howe"
 msgstr "ავსტრალია/ლორდ-ჰოვე"
 
 #: ../calendar/zones.h:284
-#, fuzzy
 msgid "Australia/Melbourne"
 msgstr "ავსტრალია/მელბურნი"
 
 #: ../calendar/zones.h:285
-#, fuzzy
 msgid "Australia/Perth"
 msgstr "ავსტრალია/პერტი"
 
@@ -10223,7 +10460,6 @@ msgid "Europe/Athens"
 msgstr "ევრობა/ათენი"
 
 #: ../calendar/zones.h:290
-#, fuzzy
 msgid "Europe/Belfast"
 msgstr "ევროპა/ბელფასტი"
 
@@ -10252,7 +10488,6 @@ msgid "Europe/Budapest"
 msgstr "ევროპა/ბუდაპეშტი"
 
 #: ../calendar/zones.h:297
-#, fuzzy
 msgid "Europe/Chisinau"
 msgstr "ევროპა/ნიკოსია"
 
@@ -10289,7 +10524,6 @@ msgid "Europe/Lisbon"
 msgstr "ევროპა/ლისაბონი"
 
 #: ../calendar/zones.h:306
-#, fuzzy
 msgid "Europe/Ljubljana"
 msgstr "ევროპა/ლიუბლიანა"
 
@@ -10358,12 +10592,10 @@ msgid "Europe/Sarajevo"
 msgstr "ევროპა/სარაევო"
 
 #: ../calendar/zones.h:323
-#, fuzzy
 msgid "Europe/Simferopol"
 msgstr "ევროპა/სიმფეროპოლი"
 
 #: ../calendar/zones.h:324
-#, fuzzy
 msgid "Europe/Skopje"
 msgstr "ევროპა/სკოპლე"
 
@@ -10380,17 +10612,14 @@ msgid "Europe/Tallinn"
 msgstr "ევროპა/ტალინი"
 
 #: ../calendar/zones.h:328
-#, fuzzy
 msgid "Europe/Tirane"
 msgstr "ევროპა/ტირანე"
 
 #: ../calendar/zones.h:329
-#, fuzzy
 msgid "Europe/Uzhgorod"
 msgstr "ევროპა/უჟგოროდი"
 
 #: ../calendar/zones.h:330
-#, fuzzy
 msgid "Europe/Vaduz"
 msgstr "ევროპა/ვადუცი"
 
@@ -10403,7 +10632,6 @@ msgid "Europe/Vienna"
 msgstr "ევროპა/ვენა"
 
 #: ../calendar/zones.h:333
-#, fuzzy
 msgid "Europe/Vilnius"
 msgstr "ევროპა/ვილნიუსი"
 
@@ -10412,7 +10640,6 @@ msgid "Europe/Warsaw"
 msgstr "ევროპა/ვარშავა"
 
 #: ../calendar/zones.h:335
-#, fuzzy
 msgid "Europe/Zagreb"
 msgstr "ევროპა/ზაგრები"
 
@@ -10425,90 +10652,76 @@ msgid "Europe/Zurich"
 msgstr "ევროპა/ციურიხი"
 
 #: ../calendar/zones.h:338
+#, fuzzy
 msgid "Indian/Antananarivo"
-msgstr ""
+msgstr "ინდოეთის ოკიანე/ანტანანარივო"
 
 #: ../calendar/zones.h:339
-#, fuzzy
 msgid "Indian/Chagos"
 msgstr "ინდოეთის ოკიანე/ჩაგოსი"
 
 #: ../calendar/zones.h:340
+#, fuzzy
 msgid "Indian/Christmas"
-msgstr ""
+msgstr "ინდოეთის ოკიანე/შობა"
 
 #: ../calendar/zones.h:341
-#, fuzzy
 msgid "Indian/Cocos"
 msgstr "ინდოეთის ოკიანე/ქოქოსი"
 
 #: ../calendar/zones.h:342
-#, fuzzy
 msgid "Indian/Comoro"
 msgstr "ინდოეთის ოკიანე/კომორო"
 
 #: ../calendar/zones.h:343
-#, fuzzy
 msgid "Indian/Kerguelen"
 msgstr "ინდოეთის ოკიანე/კერგუელენი"
 
 #: ../calendar/zones.h:344
-#, fuzzy
 msgid "Indian/Mahe"
 msgstr "ინდოეთის ოკიანე/მაჰე"
 
 #: ../calendar/zones.h:345
-#, fuzzy
 msgid "Indian/Maldives"
 msgstr "ინდოეთის ოკიანე/მალდივები"
 
 #: ../calendar/zones.h:346
-#, fuzzy
 msgid "Indian/Mauritius"
 msgstr "ინდოეთის ოკიანე/მაურიციუსი"
 
 #: ../calendar/zones.h:347
-#, fuzzy
 msgid "Indian/Mayotte"
 msgstr "ინდოეთის ოკიანე/მაიოტტა"
 
 #: ../calendar/zones.h:348
-#, fuzzy
 msgid "Indian/Reunion"
 msgstr "ინდოეთის ოკიანე/რეუნიონი"
 
 #: ../calendar/zones.h:349
-#, fuzzy
 msgid "Pacific/Apia"
 msgstr "წყნარი ოკეანე/აპია"
 
 #: ../calendar/zones.h:350
-#, fuzzy
 msgid "Pacific/Auckland"
 msgstr "წყნარი ოკეანე/ოკლენდი"
 
 #: ../calendar/zones.h:351
-#, fuzzy
 msgid "Pacific/Chatham"
 msgstr "წყნარი ოკეანე/ჩათამი"
 
 #: ../calendar/zones.h:352
-#, fuzzy
 msgid "Pacific/Easter"
 msgstr "წყნარი ოკეანე/ისტერი"
 
 #: ../calendar/zones.h:353
-#, fuzzy
 msgid "Pacific/Efate"
 msgstr "წყნარი ოკეანე/ეფატე"
 
 #: ../calendar/zones.h:354
-#, fuzzy
 msgid "Pacific/Enderbury"
 msgstr "წყნარი ოკეანე/ენდერბარი"
 
 #: ../calendar/zones.h:355
-#, fuzzy
 msgid "Pacific/Fakaofo"
 msgstr "წყნარი ოკეანე/ფაკაოფო"
 
@@ -10517,7 +10730,6 @@ msgid "Pacific/Fiji"
 msgstr "წყნარი ოკეანე/ფიჯი"
 
 #: ../calendar/zones.h:357
-#, fuzzy
 msgid "Pacific/Funafuti"
 msgstr "წყნარი ოკეანე/ფუნაფუტი"
 
@@ -10526,12 +10738,10 @@ msgid "Pacific/Galapagos"
 msgstr "წყნარი ოკეანე/გალაპაგოსი"
 
 #: ../calendar/zones.h:359
-#, fuzzy
 msgid "Pacific/Gambier"
 msgstr "წყნარი ოკეანე/გამბიერი"
 
 #: ../calendar/zones.h:360
-#, fuzzy
 msgid "Pacific/Guadalcanal"
 msgstr "წყნარი ოკეანე/გუადალკანალი"
 
@@ -10540,132 +10750,106 @@ msgid "Pacific/Guam"
 msgstr "წყნარი ოკეანე/გუამი"
 
 #: ../calendar/zones.h:362
-#, fuzzy
 msgid "Pacific/Honolulu"
 msgstr "წყნარი ოკეანე/ჰონოლულუ"
 
 #: ../calendar/zones.h:363
-#, fuzzy
 msgid "Pacific/Johnston"
 msgstr "წყნარი ოკეანე/ჯონსტონი"
 
 #: ../calendar/zones.h:364
-#, fuzzy
 msgid "Pacific/Kiritimati"
 msgstr "წყნარი ოკეანე/კირიტიმატი"
 
 #: ../calendar/zones.h:365
-#, fuzzy
 msgid "Pacific/Kosrae"
 msgstr "წყნარი ოკეანე/კოსრე"
 
 #: ../calendar/zones.h:366
-#, fuzzy
 msgid "Pacific/Kwajalein"
 msgstr "წყნარი ოკეანე/კაჯალეინ"
 
 #: ../calendar/zones.h:367
-#, fuzzy
 msgid "Pacific/Majuro"
 msgstr "წყნარი ოკეანე/მაჯურო"
 
 #: ../calendar/zones.h:368
-#, fuzzy
 msgid "Pacific/Marquesas"
 msgstr "წყნარი ოკეანე/მარკიზები"
 
 #: ../calendar/zones.h:369
-#, fuzzy
 msgid "Pacific/Midway"
 msgstr "წყნარი ოკეანე/მიდვეი"
 
 #: ../calendar/zones.h:370
-#, fuzzy
 msgid "Pacific/Nauru"
 msgstr "წყნარი ოკეანე/ნაურუ"
 
 #: ../calendar/zones.h:371
-#, fuzzy
 msgid "Pacific/Niue"
 msgstr "წყნარი ოკეანე/ნიუე"
 
 #: ../calendar/zones.h:372
-#, fuzzy
 msgid "Pacific/Norfolk"
 msgstr "წყნარი ოკეანე/ნორფოლკი"
 
 #: ../calendar/zones.h:373
-#, fuzzy
 msgid "Pacific/Noumea"
 msgstr "წყნარი ოკეანე/ნოუმეა"
 
 #: ../calendar/zones.h:374
-#, fuzzy
 msgid "Pacific/Pago_Pago"
 msgstr "წყნარი ოკეანე/პაგო_პაგო"
 
 #: ../calendar/zones.h:375
-#, fuzzy
 msgid "Pacific/Palau"
-msgstr "წყნარი ოკეანე/პალა"
+msgstr "წყნარი ოკეანე/პალაუ"
 
 #: ../calendar/zones.h:376
-#, fuzzy
 msgid "Pacific/Pitcairn"
 msgstr "წყნარი ოკეანე/პიტკერნი"
 
 #: ../calendar/zones.h:377
-#, fuzzy
 msgid "Pacific/Ponape"
 msgstr "წყნარი ოკეანე/პანაპე"
 
 #: ../calendar/zones.h:378
-#, fuzzy
 msgid "Pacific/Port_Moresby"
-msgstr "წყნარი ოკეანე/პორტ_მორესბი"
+msgstr "წყნარი ოკეანე/პორტ_მორესბი "
 
 #: ../calendar/zones.h:379
-#, fuzzy
 msgid "Pacific/Rarotonga"
 msgstr "წყნარი ოკეანე/რაროტონგა"
 
 #: ../calendar/zones.h:380
-#, fuzzy
 msgid "Pacific/Saipan"
 msgstr "წყნარი ოკეანე/საიპანი"
 
 #: ../calendar/zones.h:381
-#, fuzzy
 msgid "Pacific/Tahiti"
 msgstr "წყნარი ოკეანე/ტაიტი"
 
 #: ../calendar/zones.h:382
-#, fuzzy
 msgid "Pacific/Tarawa"
 msgstr "წყნარი ოკეანე/ტარავა"
 
 #: ../calendar/zones.h:383
-#, fuzzy
 msgid "Pacific/Tongatapu"
 msgstr "წყნარი ოკეანე/ტონგატაბუ"
 
 #: ../calendar/zones.h:384
-#, fuzzy
 msgid "Pacific/Truk"
 msgstr "წყნარი ოკეანე/ტრუკი"
 
 #: ../calendar/zones.h:385
-#, fuzzy
 msgid "Pacific/Wake"
-msgstr "წყნარი ოკეანე/ვაკე"
+msgstr "წყნარი ოკეანე/ვეიქი"
 
 #: ../calendar/zones.h:386
-#, fuzzy
 msgid "Pacific/Wallis"
 msgstr "წყნარი ოკეანე/ვალისი"
 
 #: ../calendar/zones.h:387
-#, fuzzy
 msgid "Pacific/Yap"
 msgstr "წყნარი ოკეანე/იაპი"
 
@@ -10688,7 +10872,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr ""
 
@@ -10699,15 +10883,17 @@ msgstr ""
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
 #: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
+#, fuzzy
 msgid "Cannot attach file %s: %s"
-msgstr ""
+msgstr "მიმაგრება ფაილი წმ წმ"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
+#, fuzzy
 msgid "Cannot attach file %s: not a regular file"
-msgstr ""
+msgstr "მიმაგრება ფაილი წმ არა a წესიერი ფაილი"
 
 #: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
@@ -10716,7 +10902,7 @@ msgstr ""
 #: ../composer/e-msg-composer-hdrs.c:558
 #, fuzzy
 msgid "Choose folders to post the message to."
-msgstr "არჩევა -სკენ -სკენ."
+msgstr "-სკენ -სკენ."
 
 #: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
@@ -10730,9 +10916,8 @@ msgstr ""
 #. * expects the reply_to fields to be initialized.
 #.
 #: ../composer/e-msg-composer-hdrs.c:619
-#, fuzzy
 msgid "_Reply-To:"
-msgstr "პასუხი ვის:"
+msgstr "პ_ასუხი ვის:"
 
 #.
 #. * From
@@ -10755,28 +10940,31 @@ msgid "_To:"
 msgstr "_ვის:"
 
 #: ../composer/e-msg-composer-hdrs.c:643
+#, fuzzy
 msgid "Enter the recipients of the message"
-msgstr ""
+msgstr "შეყვანა -"
 
 #: ../composer/e-msg-composer-hdrs.c:646
+#, fuzzy
 msgid "_Cc:"
-msgstr ""
+msgstr "ასლი:"
 
 #: ../composer/e-msg-composer-hdrs.c:647
 #, fuzzy
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "a კოპია"
+msgstr "შეყვანა a კოპირება -"
 
 #: ../composer/e-msg-composer-hdrs.c:650
+#, fuzzy
 msgid "_Bcc:"
-msgstr ""
+msgstr "უხილავი ასლი:"
 
 #: ../composer/e-msg-composer-hdrs.c:651
 #, fuzzy
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "a კოპია."
+msgstr "შეყვანა a კოპირება - - სია -."
 
 #.
 #. * Post-To
@@ -10797,34 +10985,37 @@ msgid "Post To:"
 msgstr "ვის:"
 
 #: ../composer/e-msg-composer-select-file.c:82
+#, fuzzy
 msgid "A_ttach"
-msgstr ""
+msgstr "A"
 
 #: ../composer/e-msg-composer-select-file.c:239
 #, fuzzy
 msgid "Insert Attachment"
-msgstr "არა"
+msgstr "ჩამატება"
 
 #: ../composer/e-msg-composer.c:828
+#, fuzzy
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
+msgstr "გამავალი არა ანგარიში"
 
 #: ../composer/e-msg-composer.c:835
+#, fuzzy
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr ""
+msgstr "გამავალი არა ანგარიში"
 
 #: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 #, fuzzy
 msgid "Hide _Attachment Bar"
-msgstr "არა"
+msgstr "დამალვა"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
 #: ../composer/e-msg-composer.c:3865
 #, fuzzy
 msgid "Show _Attachment Bar"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
@@ -10832,12 +11023,14 @@ msgid "Unknown reason"
 msgstr "უცნობი მიზეზი"
 
 #: ../composer/e-msg-composer.c:1402
+#, fuzzy
 msgid "Could not open file"
-msgstr ""
+msgstr "არა გახსნა ფაილი"
 
 #: ../composer/e-msg-composer.c:1410
+#, fuzzy
 msgid "Unable to retrieve message from editor"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
@@ -10861,34 +11054,38 @@ msgstr ""
 #: ../composer/e-msg-composer.c:3750
 #, fuzzy
 msgid "Compose Message"
-msgstr "შეტყობინება"
+msgstr "შექმნა შეტყობინება"
 
 #: ../composer/e-msg-composer.c:4974
+#, fuzzy
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr ""
+msgstr "<b> შეიცავს a ტექსტი<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 #, fuzzy
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
-msgstr "აგზავნის -სკენ "
+msgstr "გაგზავნა ფოსტა ფოსტა -სკენ გაგზავნილი "
 
 #: ../composer/mail-composer.error.xml.h:2
+#, fuzzy
 msgid "All accounts have been removed."
-msgstr ""
+msgstr "ყველა ანგარიშები."
 
 #: ../composer/mail-composer.error.xml.h:3
+#, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr ""
+msgstr "-სკენ?"
 
 #: ../composer/mail-composer.error.xml.h:4
+#, fuzzy
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
+msgstr "&quot;&quot; -სკენ ფოსტა."
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:19
@@ -10896,75 +11093,90 @@ msgid "Because &quot;{1}&quot;."
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
+#, fuzzy
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr ""
+msgstr "ფანჯარა -სკენ შენახვა - -სკენ ეთ a თარიღი."
 
 #: ../composer/mail-composer.error.xml.h:7
+#, fuzzy
 msgid "Could not create composer window."
-msgstr ""
+msgstr "არა ფანჯარა."
 
 #: ../composer/mail-composer.error.xml.h:8
+#, fuzzy
 msgid "Could not create message."
-msgstr ""
+msgstr "არა."
 
 #: ../composer/mail-composer.error.xml.h:9
+#, fuzzy
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr ""
+msgstr "არა ფაილი&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:10
+#, fuzzy
 msgid "Could not retrieve messages to attach from {0}."
-msgstr ""
+msgstr "არა -სკენ მიმაგრება."
 
 #: ../composer/mail-composer.error.xml.h:11
+#, fuzzy
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr ""
+msgstr "არა შენახვა -სკენ ფაილი&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:12
+#, fuzzy
 msgid "Directories can not be attached to Messages."
-msgstr ""
+msgstr "დირექტორიები არა -სკენ შეტყობინებები."
 
 #: ../composer/mail-composer.error.xml.h:13
+#, fuzzy
 msgid "Do you want to recover unfinished messages?"
-msgstr ""
+msgstr "-სკენ?"
 
 #: ../composer/mail-composer.error.xml.h:14
+#, fuzzy
 msgid "Download in progress. Do you want to send the mail?"
-msgstr ""
+msgstr "ჩამოტვირთვა - -სკენ ფოსტა?"
 
 #: ../composer/mail-composer.error.xml.h:15
+#, fuzzy
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr ""
+msgstr "შეცდომა -სკენ&quot;&quot;."
 
 #: ../composer/mail-composer.error.xml.h:16
+#, fuzzy
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
-msgstr ""
+msgstr "Evolution დასრულება a ახალი -სკენ მარცხენა გამორთულია."
 
 #: ../composer/mail-composer.error.xml.h:17
+#, fuzzy
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+msgstr "ფაილი არა a წესიერი ფაილი და გაგზავნილი - a."
 
 #: ../composer/mail-composer.error.xml.h:18
+#, fuzzy
 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 ""
+msgstr "ვის მიმაგრება - მიმაგრება ფაილი - ან - და მიმაგრება."
 
 #: ../composer/mail-composer.error.xml.h:19
+#, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
 "Please make sure that you have the correct version of gtkhtml and libgtkhtml "
 "installed."
-msgstr ""
+msgstr "-სკენ HTML არა - და."
 
 #: ../composer/mail-composer.error.xml.h:22
+#, fuzzy
 msgid "Unable to activate the address selector control."
-msgstr ""
+msgstr "-სკენ ამრჩევი."
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
@@ -10973,20 +11185,22 @@ msgstr ""
 #: ../composer/mail-composer.error.xml.h:24
 #, fuzzy
 msgid "Warning: Modified Message"
-msgstr "გაფრთხილება შეცვლილია შეტყობინება"
+msgstr "გაფრთხილება ჩასწორებულია შეტყობინება"
 
 #: ../composer/mail-composer.error.xml.h:25
+#, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
-msgstr ""
+msgstr "თქვენ მიმაგრება ფაილი -სკენ."
 
 #: ../composer/mail-composer.error.xml.h:26
+#, fuzzy
 msgid "You need to configure an account before you can compose mail."
-msgstr ""
+msgstr "თქვენ -სკენ ანგარიში ფოსტა."
 
 #: ../composer/mail-composer.error.xml.h:28
 #, fuzzy
 msgid "_Do not Recover"
-msgstr "წაშლა"
+msgstr "არა"
 
 #: ../composer/mail-composer.error.xml.h:29
 #, fuzzy
@@ -10994,48 +11208,50 @@ 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:514
 msgid "Evolution"
-msgstr "ევოლუშენ"
+msgstr "ევოლუშენი"
 
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
 msgid "Groupware Suite"
 msgstr ""
 
 #: ../data/evolution.desktop.in.in.h:3
+#, fuzzy
 msgid "The Evolution PIM and Email Client"
-msgstr ""
+msgstr "Evolution და ელფოსტა კლიენტი"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr ""
 
 #: ../data/evolution.keys.in.in.h:2
+#, fuzzy
 msgid "calendar information"
-msgstr ""
+msgstr "კალენდარი"
 
 #: ../designs/OOA/ooa.glade.h:1
+#, fuzzy
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
 "\n"
 "Would you like to change your status to \"In the Office\"? "
-msgstr ""
+msgstr "<b> - ოფისი</b> არა -სკენ -სკენ ოფისი "
 
 #: ../designs/OOA/ooa.glade.h:4
 #, fuzzy
 msgid "<b>Out of Office Message:</b>"
-msgstr "<b> ოფისი შეტყობინება</b>"
+msgstr "<b> - ოფისი შეტყობინება</b>"
 
 #: ../designs/OOA/ooa.glade.h:5
 #, fuzzy
 msgid "<b>Status:</b>"
-msgstr "<b>სტატუსი:</b>"
+msgstr "<b> სტატუსი</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 #, fuzzy
@@ -11043,31 +11259,32 @@ msgid ""
 "<small>The message specified below will be automatically sent to each person "
 "who sends\n"
 "mail to you while you are out of the office.</small>"
-msgstr "<small> -სკენ -სკენ</small>"
+msgstr "<small> გაგზავნილი -სკენ პირადი ფორმა ვინ -სკენ -</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
 #, fuzzy
 msgid "I am currently in the office"
-msgstr "I am"
+msgstr "I am -"
 
 #: ../designs/OOA/ooa.glade.h:9
 #, fuzzy
 msgid "I am currently out of the office"
-msgstr "I am"
+msgstr "I am -"
 
 #: ../designs/OOA/ooa.glade.h:10
+#, fuzzy
 msgid "No, Do not Change Status"
-msgstr ""
+msgstr "არა არა შეცვლა სტატუსი"
 
 #: ../designs/OOA/ooa.glade.h:12
 #, fuzzy
 msgid "Out of Office Assistant"
-msgstr "ოფისი ასისტენტი"
+msgstr "- ოფისი ასისტენტი"
 
 #: ../designs/OOA/ooa.glade.h:13
 #, fuzzy
 msgid "Yes, Change Status"
-msgstr "კი, შეცვალე სტატუსი"
+msgstr "დიახ შეცვლა სტატუსი"
 
 #: ../designs/read_receipts/read.glade.h:1
 #, fuzzy
@@ -11077,57 +11294,65 @@ msgstr "    "
 #: ../designs/read_receipts/read.glade.h:2
 #, fuzzy
 msgid "<b>Receiving Email</b>"
-msgstr "<b> ღებულობს Email</b>"
+msgstr "<b> მიღება ელფოსტა</b>"
 
 #: ../designs/read_receipts/read.glade.h:3
 #, fuzzy
 msgid "<b>Sending Email:</b>"
-msgstr "<b> აგზავნის Email</b>"
+msgstr "<b> გაგზავნა ელფოსტა</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
+#, fuzzy
 msgid ""
 "<small>This page allows you to choose if you want to be notified via a read "
 "receipt when a message you\n"
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
-msgstr ""
+msgstr "<small> პანელი -სკენ -სკენ a a და -სკენ Evolution a</small>"
 
 #: ../designs/read_receipts/read.glade.h:6
+#, fuzzy
 msgid "Always send back a read receipt"
-msgstr ""
+msgstr "ყოველთვის a"
 
 #: ../designs/read_receipts/read.glade.h:7
+#, fuzzy
 msgid "Ask me if I want to send back a read receipt"
-msgstr ""
+msgstr "კითხვა I -სკენ a"
 
 #: ../designs/read_receipts/read.glade.h:8
+#, fuzzy
 msgid "Never send back a read receipt"
-msgstr ""
+msgstr "არასოდეს a"
 
 #: ../designs/read_receipts/read.glade.h:9
 #, fuzzy
 msgid "Read Receipts"
-msgstr "წაკითხული"
+msgstr "წაკითხვა"
 
 #: ../designs/read_receipts/read.glade.h:10
+#, fuzzy
 msgid "Request a read receipt for all messages I send"
-msgstr ""
+msgstr "a ყველა I"
 
 #: ../designs/read_receipts/read.glade.h:11
+#, fuzzy
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr ""
+msgstr "გაგზავნილი -სკენ a სია და არა -სკენ"
 
 #: ../designs/read_receipts/read.glade.h:12
+#, fuzzy
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr ""
+msgstr "ელფოსტა a Evolution?"
 
 #: ../e-util/e-dialog-utils.c:281
+#, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
-msgstr ""
+msgstr "A ფაილი სახელი?"
 
 #: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 #, fuzzy
@@ -11149,29 +11374,32 @@ msgstr "ევოლუშენ ინფორმაცია"
 #: ../e-util/e-error.c:126
 #, fuzzy
 msgid "Evolution Query"
-msgstr "Evolution"
+msgstr "Evolution გამოკითხვა"
 
 #. setup a dummy error
 #: ../e-util/e-error.c:443
 #, fuzzy, c-format
 msgid "Internal error, unknown error '%s' requested"
-msgstr "შეცდომა უცნობი შეცდომა"
+msgstr "შეცდომა უცნობი შეცდომა წმ მოთხოვნილი"
 
 #: ../e-util/e-system.error.xml.h:2
+#, fuzzy
 msgid "Cannot open file &quot;{0}&quot;."
-msgstr ""
+msgstr "გახსნა ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:3
+#, fuzzy
 msgid "Cannot save file &quot;{0}&quot;."
-msgstr ""
+msgstr "შენახვა ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
 msgstr "გსურთ გადააწეროთ ზემოდან ?"
 
 #: ../e-util/e-system.error.xml.h:5
+#, fuzzy
 msgid "File exists &quot;{0}&quot;."
-msgstr ""
+msgstr "ფაილი&quot;&quot;."
 
 #: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 #, fuzzy
@@ -11239,12 +11467,14 @@ msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
 #: ../filter/filter-datespec.c:415
+#, fuzzy
 msgid "Select a time to compare against"
-msgstr ""
+msgstr "ამორჩევა a -სკენ"
 
 #: ../filter/filter-file.c:289
+#, fuzzy
 msgid "Choose a file"
-msgstr ""
+msgstr "a ფაილი"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
 #: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
@@ -11270,24 +11500,27 @@ msgstr "ტესტი"
 #: ../filter/filter-rule.c:799
 #, fuzzy
 msgid "_Search name:"
-msgstr "ძებნა:"
+msgstr "ძებნა სახელი:"
 
 #: ../filter/filter-rule.c:827
+#, fuzzy
 msgid "Find items that meet the following criteria"
-msgstr ""
+msgstr "ძიება"
 
 #: ../filter/filter-rule.c:866
+#, fuzzy
 msgid "If all criteria are met"
-msgstr ""
+msgstr "ყველა"
 
 #: ../filter/filter-rule.c:866
+#, fuzzy
 msgid "If any criteria are met"
-msgstr ""
+msgstr "ნებისმიერი"
 
 #: ../filter/filter-rule.c:868
 #, fuzzy
 msgid "Find items:"
-msgstr "ძებნა:"
+msgstr "ძიება:"
 
 #: ../filter/filter-rule.c:889
 #, fuzzy
@@ -11304,8 +11537,9 @@ msgid "Replies and parents"
 msgstr "და"
 
 #: ../filter/filter-rule.c:889
+#, fuzzy
 msgid "No reply or parent"
-msgstr ""
+msgstr "არა ან"
 
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
@@ -11328,12 +11562,12 @@ msgstr "წესიერი&quot;&quot;."
 #: ../filter/filter.error.xml.h:2
 #, fuzzy
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "წესიერი&quot;&quot;."
+msgstr "არა წესიერი&quot;&quot;."
 
 #: ../filter/filter.error.xml.h:3
 #, fuzzy
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "ფაილი&quot;&quot; a წესიერი."
+msgstr "ფაილი&quot;&quot; არა ან არა a წესიერი ფაილი."
 
 #: ../filter/filter.error.xml.h:4
 #, fuzzy
@@ -11343,12 +11577,12 @@ msgstr "თარიღი."
 #: ../filter/filter.error.xml.h:5
 #, fuzzy
 msgid "Missing file name."
-msgstr "არ არის."
+msgstr "ფაილი სახელი."
 
 #: ../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
@@ -11356,8 +11590,9 @@ msgid "Name &quot;{0}&quot; already used."
 msgstr "სახელი&quot;&quot;."
 
 #: ../filter/filter.error.xml.h:8
+#, fuzzy
 msgid "Please choose another name."
-msgstr ""
+msgstr "სახელი."
 
 #: ../filter/filter.error.xml.h:9
 #, fuzzy
@@ -11365,12 +11600,14 @@ msgid "You must choose a date."
 msgstr "თქვენ a თარიღი."
 
 #: ../filter/filter.error.xml.h:10
+#, fuzzy
 msgid "You must name this filter."
-msgstr ""
+msgstr "თქვენ სახელი."
 
 #: ../filter/filter.error.xml.h:11
+#, fuzzy
 msgid "You must specify a file name."
-msgstr ""
+msgstr "თქვენ a ფაილი სახელი."
 
 #: ../filter/filter.glade.h:1
 #, fuzzy
@@ -11378,34 +11615,35 @@ msgid "<b>_Filter Rules</b>"
 msgstr "<b> ფილტრი</b>"
 
 #: ../filter/filter.glade.h:2
+#, fuzzy
 msgid "Compare against"
-msgstr ""
+msgstr "შედარება"
 
 #: ../filter/filter.glade.h:4
 #, fuzzy
 msgid "Show filters for mail:"
-msgstr "ანახე:"
+msgstr "ჩვენება ფოსტა:"
 
 #: ../filter/filter.glade.h:5
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
-msgstr "თარიღი თარიღი."
+msgstr "წმ თარიღი - თარიღი."
 
 #: ../filter/filter.glade.h:7
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
-msgstr "თარიღი -სკენ."
+msgstr "წმ თარიღი -სკენ."
 
 #: ../filter/filter.glade.h:9
 #, fuzzy
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
-msgstr "თარიღი."
+msgstr "წმ თარიღი."
 
 #: ../filter/filter.glade.h:12
 #, fuzzy
@@ -11420,6 +11658,10 @@ msgstr ""
 msgid "months"
 msgstr "თვე"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "წამი"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr ""
@@ -11435,16 +11677,17 @@ msgstr "წელი"
 #: ../filter/rule-editor.c:378
 #, fuzzy
 msgid "Add Rule"
-msgstr "დამატება"
+msgstr "დამატება წესი"
 
 #: ../filter/rule-editor.c:454
 #, fuzzy
 msgid "Edit Rule"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება წესი"
 
 #: ../filter/rule-editor.c:732
+#, fuzzy
 msgid "Rule name"
-msgstr ""
+msgstr "წესი სახელი"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 #, fuzzy
@@ -11452,18 +11695,19 @@ msgid "Composer Preferences"
 msgstr "პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#, fuzzy
 msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
+msgstr "გამართვა ფოსტა პარამეტრები და"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 #, fuzzy
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "კონფიგურირება და"
+msgstr "გამართვა და"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 #, fuzzy
 msgid "Configure your email accounts here"
-msgstr "კონფიგურირება ანგარიშები"
+msgstr "გამართვა ელფოსტა ანგარიშები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
@@ -11472,26 +11716,27 @@ msgstr "Evolution Mail"
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
 msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution ანგარიშები"
+msgstr "Evolution ფოსტა ანგარიშები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Mail component"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Mail composer"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Mail composer configuration control"
-msgstr "Evolution"
+msgstr "Evolution ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
 msgid "Evolution Mail preferences control"
-msgstr ""
+msgstr "Evolution ფოსტა პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
@@ -11499,8 +11744,9 @@ msgstr ""
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
 #: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
+#, fuzzy
 msgid "Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: ../mail/em-account-prefs.c:531
@@ -11513,13 +11759,15 @@ msgid "Mail Preferences"
 msgstr "ფოსტის პარამეტრები"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
 msgid "_Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #: ../mail/em-account-editor.c:403
 #, c-format
+#, fuzzy
 msgid "%s License Agreement"
-msgstr ""
+msgstr "წმ ლიცენზია"
 
 #: ../mail/em-account-editor.c:410
 #, fuzzy, c-format
@@ -11528,7 +11776,7 @@ msgid ""
 "Please read carefully the license agreement\n"
 "for %s displayed below\n"
 "and tick the check box for accepting it\n"
-msgstr "n"
+msgstr "წმ არა"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
@@ -11542,7 +11790,6 @@ msgid "Ask for each message"
 msgstr "კითხვა"
 
 #: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
-#, fuzzy
 msgid "Identity"
 msgstr "იდენტურობა"
 
@@ -11551,8 +11798,9 @@ msgid "Receiving Email"
 msgstr "ფოსტის მიღება"
 
 #: ../mail/em-account-editor.c:2013
+#, fuzzy
 msgid "Automatically check for _new mail every"
-msgstr ""
+msgstr "ავრომატურად ახალი ფოსტა"
 
 #: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
@@ -11577,7 +11825,7 @@ msgstr "მიღების ოფციები"
 #: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 #, fuzzy
 msgid "Checking for New Mail"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა"
 
 #: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 #, fuzzy
@@ -11590,25 +11838,24 @@ msgstr "ევოლუშენ ანგარიშების ასის�
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
-#, fuzzy
 msgid "Disable"
 msgstr "გამორთე"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:411
+#, fuzzy
 msgid "Enable"
-msgstr ""
+msgstr "ჩართვა"
 
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:466
-#, fuzzy
 msgid "[Default]"
-msgstr "ნაგულისხმევი"
+msgstr "[ნაგულისხმევი]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "აქტიური"
 
@@ -11628,7 +11875,7 @@ msgstr "უსახელო"
 #: ../mail/em-composer-prefs.c:936
 #, fuzzy
 msgid "Language(s)"
-msgstr "ენა"
+msgstr "ენა წმ"
 
 #: ../mail/em-composer-prefs.c:979
 #, fuzzy
@@ -11638,7 +11885,7 @@ msgstr "დამატება"
 #: ../mail/em-composer-prefs.c:999
 #, fuzzy
 msgid "Signature(s)"
-msgstr "ხელმოწერა"
+msgstr "ხელმოწერა წმ"
 
 #: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
@@ -11653,19 +11900,22 @@ msgstr "უცნობი"
 #. * 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:1713
+#, fuzzy
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr ""
+msgstr "ჩართ. წელი თვე დღე ეთ წუთი გამგზავნი:"
 
 #: ../mail/em-filter-editor.c:155
+#, fuzzy
 msgid "_Filter Rules"
-msgstr ""
+msgstr "ფილტრი"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
+#, fuzzy
 msgid "Adjust Score"
-msgstr ""
+msgstr "ქულა"
 
 #: ../mail/em-filter-i18n.h:3
 #, fuzzy
@@ -11673,20 +11923,23 @@ msgid "Assign Color"
 msgstr "მიანიჭე ფერი"
 
 #: ../mail/em-filter-i18n.h:4
+#, fuzzy
 msgid "Assign Score"
-msgstr ""
+msgstr "მიანიჭე ქულა"
 
 #: ../mail/em-filter-i18n.h:5
+#, fuzzy
 msgid "Attachments"
-msgstr ""
+msgstr "დანართები"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:7
+#, fuzzy
 msgid "contains"
-msgstr ""
+msgstr "შეიცავს"
 
 #: ../mail/em-filter-i18n.h:8
 #, fuzzy
@@ -11701,35 +11954,41 @@ msgstr "თარიღი"
 #: ../mail/em-filter-i18n.h:10
 #, fuzzy
 msgid "Date sent"
-msgstr "თარიღი"
+msgstr "თარიღი გაგზავნილი"
 
 #: ../mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:13
+#, fuzzy
 msgid "does not contain"
-msgstr ""
+msgstr "არა შეიცავს"
 
 #: ../mail/em-filter-i18n.h:14
+#, fuzzy
 msgid "does not end with"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:15
+#, fuzzy
 msgid "does not exist"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:16
+#, fuzzy
 msgid "does not return"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:17
+#, fuzzy
 msgid "does not sound like"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:18
+#, fuzzy
 msgid "does not start with"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
@@ -11752,11 +12011,11 @@ msgid "exists"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:24
+#, fuzzy
 msgid "Expression"
-msgstr ""
+msgstr "გამოხატვა"
 
 #: ../mail/em-filter-i18n.h:25
-#, fuzzy
 msgid "Follow Up"
 msgstr "მიყოლა ზემოთ"
 
@@ -11781,16 +12040,19 @@ msgid "is greater than"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:32
+#, fuzzy
 msgid "is less than"
-msgstr ""
+msgstr "ნაკლები"
 
 #: ../mail/em-filter-i18n.h:33
+#, fuzzy
 msgid "is not"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:34
+#, fuzzy
 msgid "is not Flagged"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
@@ -11803,13 +12065,13 @@ msgid "Junk Test"
 msgstr "ტესტი"
 
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
-#, fuzzy
 msgid "Label"
 msgstr "სათაური"
 
 #: ../mail/em-filter-i18n.h:38
+#, fuzzy
 msgid "Mailing list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/em-filter-i18n.h:39
 #, fuzzy
@@ -11819,12 +12081,12 @@ msgstr "ყველა"
 #: ../mail/em-filter-i18n.h:40
 #, fuzzy
 msgid "Message Body"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება ტანი"
 
 #: ../mail/em-filter-i18n.h:41
 #, fuzzy
 msgid "Message Header"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება ზედა კოლონტიტული"
 
 #: ../mail/em-filter-i18n.h:42
 #, fuzzy
@@ -11834,12 +12096,12 @@ msgstr "შეტყობინება"
 #: ../mail/em-filter-i18n.h:43
 #, fuzzy
 msgid "Message is not Junk"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება არა"
 
 #: ../mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Move to Folder"
-msgstr "-სკენ საქაღალდე"
+msgstr "გადატანა -სკენ საქაღალდე"
 
 #: ../mail/em-filter-i18n.h:45
 #, fuzzy
@@ -11860,8 +12122,9 @@ msgid "Recipients"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:49
+#, fuzzy
 msgid "Regex Match"
-msgstr ""
+msgstr "Regex"
 
 #: ../mail/em-filter-i18n.h:50
 #, fuzzy
@@ -11877,8 +12140,9 @@ msgid "returns greater than"
 msgstr ""
 
 #: ../mail/em-filter-i18n.h:53
+#, fuzzy
 msgid "returns less than"
-msgstr ""
+msgstr "ნაკლები"
 
 #: ../mail/em-filter-i18n.h:54
 #, fuzzy
@@ -11886,12 +12150,14 @@ msgid "Run Program"
 msgstr "გაშვება პროგრამა"
 
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
+#, fuzzy
 msgid "Score"
-msgstr ""
+msgstr "ქულა"
 
 #: ../mail/em-filter-i18n.h:56
+#, fuzzy
 msgid "Sender"
-msgstr ""
+msgstr "გამგზავნი"
 
 #: ../mail/em-filter-i18n.h:57
 #, fuzzy
@@ -11901,7 +12167,7 @@ msgstr "სტატუსი"
 #: ../mail/em-filter-i18n.h:58
 #, fuzzy
 msgid "Size (kB)"
-msgstr "ზომა"
+msgstr "ზომა კბ"
 
 #: ../mail/em-filter-i18n.h:59
 msgid "sounds like"
@@ -11910,11 +12176,12 @@ msgstr ""
 #: ../mail/em-filter-i18n.h:60
 #, fuzzy
 msgid "Source Account"
-msgstr "ანგარიში"
+msgstr "წყარო ანგარიში"
 
 #: ../mail/em-filter-i18n.h:61
+#, fuzzy
 msgid "Specific header"
-msgstr ""
+msgstr "თავსართი"
 
 #: ../mail/em-filter-i18n.h:62
 msgid "starts with"
@@ -11947,7 +12214,7 @@ msgstr ""
 #: ../mail/em-folder-browser.c:144
 #, fuzzy
 msgid "C_reate Search Folder From Search..."
-msgstr "C ძებნა საქაღალდე ვისგან ძებნა."
+msgstr "C ძებნა საქაღალდე -დან ძებნა."
 
 #. 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
@@ -11956,15 +12223,13 @@ msgstr "C ძებნა საქაღალდე ვისგან ძე�
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "სულ:"
-msgstr[1] ""
 
 #. 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 messages:"
 msgid_plural "Unread messages:"
-msgstr[0] "შემდეგი შეტყობინება"
-msgstr[1] "შემდეგი შეტყობინება"
+msgstr[0] "წაუკითხავად:"
 
 #: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
@@ -11977,14 +12242,13 @@ msgid "<click here to select a folder>"
 msgstr ""
 
 #: ../mail/em-folder-selector.c:261
-#, fuzzy
 msgid "Create"
 msgstr "შექმნა"
 
 #: ../mail/em-folder-selector.c:265
 #, fuzzy
 msgid "Folder _name:"
-msgstr "საქაღალდე:"
+msgstr "საქაღალდე სახელი:"
 
 #: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
 #: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
@@ -12012,8 +12276,9 @@ msgid "Outbox"
 msgstr ""
 
 #: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
+#, fuzzy
 msgid "Sent"
-msgstr ""
+msgstr "გაგზავნა"
 
 #: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
@@ -12022,31 +12287,32 @@ msgstr "იტვირთება...."
 #: ../mail/em-folder-tree.c:694
 #, fuzzy
 msgid "Mail Folder Tree"
-msgstr "საქაღალდე განშტოება"
+msgstr "ფოსტა საქაღალდე განშტოება"
 
 #: ../mail/em-folder-tree.c:854
 #, fuzzy, c-format
 msgid "Moving folder %s"
-msgstr "გადატანის პროცესში"
+msgstr "გადატანის პროცესში წმ"
 
 #: ../mail/em-folder-tree.c:856
 #, fuzzy, c-format
 msgid "Copying folder %s"
-msgstr "ვაკოპირებ"
+msgstr "ვაკოპირებ წმ"
 
 #: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
-msgstr "გადატანის პროცესში"
+msgstr "გადატანის პროცესში წმ"
 
 #: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
-msgstr "ვაკოპირებ"
+msgstr "ვაკოპირებ წმ"
 
 #: ../mail/em-folder-tree.c:881
+#, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 #, fuzzy
@@ -12056,12 +12322,12 @@ msgstr "დააკოპირე -სკენ საქაღალდე"
 #: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 #, fuzzy
 msgid "_Move to Folder"
-msgstr "-სკენ საქაღალდე"
+msgstr "გადატანა -სკენ საქაღალდე"
 
 #: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
-msgstr "სკანირება"
+msgstr "სკანირება - წმ"
 
 #: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
@@ -12074,52 +12340,54 @@ msgstr "_ხედი"
 #: ../mail/em-folder-tree.c:2043
 #, fuzzy
 msgid "Open in _New Window"
-msgstr "გახსენი ახალი ფანჯარა"
+msgstr "გახსნა - ახალი ფანჯარა"
 
 #: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_დააკოპირე..."
 
 #: ../mail/em-folder-tree.c:2048
-#, fuzzy
 msgid "_Move..."
-msgstr "გადატანა."
+msgstr "_გადატანა..."
 
 #. FIXME: need to disable for nochildren folders
 #: ../mail/em-folder-tree.c:2052
 #, fuzzy
 msgid "_New Folder..."
-msgstr "_ახალი საქაღალდე..."
+msgstr "ახალი საქაღალდე."
 
 #: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "_გადარქმევა..."
 
 #: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
-#, fuzzy
 msgid "_Empty Trash"
 msgstr "_სანაგვე ყუთის დაცარიელება"
 
 #: ../mail/em-folder-utils.c:104
 #, c-format
+#, fuzzy
 msgid "Copying `%s' to `%s'"
-msgstr ""
+msgstr "ვაკოპირებ წმ -სკენ წმ"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
 #: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
+#, fuzzy
 msgid "Select folder"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
+#, fuzzy
 msgid "C_opy"
-msgstr ""
+msgstr "C"
 
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
+#, fuzzy
 msgid "Creating folder `%s'"
-msgstr ""
+msgstr "შექმნა წმ"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
@@ -12131,12 +12399,14 @@ msgstr "შექმნა"
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
+#, fuzzy
 msgid "Specify where to create the folder:"
-msgstr ""
+msgstr "-სკენ:"
 
 #: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
+#, fuzzy
 msgid "_Reply to Sender"
-msgstr ""
+msgstr "პასუხი -სკენ გამგზავნი"
 
 #: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
@@ -12152,8 +12422,9 @@ msgid "U_ndelete"
 msgstr ""
 
 #: ../mail/em-folder-view.c:1093
+#, fuzzy
 msgid "_Move to Folder..."
-msgstr ""
+msgstr "გადატანა -სკენ საქაღალდე."
 
 #: ../mail/em-folder-view.c:1094
 #, fuzzy
@@ -12163,11 +12434,12 @@ msgstr "დააკოპირე -სკენ საქაღალდე."
 #: ../mail/em-folder-view.c:1097
 #, fuzzy
 msgid "Mar_k as Read"
-msgstr "წაკითხული"
+msgstr "მარ წაკითხვა"
 
 #: ../mail/em-folder-view.c:1098
+#, fuzzy
 msgid "Mark as _Unread"
-msgstr ""
+msgstr "წაუკითხავად"
 
 #: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
@@ -12192,19 +12464,17 @@ msgid "Mark for Follo_w Up..."
 msgstr "ზემოთ."
 
 #: ../mail/em-folder-view.c:1105
-#, fuzzy
 msgid "_Label"
-msgstr "სათაური"
+msgstr "_სათაური"
 
 #: ../mail/em-folder-view.c:1106
-#, fuzzy
 msgid "_None"
-msgstr "არა"
+msgstr "_არა"
 
 #: ../mail/em-folder-view.c:1111
 #, fuzzy
 msgid "Fla_g Completed"
-msgstr "შესრულებულია"
+msgstr "დასრულებულია"
 
 #: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
@@ -12213,11 +12483,12 @@ msgstr ""
 #: ../mail/em-folder-view.c:1115
 #, fuzzy
 msgid "Crea_te Rule From Message"
-msgstr "ვისგან შეტყობინება"
+msgstr "წესი -დან შეტყობინება"
 
 #: ../mail/em-folder-view.c:1116
+#, fuzzy
 msgid "Search Folder from _Subject"
-msgstr ""
+msgstr "ძებნა საქაღალდე თემა"
 
 #: ../mail/em-folder-view.c:1117
 #, fuzzy
@@ -12237,22 +12508,22 @@ msgstr "ძებნა საქაღალდე სია"
 #: ../mail/em-folder-view.c:1123
 #, fuzzy
 msgid "Filter on Sub_ject"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1124
 #, fuzzy
 msgid "Filter on Sen_der"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1125
 #, fuzzy
 msgid "Filter on Re_cipients"
-msgstr "ფილტრი"
+msgstr "ფილტრი ჩართულია"
 
 #: ../mail/em-folder-view.c:1126
 #, fuzzy
 msgid "Filter on _Mailing List"
-msgstr "ფილტრი სია"
+msgstr "ფილტრი ჩართულია სია"
 
 #. default charset used in mail view
 #: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
@@ -12284,7 +12555,7 @@ msgstr "შექმნა ძებნა საქაღალდე"
 #: ../mail/em-folder-view.c:2463
 #, fuzzy
 msgid "_From this Address"
-msgstr "ვისგან მისამართი"
+msgstr "-დან მისამართი"
 
 #: ../mail/em-folder-view.c:2464
 #, fuzzy
@@ -12294,13 +12565,14 @@ msgstr "ვის მისამართი"
 #: ../mail/em-folder-view.c:2818
 #, fuzzy, c-format
 msgid "Click to mail %s"
-msgstr "-სკენ"
+msgstr "-სკენ ფოსტა წმ"
 
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:496
 #, c-format
+#, fuzzy
 msgid "Matches: %d"
-msgstr ""
+msgstr "ემთხვევა"
 
 #: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
@@ -12311,11 +12583,12 @@ msgstr ""
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "არა."
+msgstr "არა არა."
 
 #: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
+#, fuzzy
 msgid "Valid signature"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html-display.c:757
 #, fuzzy
@@ -12330,21 +12603,23 @@ msgid "Invalid signature"
 msgstr "არასწორი"
 
 #: ../mail/em-format-html-display.c:758
+#, fuzzy
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
+msgstr "- -."
 
 #: ../mail/em-format-html-display.c:759
+#, fuzzy
 msgid "Valid signature, cannot verify sender"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html-display.c:759
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "a."
+msgstr "a -."
 
 #: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
@@ -12355,11 +12630,12 @@ msgstr ""
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "ინტერნეტი."
+msgstr "არა - ინტერნეტი."
 
 #: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
+#, fuzzy
 msgid "Encrypted, weak"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:766
 #, fuzzy
@@ -12367,22 +12643,24 @@ 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 "a -სკენ a."
+msgstr "a არა -სკენ - - a -."
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
+#, fuzzy
 msgid "Encrypted"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:767
 #, fuzzy
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "-სკენ."
+msgstr "-სკენ -."
 
 #: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
+#, fuzzy
 msgid "Encrypted, strong"
-msgstr ""
+msgstr "დაშიფრული"
 
 #: ../mail/em-format-html-display.c:768
 #, fuzzy
@@ -12390,47 +12668,50 @@ 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 "a -სკენ a."
+msgstr "a -სკენ - - a -."
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "_View Certificate"
-msgstr "ხედი"
+msgstr "ჩვენება სერთიფიკატი"
 
 #: ../mail/em-format-html-display.c:884
+#, fuzzy
 msgid "This certificate is not viewable"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-format-html-display.c:1174
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "შესრულებულია B M"
+msgstr "დასრულებულია ჩართულია B Y M"
 
 #: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr ""
 
 #: ../mail/em-format-html-display.c:1185
+#, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr ""
+msgstr "B Y M"
 
 #: ../mail/em-format-html-display.c:1245
 #, fuzzy
 msgid "_View Inline"
-msgstr "ხედი"
+msgstr "ჩვენება"
 
 #: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_დამალვა"
 
 #: ../mail/em-format-html-display.c:1247
+#, fuzzy
 msgid "_Fit to Width"
-msgstr ""
+msgstr "-სკენ სიგანე"
 
 #: ../mail/em-format-html-display.c:1248
 #, fuzzy
 msgid "Show _Original Size"
-msgstr "ანახე ზომა"
+msgstr "ჩვენება ორიგინალი ზომა"
 
 #: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
@@ -12440,30 +12721,26 @@ msgstr ""
 #: ../mail/em-format-html-display.c:1874
 #, fuzzy
 msgid "Select folder to save all attachments..."
-msgstr "-სკენ."
+msgstr "ამორჩევა -სკენ შენახვა ყველა."
 
 #: ../mail/em-format-html-display.c:1921
-#, fuzzy
 msgid "_Save Selected..."
-msgstr "შენახვა."
+msgstr "მონიშნულის _შენახვა..."
 
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:1988
 #, fuzzy, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
-msgstr[0] "ჩამატება."
-msgstr[1] "ჩამატება."
+msgstr[0] "nt"
 
 #: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
-#, fuzzy
 msgid "S_ave"
-msgstr "S"
+msgstr "და_მახსოვრება"
 
 #: ../mail/em-format-html-display.c:2006
-#, fuzzy
 msgid "S_ave All"
-msgstr "S ყველა"
+msgstr "ყველას დამ_ახსოვრება"
 
 #: ../mail/em-format-html-display.c:2067
 #, fuzzy
@@ -12473,16 +12750,18 @@ msgstr "არა"
 #: ../mail/em-format-html-print.c:130
 #, fuzzy, c-format
 msgid "Page %d of %d"
-msgstr "გვერდი"
+msgstr "გვერდი -"
 
 #: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
+#, fuzzy
 msgid "Retrieving `%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-format-html.c:610
+#, fuzzy
 msgid "Valid signature but cannot verify sender"
-msgstr ""
+msgstr "დამოწმებული"
 
 #: ../mail/em-format-html.c:881
 #, fuzzy
@@ -12492,32 +12771,32 @@ msgstr "უვარგისი."
 #: ../mail/em-format-html.c:911
 #, fuzzy, c-format
 msgid "Pointer to FTP site (%s)"
-msgstr "-სკენ FTP"
+msgstr "მიმთითებელი -სკენ FTP წმ"
 
 #: ../mail/em-format-html.c:922
 #, fuzzy, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ ფაილი წმ ეთ წმ"
 
 #: ../mail/em-format-html.c:924
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ ფაილი წმ"
 
 #: ../mail/em-format-html.c:945
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
-msgstr "-სკენ"
+msgstr "მიმთითებელი -სკენ წმ"
 
 #: ../mail/em-format-html.c:956
 #, fuzzy, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "-სკენ უცნობი ტიპი"
+msgstr "მიმთითებელი -სკენ უცნობი წმ"
 
 #: ../mail/em-format-html.c:1183
 #, fuzzy
 msgid "Formatting message"
-msgstr "მიმდინარეობს ფორმატირება"
+msgstr "ფორმატირება"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
@@ -12527,31 +12806,34 @@ msgstr "ვისგან"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
+#, fuzzy
 msgid "Reply-To"
-msgstr ""
+msgstr "პასუხი ვის"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
-#, fuzzy
 msgid "To"
 msgstr "ვის"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
+#, fuzzy
 msgid "Cc"
-msgstr ""
+msgstr "ასლი"
 
 #: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
+#, fuzzy
 msgid "Bcc"
-msgstr ""
+msgstr "უხილავი ასლი"
 
 #. pseudo-header
 #: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1001
+#, fuzzy
 msgid "Mailer"
-msgstr ""
+msgstr "გამომგზავნი"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
 #: ../mail/em-format-html.c:1615
@@ -12579,17 +12861,19 @@ msgstr ""
 
 #: ../mail/em-format.c:1102
 #, c-format
+#, fuzzy
 msgid "%s attachment"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
 #, fuzzy
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S უცნობი შეცდომა"
+msgstr "არა S უცნობი შეცდომა"
 
 #: ../mail/em-format.c:1271 ../mail/em-format.c:1427
+#, fuzzy
 msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
+msgstr "არა."
 
 #: ../mail/em-format.c:1279
 #, fuzzy
@@ -12619,75 +12903,88 @@ msgid "Once per day"
 msgstr "დღეში ერთხელ"
 
 #: ../mail/em-mailer-prefs.c:105
+#, fuzzy
 msgid "Once per week"
-msgstr ""
+msgstr "კვირა"
 
 #: ../mail/em-mailer-prefs.c:106
+#, fuzzy
 msgid "Once per month"
-msgstr ""
+msgstr "თვე"
 
 #: ../mail/em-migrate.c:1209
+#, fuzzy
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
-msgstr ""
+msgstr "და - Evolution საფოსტო ყუთი Evolution x არა Evolution."
 
 #: ../mail/em-migrate.c:1648
 #, c-format
+#, fuzzy
 msgid "Unable to create new folder `%s': %s"
-msgstr ""
+msgstr "-სკენ ახალი წმ წმ"
 
 #: ../mail/em-migrate.c:1674
 #, c-format
+#, fuzzy
 msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr ""
+msgstr "-სკენ კოპირება წმ -სკენ წმ წმ"
 
 #: ../mail/em-migrate.c:1859
 #, c-format
+#, fuzzy
 msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr ""
+msgstr "-სკენ ეთ წმ წმ"
 
 #: ../mail/em-migrate.c:2063
 #, c-format
+#, fuzzy
 msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr ""
+msgstr "-სკენ გახსნა POP ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2077
 #, c-format
+#, fuzzy
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
+msgstr "-სკენ ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2106
 #, c-format
+#, fuzzy
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr ""
+msgstr "-სკენ კოპირება ჩართულია წმ წმ"
 
 #: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ ფოსტა წმ წმ"
 
 #: ../mail/em-migrate.c:2712
 #, c-format
+#, fuzzy
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr ""
+msgstr "-სკენ ფოსტა ეთ წმ წმ"
 
 #: ../mail/em-migrate.c:2731
+#, fuzzy
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr ""
+msgstr "-სკენ Evolution არა ან."
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#, fuzzy
 msgid "_Reply to sender"
-msgstr ""
+msgstr "პასუხი -სკენ"
 
 #: ../mail/em-popup.c:558 ../mail/em-popup.c:569
 #: ../ui/evolution-mail-message.xml.h:83
+#, fuzzy
 msgid "Reply to _List"
-msgstr ""
+msgstr "პასუხი -სკენ სია"
 
 #: ../mail/em-popup.c:620
 msgid "_Open Link in Browser"
@@ -12706,7 +13003,7 @@ msgstr "დამატება -სკენ მისამართი"
 #: ../mail/em-subscribe-editor.c:615
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
-msgstr "სუპორტი ჩართული."
+msgstr "არა სუპორტი ან არა ჩართული."
 
 #: ../mail/em-subscribe-editor.c:644
 msgid "Subscribed"
@@ -12719,42 +13016,44 @@ msgstr "საქაღალდე"
 
 #. FIXME: This is just to get the shadow, is there a better way?
 #: ../mail/em-subscribe-editor.c:869
+#, fuzzy
 msgid "Please select a server."
-msgstr ""
+msgstr "a."
 
 #: ../mail/em-subscribe-editor.c:890
+#, fuzzy
 msgid "No server has been selected"
-msgstr ""
+msgstr "არა"
 
 #: ../mail/em-utils.c:124
 #, fuzzy
 msgid "Do not show this message again."
-msgstr "პროგრამა."
+msgstr "არა."
 
 #: ../mail/em-utils.c:319
 #, fuzzy
 msgid "Message Filters"
-msgstr "შეტყობინება ფილტრები"
+msgstr "შეტყობინების ფილტრები"
 
 #: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr ""
 
 #: ../mail/em-utils.c:634
-#, fuzzy
 msgid "Save Message..."
-msgstr "შენახვა შეტყობინება."
+msgstr "შეტყობინების შენახვა..."
 
 #: ../mail/em-utils.c:683
 #, fuzzy
 msgid "Add address"
-msgstr "დამატება"
+msgstr "მისამართის დამატება"
 
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1167
 #, c-format
+#, fuzzy
 msgid "Messages from %s"
-msgstr ""
+msgstr "შეტყობინებები წმ"
 
 #: ../mail/em-vfolder-editor.c:112
 #, fuzzy
@@ -12779,7 +13078,7 @@ msgstr "ავტომატური"
 #: ../mail/evolution-mail.schemas.in.in.h:3
 #, fuzzy
 msgid "Check incoming mail being junk"
-msgstr "შემოწმება"
+msgstr "შემოწმება შემომავალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12792,32 +13091,32 @@ 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
 #, fuzzy
 msgid "Default charset in which to compose messages"
-msgstr "ნაგულისხმევი -სკენ"
+msgstr "ნაგულისხმევი - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:9
 #, fuzzy
 msgid "Default charset in which to compose messages."
-msgstr "ნაგულისხმევი -სკენ."
+msgstr "ნაგულისხმევი - -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:10
 #, fuzzy
 msgid "Default charset in which to display messages"
-msgstr "ნაგულისხმევი -სკენ"
+msgstr "ნაგულისხმევი - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:11
 #, fuzzy
 msgid "Default charset in which to display messages."
-msgstr "ნაგულისხმევი -სკენ."
+msgstr "ნაგულისხმევი - -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:12
 #, fuzzy
@@ -12827,17 +13126,17 @@ msgstr "ნაგულისხმევი"
 #: ../mail/evolution-mail.schemas.in.in.h:13
 #, fuzzy
 msgid "Default height of the Composer Window"
-msgstr "ნაგულისხმევი ფანჯარა"
+msgstr "ნაგულისხმევი სიმაღლე - ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:14
 #, fuzzy
 msgid "Default height of the Message Window"
-msgstr "ნაგულისხმევი შეტყობინება ფანჯარა"
+msgstr "ნაგულისხმევი სიმაღლე - შეტყობინება ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:15
 #, fuzzy
 msgid "Default height of the Subscribe dialog"
-msgstr "ნაგულისხმევი"
+msgstr "ნაგულისხმევი სიმაღლე - ხელის მოწერა დიალოგი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:16
 #, fuzzy
@@ -12847,116 +13146,121 @@ msgstr "ნაგულისხმევი"
 #: ../mail/evolution-mail.schemas.in.in.h:17
 #, fuzzy
 msgid "Default width of the Composer Window"
-msgstr "ნაგულისხმევი ფანჯარა"
+msgstr "ნაგულისხმევი სიგანე - ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:18
 #, fuzzy
 msgid "Default width of the Message Window"
-msgstr "ნაგულისხმევი შეტყობინება ფანჯარა"
+msgstr "ნაგულისხმევი სიგანე - შეტყობინება ფანჯარა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:19
 #, fuzzy
 msgid "Default width of the Subscribe dialog"
-msgstr "ნაგულისხმევი"
+msgstr "ნაგულისხმევი სიგანე - ხელის მოწერა დიალოგი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:20
 #, fuzzy
 msgid "Draw spelling error indicators on words as you type."
-msgstr "შეცდომა ტიპი."
+msgstr "ასახვა შეცდომა ჩართულია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:21
 #, fuzzy
 msgid "Empty Trash folders on exit"
-msgstr "ცარიელი სანაგვე ყუთი"
+msgstr "ცარიელი სანაგვე ყუთი ჩართულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 #, fuzzy
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "ცარიელი სანაგვე ყუთი Evolution."
+msgstr "ცარიელი ყველა სანაგვე ყუთი Evolution."
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 #, fuzzy
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "a."
+msgstr "ჩართვა რეჟიმი a ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
+#, fuzzy
 msgid "Enable/disable caret mode"
-msgstr ""
+msgstr "ჩართვა გამორთვა რეჟიმი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 #, fuzzy
 msgid "Height of the message-list pane"
-msgstr "სიმაღლე"
+msgstr "სიმაღლე - სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:26
 #, fuzzy
 msgid "Height of the message-list pane."
-msgstr "სიმაღლე."
+msgstr "სიმაღლე - სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
 #, fuzzy
 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 "a -სკენ -სკენ."
+msgstr "a -სკენ გახსნა ან მეტი ეთ -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
+#, fuzzy
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
-msgstr ""
+msgstr "a a Evolution ნებისმიერი - სია -სკენ a - GNOME წმ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
 msgid "Last time empty trash was run"
-msgstr ""
+msgstr "ბოლო ურნა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
 msgid "List of Labels and their associated colors"
-msgstr "სია და"
+msgstr "სია - და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
 msgid "List of accepted licenses"
-msgstr ""
+msgstr "სია -"
 
 #: ../mail/evolution-mail.schemas.in.in.h:32
+#, fuzzy
 msgid "List of accounts"
-msgstr ""
+msgstr "სია - ანგარიშები"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
 #, fuzzy
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "სია ანგარიშები -სკენ Evolution -სკენ ანგარიშები."
+msgstr "სია - ანგარიშები -სკენ ფოსტა - Evolution სია შეიცავს -სკენ ფოსტა ანგარიშები."
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 #, fuzzy
 msgid "List of custom headers and whether they are enabled."
-msgstr "სია და ჩართული."
+msgstr "სია - და ჩართული."
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 #, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
-msgstr "სია -სკენ Evolution hex."
+msgstr "სია - -სკენ ფოსტა - Evolution სია შეიცავს სახელი HTML."
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 #, fuzzy
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "სია -სკენ"
+msgstr "სია - -სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 #, fuzzy
 msgid "List of protocol names whose license has been accepted."
-msgstr "სია."
+msgstr "სია - ვისი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:38
 #, fuzzy
 msgid "Load images for HTML messages over http"
-msgstr "ჩატვირთვა http"
+msgstr "ჩატვირთვა HTML"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
@@ -12964,167 +13268,184 @@ 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 "ჩატვირთვა http არასოდეს ჩატვირთვა ყოველთვის"
+msgstr "ჩატვირთვა HTML წმ არასოდეს გამორთულია ჩატვირთვა - ფოსტა ყოველთვის გამორთულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
+#, fuzzy
 msgid "Log filter actions"
-msgstr ""
+msgstr "ჟურნალი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:41
+#, fuzzy
 msgid "Log filter actions to the specified log file."
-msgstr ""
+msgstr "ჟურნალი -სკენ ფაილი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
+#, fuzzy
 msgid "Logfile to log filter actions"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:43
+#, fuzzy
 msgid "Logfile to log filter actions."
-msgstr ""
+msgstr "-სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:44
+#, fuzzy
 msgid "Mark as Seen after specified timeout"
-msgstr ""
+msgstr "დაყოვნების დრო"
 
 #: ../mail/evolution-mail.schemas.in.in.h:45
+#, fuzzy
 msgid "Mark as Seen after specified timeout."
-msgstr ""
+msgstr "დაყოვნების დრო."
 
 #: ../mail/evolution-mail.schemas.in.in.h:46
 #, fuzzy
 msgid "Mark citations in the message \"Preview\""
-msgstr "წინასწარ ნახვა"
+msgstr "- წინასწარ ნახვა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Mark citations in the message \"Preview\"."
-msgstr "წინასწარ ნახვა."
+msgstr "- წინასწარ ნახვა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:48
 #, fuzzy
 msgid "Message Window default height"
-msgstr "შეტყობინება ფანჯარა ნაგულისხმევი"
+msgstr "შეტყობინება ფანჯარა ნაგულისხმები სიმაღლე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:49
 #, fuzzy
 msgid "Message Window default width"
-msgstr "შეტყობინება ფანჯარა ნაგულისხმევი"
+msgstr "შეტყობინება ფანჯარა ნაგულისხმები სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:50
 #, fuzzy
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება საშუალო"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 #, fuzzy
 msgid "Minimum days between emptying the trash on exit"
-msgstr "დღე"
+msgstr "დღე ურნა ჩართულია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "დღე."
+msgstr "ურნა ჩართულია - დღე."
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify sound file"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა შეტყობინება ფაილი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:54
 #, fuzzy
 msgid "New Mail Notify type"
-msgstr "ახალი ტიპი"
+msgstr "ახალი ფოსტა შეტყობინება"
 
 #: ../mail/evolution-mail.schemas.in.in.h:55
+#, fuzzy
 msgid "Prompt on empty subject"
-msgstr ""
+msgstr "მოთხოვნა ჩართულია თემა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
+#, fuzzy
 msgid "Prompt the user when he or she tries to expunge a folder."
-msgstr ""
+msgstr "მოთხოვნა ან -სკენ a."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
+#, fuzzy
 msgid "Prompt the user when he or she tries to send a message without a Subject."
-msgstr ""
+msgstr "მოთხოვნა ან -სკენ a a თემა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
+#, fuzzy
 msgid "Prompt when user expunges"
-msgstr ""
+msgstr "მოთხოვნა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:59
+#, fuzzy
 msgid "Prompt when user only fills Bcc"
-msgstr ""
+msgstr "მოთხოვნა უხილავი ასლი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:60
+#, fuzzy
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr ""
+msgstr "მოთხოვნა -სკენ გახსნა ან მეტი ეთ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
+#, fuzzy
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
+msgstr "მოთხოვნა -სკენ HTML ფოსტა -სკენ არა -სკენ HTML ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
+#, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
+msgstr "მოთხოვნა -სკენ a არა ვის ან ასლი."
 
 #: ../mail/evolution-mail.schemas.in.in.h:63
+#, fuzzy
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
+msgstr "მოთხოვნა -სკენ HTML"
 
 #: ../mail/evolution-mail.schemas.in.in.h:64
 #, fuzzy
 msgid "Recognize links in text and replace them."
-msgstr "და."
+msgstr "- ტექსტი და."
 
 #: ../mail/evolution-mail.schemas.in.in.h:65
 #, fuzzy
 msgid "Recognize smileys in text and replace them with images."
-msgstr "და."
+msgstr "- ტექსტი და."
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
 msgid "Run junk test on incoming mail"
-msgstr ""
+msgstr "გაშვება ჩართულია შემომავალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 #, fuzzy
 msgid "Send HTML mail by default"
-msgstr "გაგზავნა ნაგულისხმევი"
+msgstr "გაგზავნა HTML ფოსტა ნაგულისხმები"
 
 #: ../mail/evolution-mail.schemas.in.in.h:68
 #, fuzzy
 msgid "Send HTML mail by default."
-msgstr "გაგზავნა ნაგულისხმევი."
+msgstr "გაგზავნა HTML ფოსტა ნაგულისხმები."
 
 #: ../mail/evolution-mail.schemas.in.in.h:69
 #, fuzzy
 msgid "Show Animations"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../mail/evolution-mail.schemas.in.in.h:70
 #, fuzzy
 msgid "Show animated images as animations."
-msgstr "ანახე."
+msgstr "ჩვენება."
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 #, fuzzy
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "ანახე a."
+msgstr "ჩვენება a - სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
 #, fuzzy
 msgid "Show deleted messages in the message-list"
-msgstr "ანახე"
+msgstr "ჩვენება - სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:75
+#, fuzzy
 msgid "Sound file to play when new mail arrives."
-msgstr ""
+msgstr "ხმა ფაილი -სკენ ახალი ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "ტიპი ახალი შეტყობინება -სკენ."
+msgstr "- ახალი ფოსტა ნოიფიკაცია -სკენ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
@@ -13133,29 +13454,32 @@ msgstr ""
 #: ../mail/evolution-mail.schemas.in.in.h:78
 #, fuzzy
 msgid "Subscribe dialog default height"
-msgstr "ნაგულისხმევი"
+msgstr "ხელის მოწერა დიალოგი ნაგულისხმები სიმაღლე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 #, fuzzy
 msgid "Subscribe dialog default width"
-msgstr "ნაგულისხმევი"
+msgstr "ხელის მოწერა დიალოგი ნაგულისხმები სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:80
+#, fuzzy
 msgid "Terminal font"
-msgstr ""
+msgstr "ტერმინალი"
 
 #: ../mail/evolution-mail.schemas.in.in.h:81
 #, fuzzy
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "დღე."
+msgstr "ურნა - დღე."
 
 #: ../mail/evolution-mail.schemas.in.in.h:82
+#, fuzzy
 msgid "The terminal font for mail display"
-msgstr ""
+msgstr "ტერმინალი ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
 msgid "The variable width font for mail display"
-msgstr ""
+msgstr "სიგანე ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
 #, fuzzy
@@ -13164,19 +13488,22 @@ msgid ""
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
-msgstr "a და -სკენ&lt; ჩართული&gt; ჩართული -სკენ."
+msgstr "გასაღები შეიცავს a სია - და -სკენ -&lt; თავსართი ჩართული&gt; ჩართული თავსართი -სკენ - ფოსტა."
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
+#, fuzzy
 msgid "Thread the message list."
-msgstr ""
+msgstr "სია."
 
 #: ../mail/evolution-mail.schemas.in.in.h:86
+#, fuzzy
 msgid "Thread the message-list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/evolution-mail.schemas.in.in.h:87
+#, fuzzy
 msgid "Thread the message-list based on Subject"
-msgstr ""
+msgstr "სია ჩართულია თემა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:88
 #, fuzzy
@@ -13191,17 +13518,17 @@ msgstr "დაყოვნების დრო."
 #: ../mail/evolution-mail.schemas.in.in.h:90
 #, fuzzy
 msgid "UID string of the default account."
-msgstr "UID ნაგულისხმევი."
+msgstr "UID სტრიქონი - ნაგულისხმები ანგარიში."
 
 #: ../mail/evolution-mail.schemas.in.in.h:91
 #, fuzzy
 msgid "Use Spamassassin daemon and client"
-msgstr "და"
+msgstr "გამოყენება და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:92
 #, fuzzy
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "და"
+msgstr "გამოყენება და"
 
 #: ../mail/evolution-mail.schemas.in.in.h:93
 #, fuzzy
@@ -13211,7 +13538,7 @@ msgstr "გამოყენება"
 #: ../mail/evolution-mail.schemas.in.in.h:94
 #, fuzzy
 msgid "Use custom fonts for displaying mail"
-msgstr "გამოყენება"
+msgstr "გამოყენება ფოსტა"
 
 #: ../mail/evolution-mail.schemas.in.in.h:95
 #, fuzzy
@@ -13221,65 +13548,69 @@ msgstr "გამოყენება."
 #: ../mail/evolution-mail.schemas.in.in.h:96
 #, fuzzy
 msgid "Use only the local spam tests (no DNS)."
-msgstr "არა."
+msgstr "გამოყენება არა DNS."
 
 #: ../mail/evolution-mail.schemas.in.in.h:97
+#, fuzzy
 msgid "Variable width font"
-msgstr ""
+msgstr "ცვლადი სიგანე"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 #, fuzzy
 msgid "View/Bcc menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება უხილავი ასლი მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:99
 #, fuzzy
 msgid "View/Bcc menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება უხილავი ასლი მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:100
 #, fuzzy
 msgid "View/Cc menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება ასლი მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:101
 #, fuzzy
 msgid "View/Cc menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება ასლი მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:102
 #, fuzzy
 msgid "View/From menu item is checked"
-msgstr "ხედი ვისგან"
+msgstr "ჩვენება -დან მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:103
 #, fuzzy
 msgid "View/From menu item is checked."
-msgstr "ხედი ვისგან."
+msgstr "ჩვენება -დან მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:104
+#, fuzzy
 msgid "View/PostTo menu item is checked"
-msgstr ""
+msgstr "ჩვენება მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:105
+#, fuzzy
 msgid "View/PostTo menu item is checked."
-msgstr ""
+msgstr "ჩვენება მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:106
 #, fuzzy
 msgid "View/ReplyTo menu item is checked"
-msgstr "ხედი"
+msgstr "ჩვენება მენიუ"
 
 #: ../mail/evolution-mail.schemas.in.in.h:107
 #, fuzzy
 msgid "View/ReplyTo menu item is checked."
-msgstr "ხედი."
+msgstr "ჩვენება მენიუ."
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
-msgstr ""
+msgstr "ან არა -სკენ ჩართულია არა შეიცავს პასუხი ვის ან."
 
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
@@ -13292,19 +13623,19 @@ msgstr "ევოლუშენ Elm იმპორტერი"
 #: ../mail/importers/elm-importer.c:382
 #, fuzzy
 msgid "Import mail from Elm."
-msgstr "იმპორტი."
+msgstr "იმპორტი ფოსტა."
 
 #: ../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:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 #, fuzzy
 msgid "Select folder to import into"
-msgstr "-სკენ"
+msgstr "ამორჩევა -სკენ იმპორტი"
 
 #: ../mail/importers/evolution-mbox-importer.c:223
 #, fuzzy
@@ -13319,8 +13650,9 @@ msgstr "საფოსტო ყუთი"
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
+#, fuzzy
 msgid "Importing `%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
@@ -13331,20 +13663,22 @@ msgstr ""
 
 #: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
+#, fuzzy
 msgid "Importing mailbox"
-msgstr ""
+msgstr "საფოსტო ყუთი"
 
 #: ../mail/importers/mail-importer.c:376
 #, fuzzy, c-format
 msgid "Scanning %s"
-msgstr "სკანირება"
+msgstr "სკანირება წმ"
 
 #: ../mail/importers/netscape-importer.c:74
 #, fuzzy, c-format
 msgid "Priority Filter \"%s\""
-msgstr "პრიორიტეტი ფილტრი"
+msgstr "პრიორიტეტი ფილტრი წმ"
 
 #: ../mail/importers/netscape-importer.c:663
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -13357,32 +13691,36 @@ msgid ""
 "Evolution's scores, and the affected filters use scores instead\n"
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
-msgstr ""
+msgstr "- Netscape ელფოსტა ჩართულია არა - Evolution Evolution ქულები - - არა -სკენ -სკენ და არა a a - პრიორიტეტი ფილტრი Netscape წმ ელფოსტა წმ ქულები და ქულები შემოწმება -სკენ."
 
 #: ../mail/importers/netscape-importer.c:687
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
-msgstr ""
+msgstr "- Netscape ელფოსტა იგნორირება ან არა - Evolution."
 
 #: ../mail/importers/netscape-importer.c:704
+#, fuzzy
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
 "which is not supported in Evolution. Those filters\n"
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
-msgstr ""
+msgstr "- Netscape ელფოსტა - - -სკენ a სტრიქონი არა - Evolution შეცვლილი -სკენ სტრიქონი ან არა -."
 
 #: ../mail/importers/netscape-importer.c:1251
+#, fuzzy
 msgid "Evolution is importing your old Netscape data"
-msgstr ""
+msgstr "Evolution Netscape"
 
 #: ../mail/importers/netscape-importer.c:1708
+#, fuzzy
 msgid "Importing Netscape data"
-msgstr ""
+msgstr "Netscape"
 
 #: ../mail/importers/netscape-importer.c:1908
 #, fuzzy
@@ -13392,13 +13730,14 @@ msgstr "პარამეტრები"
 #: ../mail/importers/netscape-importer.c:1913
 #, fuzzy
 msgid "Mail Filters"
-msgstr "ფილტრები"
+msgstr "ფოსტა ფილტრები"
 
 #: ../mail/importers/netscape-importer.c:1934
+#, fuzzy
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
-msgstr ""
+msgstr "Evolution Netscape ფოსტა ფაილი -სკენ Evolution?"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
@@ -13412,17 +13751,18 @@ msgstr "Evolution"
 #: ../mail/importers/pine-importer.c:434
 #, fuzzy
 msgid "Import mail from Pine."
-msgstr "იმპორტი."
+msgstr "იმპორტი ფოსტა."
 
 #: ../mail/mail-autofilter.c:79
 #, fuzzy, c-format
 msgid "Mail to %s"
-msgstr "-სკენ"
+msgstr "ფოსტა -სკენ წმ"
 
 #: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
+#, fuzzy
 msgid "Mail from %s"
-msgstr ""
+msgstr "ფოსტა წმ"
 
 #: ../mail/mail-autofilter.c:266
 #, c-format
@@ -13431,13 +13771,14 @@ msgstr "თემა არის %s"
 
 #: ../mail/mail-autofilter.c:301
 #, c-format
+#, fuzzy
 msgid "%s mailing list"
-msgstr ""
+msgstr "წმ სია"
 
 #: ../mail/mail-autofilter.c:372
 #, fuzzy
 msgid "Add Filter Rule"
-msgstr "დამატება ფილტრი"
+msgstr "დამატება ფილტრი წესი"
 
 #: ../mail/mail-component.c:521
 #, c-format
@@ -13448,43 +13789,38 @@ msgstr[0] "%d წაშლილია"
 #: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:548
 #, c-format
+#, fuzzy
 msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] ""
+msgstr "გაგზავნილი"
 
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:554
 #, c-format
 msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-component.c:779
 #, fuzzy
 msgid "New Mail Message"
-msgstr "ახალი შეტყობინება"
+msgstr "ახალი ფოსტა შეტყობინება"
 
 #: ../mail/mail-component.c:780
 msgid "_Mail Message"
@@ -13493,12 +13829,12 @@ msgstr "_წერილი"
 #: ../mail/mail-component.c:781
 #, fuzzy
 msgid "Compose a new mail message"
-msgstr "a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../mail/mail-component.c:787
 #, fuzzy
 msgid "New Mail Folder"
-msgstr "ახალი საქაღალდე"
+msgstr "ახალი ფოსტა საქაღალდე"
 
 #: ../mail/mail-component.c:788
 msgid "Mail _Folder"
@@ -13507,12 +13843,12 @@ msgstr "წერილების _საქაღალდე"
 #: ../mail/mail-component.c:789
 #, fuzzy
 msgid "Create a new mail folder"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../mail/mail-component.c:933
 #, fuzzy
 msgid "Failed upgrading Mail settings or folders."
-msgstr "ოპერაცია ვერ/არ ჩატარდა."
+msgstr "ვერ განხორციელდა ფოსტა ან."
 
 #: ../mail/mail-config.c:85
 msgid "I_mportant"
@@ -13520,9 +13856,8 @@ msgstr "_მნიშვნელოვანი"
 
 #. red
 #: ../mail/mail-config.c:86
-#, fuzzy
 msgid "_Work"
-msgstr "სამსახური"
+msgstr "_სამსახური"
 
 #. orange
 #: ../mail/mail-config.c:87
@@ -13531,9 +13866,8 @@ msgstr "_პირადი"
 
 #. forest green
 #: ../mail/mail-config.c:88
-#, fuzzy
 msgid "_To Do"
-msgstr "ვის"
+msgstr "_გასაკეთებელი"
 
 #. blue
 #: ../mail/mail-config.c:89
@@ -13553,7 +13887,7 @@ msgstr ""
 #: ../mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b> SSL Evolution</b>"
+msgstr "<b> SSL არა - - Evolution</b>"
 
 #: ../mail/mail-config.glade.h:5
 #, fuzzy
@@ -13565,8 +13899,9 @@ msgid "<b>_Languages</b>"
 msgstr "<b>_ენები</b>"
 
 #: ../mail/mail-config.glade.h:7
+#, fuzzy
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
+msgstr "<small> მეტი</small>"
 
 #: ../mail/mail-config.glade.h:8
 #, fuzzy
@@ -13582,8 +13917,9 @@ msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">აუთენტიფიკაცია</span>"
 
 #: ../mail/mail-config.glade.h:12
+#, fuzzy
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr ""
+msgstr "<span weight=\"bold\"> შეტყობინებები</span>"
 
 #: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -13597,11 +13933,12 @@ msgstr "<span weight=\"bold\"> ნაგულისხმევი ქცევ
 #: ../mail/mail-config.glade.h:15
 #, fuzzy
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\"> წაშლა</span>"
+msgstr "<span weight=\"bold\"> წაშლა ფოსტა</span>"
 
 #: ../mail/mail-config.glade.h:16
+#, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr ""
+msgstr "<span weight=\"bold\"> ფოსტა სათაურები</span>"
 
 #: ../mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -13615,7 +13952,7 @@ msgstr "<span weight=\"bold\"> და ფერები</span>"
 #: ../mail/mail-config.glade.h:20
 #, fuzzy
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\"> სურათები</span>"
+msgstr "<span weight=\"bold\"> ჩატვირვა სურათები</span>"
 
 #: ../mail/mail-config.glade.h:21
 #, fuzzy
@@ -13635,13 +13972,13 @@ msgstr "<span weight=\"bold\"> შეტყობინება</span>"
 #: ../mail/mail-config.glade.h:24
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\"> ახალი შეტყობინება</span>"
+msgstr "<span weight=\"bold\"> ახალი ფოსტა ნოიფიკაცია</span>"
 
 #: ../mail/mail-config.glade.h:25
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 #, fuzzy
 msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\"> ინფორმაცია</span>"
+msgstr "<span weight=\"bold\"> დამატებით ინფორმაცია</span>"
 
 #: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Options</span>"
@@ -13650,7 +13987,7 @@ msgstr "<span weight=\"bold\">ოფციები</span>"
 #: ../mail/mail-config.glade.h:27
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\"> პრივატობა</span>"
+msgstr "<span weight=\"bold\"> პრივატობა PGP</span>"
 
 #: ../mail/mail-config.glade.h:28
 #, fuzzy
@@ -13660,7 +13997,7 @@ msgstr "<span weight=\"bold\"> შრიფტები</span>"
 #: ../mail/mail-config.glade.h:29
 #, fuzzy
 msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\"> ინფორმაცია</span>"
+msgstr "<span weight=\"bold\"> აუცილებელია ინფორმაცია</span>"
 
 #: ../mail/mail-config.glade.h:30
 #, fuzzy
@@ -13674,7 +14011,7 @@ msgstr "<span weight=\"bold\">უსაფრთხოება</span>"
 #: ../mail/mail-config.glade.h:32
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\"> და</span>"
+msgstr "<span weight=\"bold\"> გაგზავნა და შეტყობინებები</span>"
 
 #: ../mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Server Configuration</span>"
@@ -13691,44 +14028,48 @@ msgid "Add Ne_w Signature..."
 msgstr "დამატება ხელმოწერა."
 
 #: ../mail/mail-config.glade.h:37
-#, fuzzy
 msgid "Add _Script"
-msgstr "დამატება"
+msgstr "სკრიპტის _დამატება"
 
 #: ../mail/mail-config.glade.h:38
+#, fuzzy
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr ""
+msgstr "გამავალი ანგარიში"
 
 #: ../mail/mail-config.glade.h:39
+#, fuzzy
 msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr ""
+msgstr "-სკენ f ფოსტა"
 
 #: ../mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "კოპია -სკენ:"
+msgstr "წმ კოპირება -სკენ:"
 
 #: ../mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ყოველთვის კოპია -სკენ:"
+msgstr "ყოველთვის კოპირება -სკენ:"
 
 #: ../mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "ყოველთვის"
+msgstr "ყოველთვის -"
 
 #: ../mail/mail-config.glade.h:43
+#, fuzzy
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr ""
+msgstr "ყოველთვის -სკენ ფოსტა"
 
 #: ../mail/mail-config.glade.h:44
+#, fuzzy
 msgid "Attach original message"
-msgstr ""
+msgstr "ორიგინალი"
 
 #: ../mail/mail-config.glade.h:46
+#, fuzzy
 msgid "Automatically insert _smiley images"
-msgstr ""
+msgstr "ავრომატურად"
 
 #: ../mail/mail-config.glade.h:47
 #, fuzzy
@@ -13741,12 +14082,14 @@ msgid "Baltic (ISO-8859-4)"
 msgstr "ბალტიური ISO"
 
 #: ../mail/mail-config.glade.h:49
+#, fuzzy
 msgid "Beep w_hen new mail arrives"
-msgstr ""
+msgstr "ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:50
+#, fuzzy
 msgid "C_haracter set:"
-msgstr ""
+msgstr "C:"
 
 #: ../mail/mail-config.glade.h:51
 msgid "Ch_eck for Supported Types "
@@ -13755,16 +14098,17 @@ msgstr ""
 #: ../mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Check in_coming mail for junk"
-msgstr "შემოწმება"
+msgstr "შემოწმება - ფოსტა"
 
 #: ../mail/mail-config.glade.h:53
 #, fuzzy
 msgid "Check spelling while I _type"
-msgstr "შემოწმება I ტიპი"
+msgstr "შემოწმება I"
 
 #: ../mail/mail-config.glade.h:54
+#, fuzzy
 msgid "Checks incoming mail messages to be Junk"
-msgstr ""
+msgstr "შემომავალი ფოსტა -სკენ"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
@@ -13784,10 +14128,12 @@ msgid "Colors"
 msgstr "ფერები"
 
 #: ../mail/mail-config.glade.h:59
+#, fuzzy
 msgid "Confirm _when expunging a folder"
-msgstr ""
+msgstr "დამოწმება a"
 
 #: ../mail/mail-config.glade.h:60
+#, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13795,7 +14141,7 @@ msgid ""
 "using Evolution. \n"
 "\n"
 "Click \"Apply\" to save your settings."
-msgstr ""
+msgstr "ფოსტა არა ახლა -სკენ და ელფოსტა Evolution არა გამოყენება -სკენ შენახვა."
 
 #: ../mail/mail-config.glade.h:66
 msgid "De_fault"
@@ -13809,16 +14155,16 @@ msgstr "ნაგულისხმევი e:"
 #: ../mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "ნაგულისხმევი"
+msgstr "გამავალი ნაგულისხმები"
 
 #: ../mail/mail-config.glade.h:71
+#, fuzzy
 msgid "Do not quote original message"
-msgstr ""
+msgstr "არა ბრჭყალები ორიგინალი"
 
 #: ../mail/mail-config.glade.h:72
-#, fuzzy
 msgid "Done"
-msgstr "შესრულდა"
+msgstr "შესრულებული"
 
 #: ../mail/mail-config.glade.h:73
 #, fuzzy
@@ -13827,8 +14173,9 @@ msgstr "საქაღალდე:"
 
 #: ../mail/mail-config.glade.h:74
 #: ../plugins/publish-calendar/publish-calendar.glade.h:9
+#, fuzzy
 msgid "E_nable"
-msgstr ""
+msgstr "E"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -13837,12 +14184,12 @@ msgstr "საფოსტო ანგარიშები"
 #: ../mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Email _Address:"
-msgstr "Email მისამართი:"
+msgstr "ელფოსტა მისამართი:"
 
 #: ../mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Empty trash folders on e_xit"
-msgstr "ცარიელი e"
+msgstr "ცარიელი ურნა ჩართულია e"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Encry_ption certificate:"
@@ -13851,26 +14198,27 @@ msgstr ""
 #: ../mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Encrypt out_going messages (by default)"
-msgstr "დაშიფვრა ნაგულისხმევი"
+msgstr "დაშიფვრა ნაგულისხმები"
 
 #: ../mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Fi_xed width Font:"
-msgstr "შრიფტი:"
+msgstr "სიგანე შრიფტი:"
 
 #: ../mail/mail-config.glade.h:82
+#, fuzzy
 msgid "Fi_xed-width:"
-msgstr ""
+msgstr "სიგანე:"
 
 #: ../mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Font Properties"
-msgstr "შრიფტის პარამეტრები"
+msgstr "შრიფტი პარამეტრები"
 
 #: ../mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Format messages in _HTML"
-msgstr "ფორმატი"
+msgstr "ფორმატი - HTML"
 
 #: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
@@ -13881,16 +14229,19 @@ msgid "HTML Mail"
 msgstr "HTML წერილი"
 
 #: ../mail/mail-config.glade.h:88
+#, fuzzy
 msgid "Headers"
-msgstr ""
+msgstr "სათაურები"
 
 #: ../mail/mail-config.glade.h:89
+#, fuzzy
 msgid "Highlight _quotations with"
-msgstr ""
+msgstr "მარკირებული"
 
 #: ../mail/mail-config.glade.h:90
+#, fuzzy
 msgid "I_nclude remote tests"
-msgstr ""
+msgstr "I"
 
 #: ../mail/mail-config.glade.h:93
 msgid "Inline"
@@ -13899,16 +14250,17 @@ msgstr ""
 #: ../mail/mail-config.glade.h:95
 #, fuzzy
 msgid "Languages Table"
-msgstr "ენები"
+msgstr "ენები ცხრილი"
 
 #: ../mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Mail Configuration"
-msgstr "კონფიგურაცია"
+msgstr "ფოსტა გამართვა"
 
 #: ../mail/mail-config.glade.h:98
+#, fuzzy
 msgid "Mail Headers Table"
-msgstr ""
+msgstr "ფოსტა სათაურები ცხრილი"
 
 #: ../mail/mail-config.glade.h:100
 #, fuzzy
@@ -13925,7 +14277,7 @@ msgstr "შეტყობინება"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "შენიშვნა a"
+msgstr "შენიშვნა არა a პირველი"
 
 #: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
@@ -13934,43 +14286,48 @@ msgstr "ორ_განიზაცია:"
 #: ../mail/mail-config.glade.h:104
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
-msgstr "გასაღები ID:"
+msgstr "PGP გასაღები ID:"
 
 #: ../mail/mail-config.glade.h:107
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
-msgstr "დაკვრა"
+msgstr "დაკვრა ფაილი ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:108
+#, fuzzy
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
-msgstr ""
+msgstr "a სახელი ანგარიში - სახელი."
 
 #: ../mail/mail-config.glade.h:110
+#, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
-msgstr ""
+msgstr "შესახებ ფოსტა არა ან ინტერნეტი სერვისი."
 
 #: ../mail/mail-config.glade.h:111
+#, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
-msgstr ""
+msgstr "სახელი და ელფოსტა არა -სკენ - -სკენ შემცველობა - ელფოსტა."
 
 #: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:113
+#, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
+msgstr "უხილავი ასლი"
 
 #: ../mail/mail-config.glade.h:114
+#, fuzzy
 msgid "Quote original message"
-msgstr ""
+msgstr "ორიგინალი"
 
 #: ../mail/mail-config.glade.h:115
 msgid "Quoted"
@@ -13991,8 +14348,9 @@ msgid "Remember _password"
 msgstr "დაიმახსოვრე"
 
 #: ../mail/mail-config.glade.h:120
+#, fuzzy
 msgid "S_elect..."
-msgstr ""
+msgstr "S."
 
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
@@ -14005,25 +14363,27 @@ msgstr ""
 #: ../mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Select HTML fixed width font"
-msgstr "სტაციონარული"
+msgstr "ამორჩევა HTML სტაციონარული სიგანე"
 
 #: ../mail/mail-config.glade.h:125
 #, fuzzy
 msgid "Select HTML fixed width font for printing"
-msgstr "სტაციონარული"
+msgstr "ამორჩევა HTML სტაციონარული სიგანე"
 
 #: ../mail/mail-config.glade.h:126
+#, fuzzy
 msgid "Select HTML variable width font"
-msgstr ""
+msgstr "ამორჩევა HTML სიგანე"
 
 #: ../mail/mail-config.glade.h:127
+#, fuzzy
 msgid "Select HTML variable width font for printing"
-msgstr ""
+msgstr "ამორჩევა HTML სიგანე"
 
 #: ../mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Select sound file"
-msgstr "ფაილის არჩევა"
+msgstr "ამორჩევა ფაილი"
 
 #: ../mail/mail-config.glade.h:129
 #, fuzzy
@@ -14031,17 +14391,19 @@ msgid "Send message receipts:"
 msgstr "გაგზავნა:"
 
 #: ../mail/mail-config.glade.h:131
+#, fuzzy
 msgid "Sending Mail"
-msgstr ""
+msgstr "გაგზავნა ფოსტა"
 
 #: ../mail/mail-config.glade.h:132
 #, fuzzy
 msgid "Sent _Messages Folder:"
-msgstr "საქაღალდე:"
+msgstr "გაგზავნა შეტყობინებები საქაღალდე:"
 
 #: ../mail/mail-config.glade.h:133
+#, fuzzy
 msgid "Ser_ver requires authentication"
-msgstr ""
+msgstr "აუთენტიფიკაცია"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
@@ -14056,12 +14418,14 @@ msgid "Signat_ure:"
 msgstr ""
 
 #: ../mail/mail-config.glade.h:137
+#, fuzzy
 msgid "Signatures"
-msgstr ""
+msgstr "ხელმოწერები"
 
 #: ../mail/mail-config.glade.h:138
+#, fuzzy
 msgid "Signatures Table"
-msgstr ""
+msgstr "ხელმოწერები ცხრილი"
 
 #: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
@@ -14081,29 +14445,31 @@ msgstr "ტ_იპი: "
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "a."
+msgstr "სია - a."
 
 #: ../mail/mail-config.glade.h:143
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
-msgstr ""
+msgstr "- სახელი "
 
 #: ../mail/mail-config.glade.h:147
 #, fuzzy
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
-msgstr "ტიპი -სკენ -სკენ სამსახური პირადი"
+msgstr "ტიპი სახელი -სკენ -სკენ ანგარიში მაგალითი სამსახური ან პირადი"
 
 #: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "მომხმარებელი:"
 
 #: ../mail/mail-config.glade.h:150
+#, fuzzy
 msgid "V_ariable-width:"
-msgstr ""
+msgstr "სიგანე:"
 
 #: ../mail/mail-config.glade.h:151
 #, fuzzy
@@ -14111,7 +14477,7 @@ msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
-msgstr "მოგესალმებით -სკენ Evolution კონფიგურაცია ასისტენტი n -სკენ "
+msgstr "მოგესალმებით -სკენ Evolution ფოსტა გამართვა ასისტენტი არა წინ -სკენ "
 
 #: ../mail/mail-config.glade.h:155
 #, fuzzy
@@ -14124,13 +14490,14 @@ msgid "_Always load images from the Internet"
 msgstr "ყოველთვის ინტერნეტი"
 
 #: ../mail/mail-config.glade.h:157
+#, fuzzy
 msgid "_Do not notify me when new mail arrives"
-msgstr ""
+msgstr "არა ახალი ფოსტა"
 
 #: ../mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Outlook"
+msgstr "არა Outlook"
 
 #: ../mail/mail-config.glade.h:160
 #, fuzzy
@@ -14140,12 +14507,12 @@ msgstr "წინ:"
 #: ../mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Load images in mail from contacts"
-msgstr "ჩატვირთვა"
+msgstr "ჩატვირთვა - ფოსტა"
 
 #: ../mail/mail-config.glade.h:162
 #, fuzzy
 msgid "_Make this my default account"
-msgstr "ნაგულისხმევი"
+msgstr "Make ნაგულისხმები ანგარიში"
 
 #: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
@@ -14161,36 +14528,40 @@ msgid "_Path:"
 msgstr "_გეზი:"
 
 #: ../mail/mail-config.glade.h:167
+#, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr ""
+msgstr "მოთხოვნა HTML -სკენ არა"
 
 #: ../mail/mail-config.glade.h:168
+#, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr ""
+msgstr "მოთხოვნა თემა ხაზი"
 
 #: ../mail/mail-config.glade.h:169
+#, fuzzy
 msgid "_Reply style:"
-msgstr ""
+msgstr "პასუხი:"
 
 #: ../mail/mail-config.glade.h:170
+#, fuzzy
 msgid "_Script:"
-msgstr ""
+msgstr "სკრიპტი:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Show image animations"
-msgstr "ანახე"
+msgstr "ჩვენება ნახატი"
 
 #: ../mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Use Secure Connection:"
-msgstr "კავშირები:"
+msgstr "გამოყენება კავშირი:"
 
 #: ../mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Use the same fonts as other applications"
-msgstr "გამოყენება"
+msgstr "გამოყენება სხვა"
 
 #: ../mail/mail-config.glade.h:176
 msgid "color"
@@ -14204,7 +14575,7 @@ msgstr "აღწერა"
 #: ../mail/mail-dialogs.glade.h:2
 #, fuzzy
 msgid "<b>Search Folder Sources</b>"
-msgstr "<b> ძებნა საქაღალდე</b>"
+msgstr "<b> ძებნა საქაღალდე წყაროები</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 #, fuzzy
@@ -14225,18 +14596,20 @@ msgid "Co_mpleted"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:8
+#, fuzzy
 msgid "F_ind:"
-msgstr ""
+msgstr "F:"
 
 #: ../mail/mail-dialogs.glade.h:9
 #, fuzzy
 msgid "Find in Message"
-msgstr "ძებნა შეტყობინება"
+msgstr "ძიება - შეტყობინება"
 
 #: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
+#, fuzzy
 msgid "Flag to Follow Up"
-msgstr ""
+msgstr "-სკენ მიყოლა ზემოთ"
 
 #: ../mail/mail-dialogs.glade.h:11
 #, fuzzy
@@ -14251,7 +14624,7 @@ msgstr "სალიცენზიო შეთანხმება"
 #: ../mail/mail-dialogs.glade.h:13
 #, fuzzy
 msgid "None Selected"
-msgstr "არა"
+msgstr "არა მონიშნული"
 
 #: ../mail/mail-dialogs.glade.h:14
 msgid "S_erver:"
@@ -14262,56 +14635,65 @@ msgid "Security Information"
 msgstr "უსაფრთხოების ინფორმაცია"
 
 #: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
+#, fuzzy
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+msgstr "ზემოთ a ზემოთ მოქმედება მენიუ."
 
 #: ../mail/mail-dialogs.glade.h:19
 msgid "_Accept License"
 msgstr "_მიიღე ლიცენზია"
 
 #: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
+#, fuzzy
 msgid "_Due By:"
-msgstr ""
+msgstr "ვადა:"
 
 #: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:22
+#, fuzzy
 msgid "_Subscribe"
-msgstr ""
+msgstr "ხელის მოწერა"
 
 #: ../mail/mail-dialogs.glade.h:23
+#, fuzzy
 msgid "_Tick this to accept the license agreement"
-msgstr ""
+msgstr "-სკენ მიღება"
 
 #: ../mail/mail-dialogs.glade.h:24
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
+#, fuzzy
 msgid "_Unsubscribe"
-msgstr ""
+msgstr "ხელმოუწერელი"
 
 #: ../mail/mail-dialogs.glade.h:25
 msgid "specific folders only"
 msgstr ""
 
 #: ../mail/mail-dialogs.glade.h:26
+#, fuzzy
 msgid "with all active remote folders"
-msgstr ""
+msgstr "ყველა აქტიური"
 
 #: ../mail/mail-dialogs.glade.h:27
+#, fuzzy
 msgid "with all local and active remote folders"
-msgstr ""
+msgstr "ყველა და აქტიური"
 
 #: ../mail/mail-dialogs.glade.h:28
+#, fuzzy
 msgid "with all local folders"
-msgstr ""
+msgstr "ყველა"
 
 #: ../mail/mail-folder-cache.c:858
 #, c-format
+#, fuzzy
 msgid "Pinging %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:104
 #, fuzzy
@@ -14319,45 +14701,47 @@ msgid "Filtering Folder"
 msgstr "საქაღალდე"
 
 #: ../mail/mail-ops.c:265
+#, fuzzy
 msgid "Fetching Mail"
-msgstr ""
+msgstr "ფოსტა"
 
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:565
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ გამოყენება გამავალი წმ"
 
 #: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, fuzzy, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ -სკენ -სკენ."
+msgstr "ვერ განხორციელდა -სკენ -სკენ წმ წმ -სკენ გაგზავნა."
 
 #: ../mail/mail-ops.c:623
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ -სკენ"
+msgstr "ვერ განხორციელდა -სკენ -სკენ გაგზავნა წმ"
 
 #: ../mail/mail-ops.c:735
 #, c-format
+#, fuzzy
 msgid "Sending message %d of %d"
-msgstr ""
+msgstr "გაგზავნა -"
 
 #: ../mail/mail-ops.c:760
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ -"
 
 #: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
-#, fuzzy
 msgid "Canceled."
 msgstr "გაუქმებულია."
 
 #: ../mail/mail-ops.c:764
+#, fuzzy
 msgid "Complete."
-msgstr ""
+msgstr "შესრულებულია."
 
 #: ../mail/mail-ops.c:861
 #, fuzzy
@@ -14367,12 +14751,12 @@ msgstr "ვიმახსოვრებ -სკენ"
 #: ../mail/mail-ops.c:946
 #, fuzzy, c-format
 msgid "Moving messages to %s"
-msgstr "გადატანის პროცესში -სკენ"
+msgstr "გადატანის პროცესში -სკენ წმ"
 
 #: ../mail/mail-ops.c:946
 #, fuzzy, c-format
 msgid "Copying messages to %s"
-msgstr "ვაკოპირებ -სკენ"
+msgstr "ვაკოპირებ -სკენ წმ"
 
 #: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
@@ -14380,33 +14764,38 @@ msgstr "გადაგზავნილი წერილები"
 
 #: ../mail/mail-ops.c:1212
 #, c-format
+#, fuzzy
 msgid "Opening folder %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1284
 #, c-format
+#, fuzzy
 msgid "Opening store %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1362
 #, c-format
+#, fuzzy
 msgid "Removing folder %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1456
 #, c-format
+#, fuzzy
 msgid "Storing folder '%s'"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1521
 #, fuzzy, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "და"
+msgstr "და ანგარიში წმ"
 
 #: ../mail/mail-ops.c:1522
 #, c-format
+#, fuzzy
 msgid "Storing account '%s'"
-msgstr ""
+msgstr "ანგარიში წმ"
 
 #: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
@@ -14418,8 +14807,9 @@ msgstr ""
 
 #: ../mail/mail-ops.c:1661
 #, c-format
+#, fuzzy
 msgid "Emptying trash in '%s'"
-msgstr ""
+msgstr "ურნა - წმ"
 
 #: ../mail/mail-ops.c:1662
 #, fuzzy
@@ -14428,60 +14818,73 @@ msgstr "ლოკალური საქაღალდეები"
 
 #: ../mail/mail-ops.c:1745
 #, c-format
+#, fuzzy
 msgid "Retrieving message %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
-msgid_plural "Retrieving %d messages"
-msgstr[0] ""
+msgstr ""
 
 #: ../mail/mail-ops.c:1941
 #, c-format
+#, fuzzy
 msgid "Saving %d message"
-msgid_plural "Saving %d messsages"
-msgstr[0] ""
+msgstr "ვიმახსოვრებ"
 
 #: ../mail/mail-ops.c:1991
 #, c-format
+#, fuzzy
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
+"-სკენ ფაილი წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2019
 #, c-format
+#, fuzzy
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
+"შეცდომა -სკენ წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2091
+#, fuzzy
 msgid "Saving attachment"
-msgstr ""
+msgstr "ვიმახსოვრებ"
 
 #: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
+#, fuzzy
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
+"ფაილი წმ\n"
+" წმ"
 
 #: ../mail/mail-ops.c:2120
 #, c-format
+#, fuzzy
 msgid "Could not write data: %s"
-msgstr ""
+msgstr "არა წმ"
 
 #: ../mail/mail-ops.c:2269
 #, c-format
+#, fuzzy
 msgid "Disconnecting from %s"
-msgstr ""
+msgstr "წმ"
 
 #: ../mail/mail-ops.c:2269
 #, c-format
+#, fuzzy
 msgid "Reconnecting to %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../mail/mail-ops.c:2385
 #, fuzzy
@@ -14489,37 +14892,38 @@ msgid "Checking Service"
 msgstr "სერვისი"
 
 #: ../mail/mail-send-recv.c:158
-#, fuzzy
 msgid "Canceling..."
-msgstr "გაუქმება"
+msgstr "ვაუქმებ..."
 
 #: ../mail/mail-send-recv.c:329
 #, fuzzy
 msgid "Send & Receive Mail"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა მიღება ფოსტა"
 
 #: ../mail/mail-send-recv.c:336
 #, fuzzy
 msgid "Cancel _All"
-msgstr "გაუქმება ყველა"
+msgstr "შეწყვეტა ყველა"
 
 #: ../mail/mail-send-recv.c:425
+#, fuzzy
 msgid "Updating..."
-msgstr ""
+msgstr "მიმდინარეობს განახლება..."
 
 #: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "ველოდები..."
 
 #: ../mail/mail-send-recv.c:709
+#, fuzzy
 msgid "Checking for new mail"
-msgstr ""
+msgstr "ახალი ფოსტა"
 
 #: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, fuzzy, c-format
 msgid "Enter Password for %s"
-msgstr "პაროლი"
+msgstr "შეყვანა პაროლი წმ"
 
 #: ../mail/mail-session.c:206
 msgid "Enter Password"
@@ -14531,13 +14935,13 @@ msgid "User canceled operation."
 msgstr "მომხმარებელი."
 
 #: ../mail/mail-signature-editor.c:384
-#, fuzzy
 msgid "Edit signature"
-msgstr "რედაქტირება"
+msgstr "ხელმოწერის რედაქტირება"
 
 #: ../mail/mail-signature-editor.c:431
+#, fuzzy
 msgid "Enter a name for this signature."
-msgstr ""
+msgstr "შეყვანა a სახელი."
 
 #: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:5
@@ -14546,13 +14950,15 @@ msgstr "სახელი:"
 
 #: ../mail/mail-tools.c:120
 #, c-format
+#, fuzzy
 msgid "Could not create spool directory `%s': %s"
-msgstr ""
+msgstr "არა წმ წმ"
 
 #: ../mail/mail-tools.c:150
 #, c-format
+#, fuzzy
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "-სკენ a წმ"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14565,23 +14971,24 @@ msgstr "გადაგზავნილი წერილები"
 
 #: ../mail/mail-tools.c:298
 #, c-format
+#, fuzzy
 msgid "Invalid folder: `%s'"
-msgstr ""
+msgstr "არასწორი წმ"
 
 #: ../mail/mail-vfolder.c:91
 #, fuzzy, c-format
 msgid "Setting up Search Folder: %s"
-msgstr "პარამეტრი ძებნა საქაღალდე"
+msgstr "ზემოთ ძებნა საქაღალდე წმ"
 
 #: ../mail/mail-vfolder.c:240
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s:%s'"
-msgstr "ძებნა საქაღალდეები"
+msgstr "ძებნა საქაღალდეები წმ წმ"
 
 #: ../mail/mail-vfolder.c:247
 #, fuzzy, c-format
 msgid "Updating Search Folders for '%s'"
-msgstr "ძებნა საქაღალდეები"
+msgstr "ძებნა საქაღალდეები წმ"
 
 #: ../mail/mail-vfolder.c:1050
 #, fuzzy
@@ -14596,7 +15003,7 @@ msgstr "ახალი ძებნა საქაღალდე"
 #: ../mail/mail.error.xml.h:1
 #, fuzzy
 msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
-msgstr "A&quot;&quot; a."
+msgstr "A&quot;&quot; a სახელი."
 
 #: ../mail/mail.error.xml.h:2
 #, fuzzy
@@ -14605,71 +15012,77 @@ msgid ""
 "\n"
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
-msgstr "A&quot;&quot; n -სკენ n"
+msgstr "A ეთ&quot;&quot; არა -სკენ ან ან დასრულება არა"
 
 #: ../mail/mail.error.xml.h:6
 #, fuzzy
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "A&quot;&quot; გაგზავნა -სკენ?"
+msgstr "A მოთხოვნილი&quot;&quot; გაგზავნა -სკენ?"
 
 #: ../mail/mail.error.xml.h:7
 #, fuzzy
 msgid ""
 "A signature already exists with the name &quot;{0}&quot;. Please specify a "
 "different name."
-msgstr "A&quot;&quot; a."
+msgstr "A სახელი&quot;&quot; a სახელი."
 
 #: ../mail/mail.error.xml.h:8
 #, fuzzy
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "a თემა ხაზი -სკენ."
+msgstr "a თემა ხაზი -სკენ - ფოსტა შესახებ."
 
 #: ../mail/mail.error.xml.h:9
 #, fuzzy
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "-სკენ და?"
+msgstr "-სკენ წაშლა ანგარიში და ყველა?"
 
 #: ../mail/mail.error.xml.h:10
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "-სკენ?"
+msgstr "-სკენ წაშლა ანგარიში?"
 
 #: ../mail/mail.error.xml.h:11
 #, fuzzy
 msgid "Are you sure you want to disable this account and delete all its proxies?"
-msgstr "-სკენ და?"
+msgstr "-სკენ გამორთვა ანგარიში და წაშლა ყველა?"
 
 #: ../mail/mail.error.xml.h:12
+#, fuzzy
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr ""
+msgstr "-სკენ გახსნა ეთ?"
 
 #: ../mail/mail.error.xml.h:13
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr ""
+msgstr "-სკენ ამოშლა ყველა - ყველა?"
 
 #: ../mail/mail.error.xml.h:14
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr ""
+msgstr "-სკენ ამოშლა ყველა -&quot;&quot;?"
 
 #: ../mail/mail.error.xml.h:15
+#, fuzzy
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr ""
+msgstr "-სკენ a - HTML?"
 
 #: ../mail/mail.error.xml.h:16
+#, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
+msgstr "-სკენ a ბრმა ასლი?"
 
 #: ../mail/mail.error.xml.h:17
+#, fuzzy
 msgid "Are you sure you want to send a message without a subject?"
-msgstr ""
+msgstr "-სკენ a a თემა?"
 
 #: ../mail/mail.error.xml.h:18
 msgid "Because &quot;{0}&quot;."
@@ -14682,42 +15095,46 @@ msgstr ""
 #: ../mail/mail.error.xml.h:21
 #, fuzzy
 msgid "Blank Signature"
-msgstr "ხელმოწერა"
+msgstr "სუფთა ფურცელი ხელმოწერა"
 
 #: ../mail/mail.error.xml.h:22
 #, fuzzy
 msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "ძებნა საქაღალდე&quot;&quot;."
+msgstr "დამატება ძებნა საქაღალდე&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:23
 #, fuzzy
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
-msgstr "კოპია&quot;&quot; -სკენ&quot;&quot;."
+msgstr "კოპირება&quot;&quot; -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:25
+#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr ""
+msgstr "შენახვა."
 
 #: ../mail/mail.error.xml.h:26
+#, fuzzy
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
-msgstr ""
+msgstr "შენახვა&quot;&quot;"
 
 #: ../mail/mail.error.xml.h:27
+#, fuzzy
 msgid "Cannot delete folder &quot;{0}&quot;."
-msgstr ""
+msgstr "წაშლა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:28
+#, fuzzy
 msgid "Cannot delete system folder &quot;{0}&quot;."
-msgstr ""
+msgstr "წაშლა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:29
 #, fuzzy
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
-msgstr "ძებნა საქაღალდე&quot;&quot;."
+msgstr "რედაქტირება ძებნა საქაღალდე&quot;&quot; არა."
 
 #: ../mail/mail.error.xml.h:30
 #, fuzzy
@@ -14725,16 +15142,19 @@ msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "&quot;&quot; -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:31
+#, fuzzy
 msgid "Cannot open source &quot;{1}&quot;"
-msgstr ""
+msgstr "გახსნა&quot;&quot;"
 
 #: ../mail/mail.error.xml.h:32
+#, fuzzy
 msgid "Cannot open source &quot;{2}&quot;."
-msgstr ""
+msgstr "გახსნა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:33
+#, fuzzy
 msgid "Cannot open target &quot;{2}&quot;."
-msgstr ""
+msgstr "გახსნა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:34
 #, fuzzy
@@ -14742,7 +15162,7 @@ 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 "
 "license."
-msgstr "&quot;&quot; -სკენ თქვენ -სკენ მიღება."
+msgstr "ფაილი&quot;&quot; -სკენ თქვენ არა -სკენ მიღება."
 
 #: ../mail/mail.error.xml.h:35
 #, fuzzy
@@ -14757,17 +15177,17 @@ msgstr "ან&quot;&quot;."
 #: ../mail/mail.error.xml.h:37
 #, fuzzy
 msgid "Cannot save changes to account."
-msgstr "-სკენ."
+msgstr "შენახვა -სკენ ანგარიში."
 
 #: ../mail/mail.error.xml.h:38
 #, fuzzy
 msgid "Cannot save to directory &quot;{0}&quot;."
-msgstr "-სკენ დირექტორია&quot;&quot;."
+msgstr "შენახვა -სკენ&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:39
 #, fuzzy
 msgid "Cannot save to file &quot;{0}&quot;."
-msgstr "-სკენ&quot;&quot;."
+msgstr "შენახვა -სკენ ფაილი&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot set signature script &quot;{0}&quot;."
@@ -14778,11 +15198,12 @@ msgstr ""
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr "შემოწმება -სკენ დაიმახსოვრე."
+msgstr "შემოწმება -სკენ დაიმახსოვრე ჩართულია."
 
 #: ../mail/mail.error.xml.h:42
+#, fuzzy
 msgid "Could not save signature file."
-msgstr ""
+msgstr "არა შენახვა ფაილი."
 
 #: ../mail/mail.error.xml.h:43
 #, fuzzy
@@ -14790,8 +15211,9 @@ msgid "Delete &quot;{0}&quot;?"
 msgstr "წაშლა&quot;&quot;?"
 
 #: ../mail/mail.error.xml.h:44
+#, fuzzy
 msgid "Delete account?"
-msgstr ""
+msgstr "წაშლა ანგარიში?"
 
 #: ../mail/mail.error.xml.h:45
 #, fuzzy
@@ -14801,31 +15223,32 @@ msgstr "უარყოფა?"
 #: ../mail/mail.error.xml.h:46
 #, fuzzy
 msgid "Do not delete"
-msgstr "წაშლა"
+msgstr "არა წაშლა"
 
 #: ../mail/mail.error.xml.h:47
 #, fuzzy
 msgid "Do not disable"
-msgstr "გამორთე"
+msgstr "არა გამორთვა"
 
 #: ../mail/mail.error.xml.h:48
 #, fuzzy
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "-სკენ?"
+msgstr "-სკენ -?"
 
 #: ../mail/mail.error.xml.h:49
 #, fuzzy
 msgid "Do you want to mark all messages as read?"
-msgstr "-სკენ?"
+msgstr "-სკენ ყველა?"
 
 #: ../mail/mail.error.xml.h:50
 #, fuzzy
 msgid "Do you wish to save your changes?"
-msgstr "-სკენ?"
+msgstr "-სკენ შენახვა?"
 
 #: ../mail/mail.error.xml.h:51
+#, fuzzy
 msgid "Enter password."
-msgstr ""
+msgstr "შეყვანა."
 
 #: ../mail/mail.error.xml.h:52
 #, fuzzy
@@ -14850,42 +15273,43 @@ msgstr "ფაილი."
 #: ../mail/mail.error.xml.h:56
 #, fuzzy
 msgid "File exists but is not a regular file."
-msgstr "ფაილი a წესიერი."
+msgstr "ფაილი არა a წესიერი ფაილი."
 
 #: ../mail/mail.error.xml.h:57
 #, fuzzy
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "-სკენ."
+msgstr "არა -სკენ."
 
 #: ../mail/mail.error.xml.h:58
 #, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "და."
+msgstr "წაშლა ყველა - და."
 
 #: ../mail/mail.error.xml.h:59
 #, fuzzy
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ანგარიშები."
+msgstr "ყველა ანგარიშები."
 
 #: ../mail/mail.error.xml.h:60
 #, fuzzy
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
-msgstr "და."
+msgstr "ანგარიში და."
 
 #: ../mail/mail.error.xml.h:62
+#, fuzzy
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgstr "ანგარიში."
 
 #: ../mail/mail.error.xml.h:63
 #, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "Evolution."
+msgstr "დასრულება არა გაგზავნილი Evolution."
 
 #: ../mail/mail.error.xml.h:64
 #, fuzzy
@@ -14895,27 +15319,31 @@ msgstr "იგნორირება"
 #: ../mail/mail.error.xml.h:65
 #, fuzzy
 msgid "Invalid authentication"
-msgstr "არასწორი"
+msgstr "არასწორი აუთენტიფიკაცია"
 
 #: ../mail/mail.error.xml.h:66
+#, fuzzy
 msgid "Mail filters automatically updated."
-msgstr ""
+msgstr "ფოსტა."
 
 #: ../mail/mail.error.xml.h:67
+#, fuzzy
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr ""
+msgstr "ელფოსტა დამატება ვის თავსართი -სკენ ბრმა ასლი თავსართი სია ყველა - -სკენ ვის დამატება ეთ ვის ან ასლი."
 
 #: ../mail/mail.error.xml.h:68
+#, fuzzy
 msgid "Mark all messages as read"
-msgstr ""
+msgstr "ყველა"
 
 #: ../mail/mail.error.xml.h:69
+#, fuzzy
 msgid "Mark all messages as read in the selected folder"
-msgstr ""
+msgstr "ყველა -"
 
 #: ../mail/mail.error.xml.h:70
 #, fuzzy
@@ -14928,59 +15356,68 @@ msgid "No sources selected."
 msgstr "არა."
 
 #: ../mail/mail.error.xml.h:73
+#, fuzzy
 msgid "Opening too many messages at once may take a long time."
-msgstr ""
+msgstr "ეთ a."
 
 #: ../mail/mail.error.xml.h:74
+#, fuzzy
 msgid "Please check your account settings and try again."
-msgstr ""
+msgstr "ანგარიში და."
 
 #: ../mail/mail.error.xml.h:75
+#, fuzzy
 msgid "Please enable the account or send using another account."
-msgstr ""
+msgstr "ანგარიში ან ანგარიში."
 
 #: ../mail/mail.error.xml.h:76
+#, fuzzy
 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 ""
+msgstr "a ელფოსტა - ვის ველი თქვენ ძიება ელფოსტა ჩართულია ვის -სკენ ელემენტი."
 
 #: ../mail/mail.error.xml.h:77
+#, fuzzy
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
 "{0}\n"
 "Send anyway?"
-msgstr ""
+msgstr "და -სკენ HTML ელფოსტა არა?"
 
 #: ../mail/mail.error.xml.h:80
+#, fuzzy
 msgid "Please provide an unique name to identify this signature."
-msgstr ""
+msgstr "უნიკალური სახელი -სკენ."
 
 #: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr ""
 
 #: ../mail/mail.error.xml.h:82
+#, fuzzy
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr ""
+msgstr "ფოსტა&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:84
+#, fuzzy
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr ""
+msgstr "a სია - აუთენტიფიკაცია."
 
 #: ../mail/mail.error.xml.h:85
+#, fuzzy
 msgid "Read receipt requested."
-msgstr ""
+msgstr "წაკითხვა მოთხოვნილი."
 
 #: ../mail/mail.error.xml.h:86
 #, fuzzy
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
-msgstr "&quot;&quot; და?"
+msgstr "წაშლა&quot;&quot; და ყველა -?"
 
 #: ../mail/mail.error.xml.h:87
 #, fuzzy
@@ -14990,7 +15427,7 @@ msgstr "ძებნა საქაღალდეები."
 #: ../mail/mail.error.xml.h:88
 #, fuzzy
 msgid "Send Receipt"
-msgstr "გაგზავნა"
+msgstr "გაგზავნა მიღება"
 
 #: ../mail/mail.error.xml.h:89
 #, fuzzy
@@ -15002,9 +15439,10 @@ msgstr "ხელმოწერა"
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
-msgstr "სისტემა Evolution -სკენ და."
+msgstr "სისტემა Evolution -სკენ და ან."
 
 #: ../mail/mail.error.xml.h:91
+#, fuzzy
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15012,7 +15450,7 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients in "
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
-msgstr ""
+msgstr "სია -სკენ -სკენ სია არა ელფოსტა დამატება ვის თავსართი -სკენ ბრმა ასლი თავსართი სია ყველა - - ვის დამატება ეთ ვის ან ასლი "
 
 #: ../mail/mail.error.xml.h:94
 #, fuzzy
@@ -15023,7 +15461,7 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"ძებნა საქაღალდე n ახლა\n"
+"ძებნა საქაღალდე წმ არა ახლა\n"
 "&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:99
@@ -15035,7 +15473,7 @@ msgid ""
 "    &quot;{1}&quot;\n"
 "And have been updated."
 msgstr ""
-"n ახლა\n"
+"წმ არა ახლა\n"
 "&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:104
@@ -15045,46 +15483,50 @@ msgid ""
 "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 "&quot;&quot; შეცდომა შემოწმება და."
+msgstr "გაგზავნილი&quot;&quot; პროგრამა Sendmail შეცდომა ფოსტა არა გაგზავნილი - შემოწმება და."
 
 #: ../mail/mail.error.xml.h:106
 #, fuzzy
 msgid "The script file must exist and be executable."
-msgstr "და."
+msgstr "ფაილი და."
 
 #: ../mail/mail.error.xml.h:107
 #, fuzzy
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
-msgstr "-სკენ ძებნა საქაღალდე -სკენ."
+msgstr "-სკენ ძებნა საქაღალდე -სკენ დამატება."
 
 #: ../mail/mail.error.xml.h:109
+#, fuzzy
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr ""
+msgstr "გაგზავნილი ანგარიში -სკენ არა ჩართული"
 
 #: ../mail/mail.error.xml.h:110
+#, fuzzy
 msgid "This message cannot be sent because you have not specified any recipients"
-msgstr ""
+msgstr "გაგზავნილი არა ნებისმიერი"
 
 #: ../mail/mail.error.xml.h:111
 #, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "სუპორტი ტიპი და სუპორტი."
+msgstr "არა სუპორტი - აუთენტიფიკაცია და არა სუპორტი აუთენტიფიკაცია ეთ ყველა."
 
 #: ../mail/mail.error.xml.h:112
+#, fuzzy
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
+msgstr "არა."
 
 #: ../mail/mail.error.xml.h:113
+#, fuzzy
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
+msgstr "ყველა - და."
 
 #: ../mail/mail.error.xml.h:114
 #, fuzzy
@@ -15096,41 +15538,42 @@ msgstr "-სკენ -სკენ."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "-სკენ?"
+msgstr "-სკენ გახსნა ანგარიში გამოყენება?"
 
 #: ../mail/mail.error.xml.h:116
 #, fuzzy
 msgid "Unable to read license file."
-msgstr "-სკენ."
+msgstr "-სკენ ფაილი."
 
 #: ../mail/mail.error.xml.h:117
 #, fuzzy
 msgid "Use _Default"
-msgstr "ნაგულისხმევი"
+msgstr "გამოყენება ნაგულისხმევი"
 
 #: ../mail/mail.error.xml.h:118
 #, fuzzy
 msgid "Use default drafts folder?"
-msgstr "ნაგულისხმევი?"
+msgstr "გამოყენება ნაგულისხმები?"
 
 #: ../mail/mail.error.xml.h:119
+#, fuzzy
 msgid "You have not filled in all of the required information."
-msgstr ""
+msgstr "თქვენ არა - ყველა -."
 
 #: ../mail/mail.error.xml.h:120
 #, fuzzy
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "თქვენ -სკენ?"
+msgstr "თქვენ -სკენ დასრულება?"
 
 #: ../mail/mail.error.xml.h:121
 #, fuzzy
 msgid "You may not create two accounts with the same name."
-msgstr "თქვენ ანგარიშები."
+msgstr "თქვენ არა ანგარიშები სახელი."
 
 #: ../mail/mail.error.xml.h:122
 #, fuzzy
 msgid "You must name this Search Folder."
-msgstr "თქვენ ძებნა საქაღალდე."
+msgstr "თქვენ სახელი ძებნა საქაღალდე."
 
 #: ../mail/mail.error.xml.h:123
 #, fuzzy
@@ -15143,15 +15586,17 @@ 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 "თქვენ a და."
+msgstr "თქვენ ეთ a და ან ყველა ყველა ან."
 
 #: ../mail/mail.error.xml.h:126
+#, fuzzy
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
+msgstr "-სკენ&quot;&quot;&quot;&quot;."
 
 #: ../mail/mail.error.xml.h:127
+#, fuzzy
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr ""
+msgstr "თემა&quot;&quot; არა."
 
 #: ../mail/mail.error.xml.h:128
 msgid "_Append"
@@ -15163,13 +15608,14 @@ msgid "_Discard changes"
 msgstr "უარყოფა"
 
 #: ../mail/mail.error.xml.h:131
+#, fuzzy
 msgid "_Expunge"
-msgstr ""
+msgstr "განადგურება"
 
 #: ../mail/mail.error.xml.h:132
 #, fuzzy
 msgid "_Open Messages"
-msgstr "გახსენი"
+msgstr "გახსნა შეტყობინებები"
 
 #: ../mail/message-list.c:1000
 msgid "Unseen"
@@ -15184,12 +15630,14 @@ msgid "Answered"
 msgstr ""
 
 #: ../mail/message-list.c:1003
+#, fuzzy
 msgid "Multiple Unseen Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:1004
+#, fuzzy
 msgid "Multiple Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:1008
 msgid "Lowest"
@@ -15198,7 +15646,7 @@ msgstr ""
 #: ../mail/message-list.c:1009
 #, fuzzy
 msgid "Lower"
-msgstr "უფრო დაბლა"
+msgstr "ჩაწევა"
 
 #: ../mail/message-list.c:1013
 msgid "Higher"
@@ -15224,29 +15672,33 @@ msgid "Yesterday %l:%M %p"
 msgstr "გუშინ %l:%M %p"
 
 #: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
+#, fuzzy
 msgid "%a %l:%M %p"
-msgstr ""
+msgstr "a M"
 
 #: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 #: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
+#, fuzzy
 msgid "%b %d %Y"
-msgstr ""
+msgstr "Y"
 
 #: ../mail/message-list.c:2063
 #, fuzzy
 msgid "Messages"
-msgstr "შეტყობინება"
+msgstr "შეტყობინებები"
 
 #: ../mail/message-list.c:3441
+#, fuzzy
 msgid "Generating message list"
-msgstr ""
+msgstr "სია"
 
 #: ../mail/message-list.etspec.h:3
+#, fuzzy
 msgid "Due By"
-msgstr ""
+msgstr "ვადა"
 
 #: ../mail/message-list.etspec.h:4
 #, fuzzy
@@ -15263,13 +15715,13 @@ msgid "Follow Up Flag"
 msgstr "მიყოლა ზემოთ"
 
 #: ../mail/message-list.etspec.h:8
-#, fuzzy
 msgid "Original Location"
-msgstr "ადგილმდებარეობა"
+msgstr "თავდაპირველი ადგილმდებარეობა"
 
 #: ../mail/message-list.etspec.h:9
+#, fuzzy
 msgid "Received"
-msgstr ""
+msgstr "მიღებული"
 
 #: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
@@ -15277,22 +15729,22 @@ msgid "Size"
 msgstr "ზომა"
 
 #: ../mail/message-tag-followup.c:75
+#, fuzzy
 msgid "Call"
-msgstr ""
+msgstr "დარეკვა"
 
 #: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "არ გადააგზავნო"
 
 #: ../mail/message-tag-followup.c:77
-#, fuzzy
 msgid "Follow-Up"
-msgstr "მიყოლა ზემოთ"
+msgstr "მიყოლა-ზემოთ"
 
 #: ../mail/message-tag-followup.c:78
 #, fuzzy
 msgid "For Your Information"
-msgstr "ინფორმაცია"
+msgstr "-თვის ინფორმაცია"
 
 #: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
@@ -15301,7 +15753,7 @@ msgstr "გადაგზავნა"
 #: ../mail/message-tag-followup.c:80
 #, fuzzy
 msgid "No Response Necessary"
-msgstr "არა"
+msgstr "არა პასუხი"
 
 #: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
@@ -15312,24 +15764,28 @@ msgid "Reply to All"
 msgstr "პასუხი ყველას"
 
 #: ../mail/message-tag-followup.c:84
+#, fuzzy
 msgid "Review"
-msgstr ""
+msgstr "გადახედვა"
 
 #: ../mail/searchtypes.xml.h:1
+#, fuzzy
 msgid "Body contains"
-msgstr ""
+msgstr "ტანი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "წერილი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:3
+#, fuzzy
 msgid "Recipients contain"
-msgstr ""
+msgstr "შეიცავს"
 
 #: ../mail/searchtypes.xml.h:4
+#, fuzzy
 msgid "Sender contains"
-msgstr ""
+msgstr "გამგზავნი შეიცავს"
 
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
@@ -15345,8 +15801,9 @@ msgid "Local Address Books"
 msgstr "ლოკალური მისამართი"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for local address books."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, fuzzy
@@ -15363,27 +15820,27 @@ msgstr "აუდიო"
 #: ../plugins/backup-restore/backup-restore.c:51
 #, fuzzy
 msgid "Select name of Evolution archive"
-msgstr "Evolution"
+msgstr "ამორჩევა სახელი - Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:61
 #, fuzzy
 msgid "_Restart Evolution after backup"
-msgstr "გადატვირთე Evolution"
+msgstr "გადატვირთვა Evolution"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 #, fuzzy
 msgid "Select Evolution archive to restore"
-msgstr "Evolution -სკენ"
+msgstr "ამორჩევა Evolution -სკენ"
 
 #: ../plugins/backup-restore/backup-restore.c:97
 #, fuzzy
 msgid "_Restart Evolution after restore"
-msgstr "გადატვირთე Evolution"
+msgstr "გადატვირთვა Evolution"
 
 #: ../plugins/backup-restore/backup.c:109
 #, fuzzy
 msgid "Backup Evolution directory"
-msgstr "Evolution დირექტორია"
+msgstr "სარეზერვო ასლი Evolution"
 
 #: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
@@ -15399,54 +15856,57 @@ msgid "Restart Evolution"
 msgstr "გადატვირთე ევოლუშენი"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr ""
+msgstr "A ზემოთ და Evolution და."
 
 #. 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
 msgid "Backup and restore Evolution data and settings"
-msgstr ""
+msgstr "სარეზერვო ასლი და Evolution და"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 #, fuzzy
 msgid "Restore Settings..."
-msgstr "პარამეტრები."
+msgstr "აღდგენა პარამეტრები."
 
 #: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-#, fuzzy
 msgid "Automatic Contacts"
-msgstr "ავტომატური"
+msgstr "ავტომატური კონტაქტები"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
+#, fuzzy
 msgid "_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
+msgstr "ავრომატურად - წიგნაკი -სკენ ფოსტა"
 
 #: ../plugins/bbdb/bbdb.c:475
 #, fuzzy
 msgid "Instant Messaging Contacts"
-msgstr "გაგზავნა შეტყობინება -სკენ"
+msgstr "მეგობრები"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
+#, fuzzy
 msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr ""
+msgstr "და სია"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
+#, fuzzy
 msgid "Synchronize with _buddy list now"
-msgstr ""
+msgstr "სია ახლა"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 #, fuzzy
@@ -15454,7 +15914,7 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr "და -სკენ მოკ-შე."
+msgstr "ავრომატურად წიგნაკი და ელფოსტა -სკენ - მოკ-შე."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -15465,8 +15925,9 @@ msgid "CalDAV"
 msgstr ""
 
 #: ../plugins/caldav/caldav-source.c:269
+#, fuzzy
 msgid "Use _SSL"
-msgstr ""
+msgstr "გამოყენება SSL"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 #, fuzzy
@@ -15474,8 +15935,9 @@ msgid "Local Calendars"
 msgstr "ლოკალური კალენდრები"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for local calendars."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/calendar-http/calendar-http.c:339
 #, fuzzy
@@ -15487,8 +15949,9 @@ msgid "HTTP Calendars"
 msgstr "HTTP კალენდრები"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
+#, fuzzy
 msgid "Provides core functionality for webcal and http calendars."
-msgstr ""
+msgstr "წარმოადგენს და."
 
 #: ../plugins/calendar-weather/calendar-weather.c:54
 #: ../plugins/calendar-weather/calendar-weather.c:60
@@ -15496,12 +15959,14 @@ msgid "Weather: Cloudy"
 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 "ამინდი"
 
 #: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Rain"
@@ -15512,85 +15977,102 @@ msgid "Weather: Snow"
 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 "ამორჩევა a"
 
 #: ../plugins/calendar-weather/calendar-weather.c:654
+#, fuzzy
 msgid "_Units:"
-msgstr ""
+msgstr "ერთეული:"
 
 #: ../plugins/calendar-weather/calendar-weather.c:661
+#, fuzzy
 msgid "Metric (Celsius, cm, etc)"
-msgstr ""
+msgstr "შკალა ცელსიუსი სმ"
 
 #: ../plugins/calendar-weather/calendar-weather.c:662
+#, fuzzy
 msgid "Imperial (Fahrenheit, inches, etc)"
-msgstr ""
+msgstr "ფარენგეიტი"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
+#, fuzzy
 msgid "Provides core functionality for weather calendars."
-msgstr ""
+msgstr "წარმოადგენს."
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "ამინდის კალენდრები"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
+msgstr "A a მენიუ კოპირება -სკენ."
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 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
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
+msgstr "შემოწმება Evolution ნაგულისხმები"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#, fuzzy
 msgid "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr ""
+msgstr "Evolution ან არა ნაგულისხმები."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
+#, fuzzy
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
+msgstr "Evolution ნაგულისხმები ფოსტა ჩართულია."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
+#, fuzzy
 msgid "Default Mail Client "
-msgstr ""
+msgstr "ნაგულისხმევი ფოსტა კლიენტი "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
+#, fuzzy
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr ""
+msgstr "-სკენ Evolution ნაგულისხმები e ფოსტა?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
+#, fuzzy
 msgid "Mark as _default folder"
-msgstr ""
+msgstr "ნაგულისხმები"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+#, fuzzy
 msgid "Default Sources"
-msgstr ""
+msgstr "ნაგულისხმევი წყაროები"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr ""
+msgstr "წარმოადგენს a კალენდარი ან წიგნაკი ნაგულისხმები."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15615,30 +16097,33 @@ msgstr "დაცული პაროლი"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
+#, fuzzy
 msgid ""
 "This option will connect to the Exchange server using secure password (NTLM) "
 "authentication."
-msgstr ""
+msgstr "-სკენ გაცვლა აუთენტიფიკაცია."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
 msgid "Plaintext Password"
 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 ""
+msgstr "-სკენ გაცვლა აუთენტიფიკაცია."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "ოფისიდან გასული"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:264
+#, fuzzy
 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 ""
+msgstr "გაგზავნილი -სკენ პირადი ფორმა ვინ ფოსტა -სკენ -."
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -15652,8 +16137,9 @@ msgstr "მე ვარ ოფისში"
 
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:328
+#, fuzzy
 msgid "Change the password for Exchange account"
-msgstr ""
+msgstr "შეცვლა გაცვლა ანგარიში"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
@@ -15662,8 +16148,9 @@ msgstr "პაროლის შეცვლა"
 
 #. Delegation Assistant
 #: ../plugins/exchange-operations/exchange-account-setup.c:335
+#, fuzzy
 msgid "Manage the delegate settings for Exchange account"
-msgstr ""
+msgstr "გაცვლა ანგარიში"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
@@ -15676,8 +16163,9 @@ msgstr ""
 
 #. Folder Size
 #: ../plugins/exchange-operations/exchange-account-setup.c:359
+#, fuzzy
 msgid "View the size of all Exchange folders"
-msgstr ""
+msgstr "ჩვენება - ყველა გაცვლა"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
@@ -15693,8 +16181,9 @@ msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:635
+#, fuzzy
 msgid "A_uthenticate"
-msgstr ""
+msgstr "A"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
@@ -15706,23 +16195,26 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-calendar.c:193
 #: ../plugins/exchange-operations/exchange-contacts.c:167
+#, fuzzy
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
-msgstr ""
+msgstr "Evolution - ხაზიდან გასვლა რეჟიმი თქვენ ან ახლა -სკენ ხაზზე რეჟიმი."
 
 #. 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 ""
+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
 msgid "Confirm Password:"
@@ -15737,74 +16229,86 @@ msgid "New Password:"
 msgstr "ახალი პაროლი:"
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:6
+#, fuzzy
 msgid "Your current password has expired. Please change your password now."
-msgstr ""
+msgstr "ახლა."
 
 #: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
+#, fuzzy
 msgid "Your password will expire in the next %d days"
-msgstr ""
+msgstr "- დღე"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
+#, 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 ""
+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
 msgid "Delegate To"
-msgstr ""
+msgstr "ვის"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:562
 #, c-format
+#, fuzzy
 msgid "Remove the delegate %s?"
-msgstr ""
+msgstr "ამოშლა წმ?"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:680
 #, fuzzy
 msgid "Could not access Active Directory"
-msgstr "აქტიური დირექტორია"
+msgstr "არა აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:692
+#, fuzzy
 msgid "Could not find self in Active Directory"
-msgstr ""
+msgstr "არა პოვნა - აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:705
 #, fuzzy, c-format
 msgid "Could not find delegate %s in Active Directory"
-msgstr "აქტიური დირექტორია"
+msgstr "არა პოვნა წმ - აქტიური დასტა"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
+#, fuzzy
 msgid "Could not remove delegate %s"
-msgstr ""
+msgstr "არა ამოშლა წმ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:777
+#, fuzzy
 msgid "Could not update list of delegates."
-msgstr ""
+msgstr "არა სია -."
 
 #: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
+#, fuzzy
 msgid "Could not add delegate %s"
-msgstr ""
+msgstr "არა დამატება წმ"
 
 #: ../plugins/exchange-operations/exchange-delegates.c:963
+#, fuzzy
 msgid "Error reading delegates list."
-msgstr ""
+msgstr "შეცდომა სია."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#, fuzzy
 msgid "Author (read, create)"
-msgstr ""
+msgstr "ავტორი"
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
@@ -15823,7 +16327,7 @@ msgstr ""
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:8
 #, fuzzy
 msgid "Editor (read, create, edit)"
-msgstr "რედაქტორი"
+msgstr "რედაქტორი რედაქტირება"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 #, fuzzy
@@ -15835,14 +16339,16 @@ msgid "Reviewer (read-only)"
 msgstr ""
 
 #: ../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 ""
+msgstr "-სკენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#, fuzzy
 msgid "_Delegate can see private items"
-msgstr ""
+msgstr "პირადი"
 
 #. Translators: This is used for permissions for <user> for the folder Inbox.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:17
@@ -15869,47 +16375,54 @@ msgstr "საქაღალდის ზომა"
 
 #: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+#, fuzzy
 msgid "Subscribe to Other User's Folder"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სხვა მომხმარებელი წმ საქაღალდე"
 
 #: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
+#, fuzzy
 msgid "Exchange Folder Tree"
-msgstr ""
+msgstr "გაცვლა საქაღალდე განშტოება"
 
 #: ../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 "ხელმოუწერელი საქაღალდე."
 
 #: ../plugins/exchange-operations/exchange-folder.c:463
 #: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
+#, fuzzy
 msgid "Really unsubscribe from folder \"%s\"?"
-msgstr ""
+msgstr "წმ?"
 
 #: ../plugins/exchange-operations/exchange-folder.c:475
 #: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
+#, fuzzy
 msgid "Unsubscribe from \"%s\""
-msgstr ""
+msgstr "ხელმოუწერელი წმ"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+#, fuzzy
 msgid "Password Expiry Warning..."
-msgstr ""
+msgstr "პაროლი გაფრთხილება."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+#, fuzzy
 msgid "Your password will expire in 7 days..."
-msgstr ""
+msgstr "- დღე."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
 msgid "_Change Password"
 msgstr "პაროლის _შეცვლა"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+#, fuzzy
 msgid "ok_button"
-msgstr ""
+msgstr "დიახ"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
@@ -15946,22 +16459,24 @@ msgid "Create subfolders"
 msgstr "შექმნა"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
+#, fuzzy
 msgid "Delete Any Items"
-msgstr ""
+msgstr "წაშლა ნებისმიერი ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
+#, fuzzy
 msgid "Delete Own Items"
-msgstr ""
+msgstr "წაშლა ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
 #, fuzzy
 msgid "Edit Any Items"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება ნებისმიერი ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
 #, fuzzy
 msgid "Edit Own Items"
-msgstr "რედაქტირება"
+msgstr "რედაქტირება ელემენტები"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
 #, fuzzy
@@ -15975,12 +16490,12 @@ msgstr "საქაღალდის პატრონი"
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
 #, fuzzy
 msgid "Folder visible"
-msgstr "ხილული საქაღალდე"
+msgstr "საქაღალდე ხოლული"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
 #, fuzzy
 msgid "Read items"
-msgstr "წაკითხული"
+msgstr "წაკითხვა"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:15
 msgid "Role: "
@@ -15996,102 +16511,123 @@ 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
+#, fuzzy
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr ""
+msgstr "A a - გაცვლა ანგარიში და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 #, fuzzy
 msgid "Exchange Operations"
-msgstr "პარამეტრები"
+msgstr "გაცვლა ოპერაციები"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
+#, fuzzy
 msgid "Cannot change password due to configuration problems."
-msgstr ""
+msgstr "-სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
 msgid "Cannot display folders."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
+#, fuzzy
 msgid ""
 "Changes to Exchange account configuration will take place after you quit and "
 "restart Evolution."
-msgstr ""
+msgstr "ცვლილებები -სკენ გაცვლა ანგარიში დასრულება და Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
+#, fuzzy
 msgid "Could not authenticate to server."
-msgstr ""
+msgstr "არა -სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
+#, fuzzy
 msgid "Could not change password."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
+#, fuzzy
 msgid ""
 "Could not configure Exchange account because \n"
 "an unknown error occurred. Check the URL, \n"
 "username, and password, and try again."
-msgstr ""
+msgstr "არა გაცვლა ანგარიში უცნობი შეცდომა შემოწმება URL და და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+#, fuzzy
 msgid "Could not connect to Exchange server."
-msgstr ""
+msgstr "არა -სკენ გაცვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#, fuzzy
 msgid "Could not connect to server {0}."
-msgstr ""
+msgstr "არა -სკენ."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#, fuzzy
 msgid "Could not determine folder permissions for delegates."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#, fuzzy
 msgid "Could not find Exchange Web Storage System."
-msgstr ""
+msgstr "არა პოვნა გაცვლა ვები სისტემა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#, fuzzy
 msgid "Could not locate server {0}."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#, fuzzy
 msgid "Could not make {0} a delegate"
-msgstr ""
+msgstr "არა a"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#, fuzzy
 msgid "Could not read folder permissions"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#, fuzzy
 msgid "Could not read folder permissions."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#, fuzzy
 msgid "Could not read out-of-office state"
-msgstr ""
+msgstr "არა -"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#, fuzzy
 msgid "Could not update folder permissions."
-msgstr ""
+msgstr "არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#, fuzzy
 msgid "Could not update out-of-office state"
-msgstr ""
+msgstr "არა -"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
+#, fuzzy
 msgid "Exchange Account is offline."
-msgstr ""
+msgstr "გაცვლა ანგარიში ხაზიდან გასვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
+#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -16105,11 +16641,12 @@ msgid ""
 "\n"
 "{0}\n"
 "  "
-msgstr ""
+msgstr "გაცვლა -სკენ ჩართულია გაცვლა სერვერი გამორთული ან გაცვლა -სკენ - -სკენ -სკენ Evolution გაცვლა არა -სკენ -სკენ გაცვლა ბმული არა არა არა "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
+#, fuzzy
 msgid "Failed to update delegates:"
-msgstr ""
+msgstr "ვერ განხორციელდა -სკენ:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Folder already exists"
@@ -16122,7 +16659,7 @@ msgstr "საქაღალდე არ არსებობს"
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
 #, fuzzy
 msgid "Folder offline"
-msgstr "საქაღალდე კავშირგარეშე რეჟიმი"
+msgstr "საქაღალდე ხაზიდან გასვლა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 #: ../shell/e-shell.c:1269
@@ -16130,39 +16667,46 @@ msgid "Generic error"
 msgstr "ზოგადი შეცდომა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
+#, fuzzy
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr ""
+msgstr "გაშვებული ჩართულია a - ანგარიში დიალოგი."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 #, fuzzy
 msgid "Mailbox for {0} is not on this server."
-msgstr "საფოსტო ყუთი."
+msgstr "საფოსტო ყუთი არა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
+#, fuzzy
 msgid "Make sure the URL is correct and try again."
-msgstr ""
+msgstr "Make URL და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
+#, fuzzy
 msgid "Make sure the server name is spelled correctly and try again."
-msgstr ""
+msgstr "Make სახელი და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
+#, fuzzy
 msgid "Make sure the username and password are correct and try again."
-msgstr ""
+msgstr "Make და და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
+#, fuzzy
 msgid "No Global Catalog server configured for this account."
-msgstr ""
+msgstr "არა ზოგადი ანგარიში."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
+#, fuzzy
 msgid "No mailbox for user {0} on {1}."
-msgstr ""
+msgstr "არა საფოსტო ყუთი ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
+#, fuzzy
 msgid "No such user {0}"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "Password successfully changed."
@@ -16173,56 +16717,66 @@ msgid "Please restart Evolution"
 msgstr "გთხოვთ თავიდან ჩართოთ ევოლუშენი"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
+#, fuzzy
 msgid "Please select a user."
-msgstr ""
+msgstr "a."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+#, fuzzy
 msgid "Server rejected password because it is too weak."
-msgstr ""
+msgstr "სერვერი."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#, fuzzy
 msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr ""
+msgstr "გაცვლა ანგარიში გამორთული დასრულება Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#, fuzzy
 msgid "The Exchange account will be removed when you quit Evolution"
-msgstr ""
+msgstr "გაცვლა ანგარიში დასრულება Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#, fuzzy
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr ""
+msgstr "გაცვლა არა გაცვლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#, fuzzy
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
+msgstr "გაშვებული გაცვლა გაცვლა გაცვლა და."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#, fuzzy
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
 "as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
 "\n"
 "Or you might have just typed your password wrong."
-msgstr ""
+msgstr "-სკენ ფანჯრები სახელი -&quot; დომეინი&quot; არა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:61
+#, fuzzy
 msgid "Try again with a different password."
-msgstr ""
+msgstr "ცდა a."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
+#, fuzzy
 msgid "Unable to add user to access control list:"
-msgstr ""
+msgstr "-სკენ დამატება -სკენ სია:"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:63
+#, fuzzy
 msgid "Unable to edit delegates."
-msgstr ""
+msgstr "-სკენ რედაქტირება."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
 #, fuzzy
 msgid "Unknown error looking up {0}"
-msgstr "უცნობი შეცდომა"
+msgstr "უცნობი შეცდომა ზემოთ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Unknown error."
@@ -16237,83 +16791,99 @@ msgid "Unsupported operation"
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#, fuzzy
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr ""
+msgstr "თქვენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#, fuzzy
 msgid "You cannot make yourself your own delegate"
-msgstr ""
+msgstr "თქვენ"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#, fuzzy
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr ""
+msgstr "თქვენ ფოსტა ჩართულია."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#, fuzzy
 msgid "You may only configure a single Exchange account."
-msgstr ""
+msgstr "თქვენ a გაცვლა ანგარიში."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr ""
+msgstr "კბ ცდა -სკენ გასუფთავება ზემოთ მონაცემები მონაცემები ფოსტა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr ""
+msgstr "კბ თქვენ არა -სკენ ან ფოსტა ახლა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr ""
+msgstr "კბ თქვენ არა -სკენ ფოსტა გასუფთავება ზემოთ მონაცემები მონაცემები ფოსტა."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
 msgstr ""
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#, fuzzy
 msgid "{0} cannot be added to an access control list"
-msgstr ""
+msgstr "-სკენ სია"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#, fuzzy
 msgid "{0} is already a delegate"
-msgstr ""
+msgstr "a"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#, fuzzy
 msgid "{0} is already in the list"
-msgstr ""
+msgstr "- სია"
 
 #: ../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 ""
+msgstr "შემოწმება"
 
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
+#, fuzzy
 msgid "Unsubscribing from folder \"%s\""
-msgstr ""
+msgstr "წმ"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
+#, fuzzy
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
+msgstr "- ფოსტა - ხე მენიუ."
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+#, fuzzy
 msgid "Unsubscribe Folders"
-msgstr ""
+msgstr "ხელმოუწერელი საქაღალდეები"
 
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
 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
@@ -16323,12 +16893,12 @@ msgstr "პარამეტრები"
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 #, fuzzy
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b> პარამეტრები</b>"
+msgstr "<b> ფოსტა პარამეტრები</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 #, fuzzy
 msgid "Junk Mail Settings..."
-msgstr "პარამეტრები."
+msgstr "ფოსტა პარამეტრები."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 #, fuzzy
@@ -16342,7 +16912,7 @@ 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
@@ -16350,16 +16920,19 @@ msgid "_Disable"
 msgstr "_გამორთვა"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:6
+#, fuzzy
 msgid "_Enable"
-msgstr ""
+msgstr "ჩართვა"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
+#, fuzzy
 msgid "_Junk List"
-msgstr ""
+msgstr "სია"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
+#, fuzzy
 msgid "Add Send Options to groupwise messages"
-msgstr ""
+msgstr "დამატება გაგზავნა ოფციები -სკენ"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
@@ -16368,8 +16941,9 @@ msgid "Send Options"
 msgstr "გაგზავნის ოფციები"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for the features in Groupwise accounts."
-msgstr ""
+msgstr "A - ანგარიშები."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 #, fuzzy
@@ -16379,7 +16953,7 @@ msgstr "შესაძლებლობანი"
 #: ../plugins/groupwise-features/process-meeting.c:49
 #, fuzzy
 msgid "Accept Tentatively"
-msgstr "მიიღე"
+msgstr "მიღება"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "<b>Users:</b>"
@@ -16394,39 +16968,46 @@ msgstr "შეტყობინება"
 #: ../plugins/groupwise-features/properties.glade.h:6
 #, fuzzy
 msgid "Shared Folder Notification"
-msgstr "საქაღალდე შეტყობინება"
+msgstr "გაზიარებული საქაღალდე ნოიფიკაცია"
 
 #: ../plugins/groupwise-features/properties.glade.h:8
+#, fuzzy
 msgid "The participants will receive the following notification.\n"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/groupwise-features/properties.glade.h:11
+#, fuzzy
 msgid "_Contacts..."
-msgstr ""
+msgstr "მეგობრები."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
+#, fuzzy
 msgid "_Customize notification message"
-msgstr ""
+msgstr "გამართვა"
 
 #: ../plugins/groupwise-features/properties.glade.h:13
+#, fuzzy
 msgid "_Not Shared"
-msgstr ""
+msgstr "გაზიარებული"
 
 #: ../plugins/groupwise-features/properties.glade.h:15
+#, fuzzy
 msgid "_Shared With ..."
-msgstr ""
+msgstr "გაზიარებული."
 
 #: ../plugins/groupwise-features/properties.glade.h:16
+#, fuzzy
 msgid "_Sharing"
-msgstr ""
+msgstr "გაზიარება"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
 msgid "<b>Name</b>"
 msgstr "<b>სახელი</b>"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#, fuzzy
 msgid "Access Rights"
-msgstr ""
+msgstr "წვდომის უფლებები"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
 msgid "Add/Edit"
@@ -16437,25 +17018,29 @@ msgid "Con_tacts"
 msgstr ""
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#, fuzzy
 msgid "Modify _folders/options/rules/"
-msgstr ""
+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:126
@@ -16484,8 +17069,9 @@ msgstr "პროქსი შესვლა"
 #: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
+#, fuzzy
 msgid "%sEnter password for %s (user %s)"
-msgstr ""
+msgstr "წმ წმ"
 
 #: ../plugins/groupwise-features/proxy-login.c:505
 #, fuzzy
@@ -16493,43 +17079,48 @@ msgid "_Proxy Login..."
 msgstr "პროქსი შესვლა."
 
 #: ../plugins/groupwise-features/proxy.c:697
+#, fuzzy
 msgid "The Proxy tab will be available only when the account is online."
-msgstr ""
+msgstr "პროქსი ანგარიში ხაზზე."
 
 #: ../plugins/groupwise-features/proxy.c:702
+#, fuzzy
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
+msgstr "პროქსი ანგარიში ჩართული."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "მომხმარებლები"
 
 #: ../plugins/groupwise-features/share-folder-common.c:323
+#, fuzzy
 msgid "Enter the users and set permissions"
-msgstr ""
+msgstr "შეყვანა და"
 
 #: ../plugins/groupwise-features/share-folder-common.c:342
 #, fuzzy
 msgid "New _Shared Folder..."
-msgstr "ახალი საქაღალდე."
+msgstr "ახალი გაზიარებული საქაღალდე."
 
 #: ../plugins/groupwise-features/share-folder-common.c:450
+#, fuzzy
 msgid "Sharing"
-msgstr ""
+msgstr "გაზიარება"
 
 #: ../plugins/groupwise-features/status-track.c:242
 #, fuzzy
 msgid "Track Message Status..."
-msgstr "კვალი შეტყობინება სტატუსი."
+msgstr "აუდიოკვალი შეტყობინება სტატუსი."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin to setup hula calendar sources."
-msgstr ""
+msgstr "A -სკენ კალენდარი."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 #, fuzzy
 msgid "Hula Account Setup"
-msgstr "ანგარიში ინსტალაცია"
+msgstr "ანგარიში პარამეტრები"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
@@ -16544,13 +17135,14 @@ msgid "Import ICS"
 msgstr "ICS-ის იმპორტი"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
+#, fuzzy
 msgid "Select Task List"
-msgstr ""
+msgstr "ამორჩევა ამოცანა სია"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:230
 #, fuzzy
 msgid "Select Calendar"
-msgstr "კალენდარი"
+msgstr "ამორჩევა კალენდარი"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
@@ -16559,186 +17151,220 @@ msgstr "_იმპორტი"
 
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:137
+#, fuzzy
 msgid "iCalendar format (.ics)"
-msgstr ""
+msgstr "iCalendar"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+#, fuzzy
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr ""
+msgstr "დრო კალენდარი წიგნაკი"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+#, fuzzy
 msgid "Synchronize to iPod"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "iPod სინქრონიზაცია"
 
 #: ../plugins/ipod-sync/sync.c:158
+#, fuzzy
 msgid "No output directory!"
-msgstr ""
+msgstr "არა!"
 
 #: ../plugins/ipod-sync/sync.c:159
+#, fuzzy
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr ""
+msgstr "არა ჩართულია ზემოთ და."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+#, fuzzy
 msgid "Could not export data!"
-msgstr ""
+msgstr "არა!"
 
 #: ../plugins/ipod-sync/sync.c:203
+#, fuzzy
 msgid "Exporting data failed."
-msgstr ""
+msgstr "ექსპორტირება."
 
 #: ../plugins/ipod-sync/sync.c:231
 #, fuzzy
 msgid "Could not open addressbook!"
-msgstr "evolution მისამართების გწიგნაკი"
+msgstr "არა გახსნა წიგნაკი!"
 
 #: ../plugins/ipod-sync/sync.c:232
+#, fuzzy
 msgid "Could not open the Evolution addressbook to export data."
-msgstr ""
+msgstr "არა გახსნა Evolution წიგნაკი -სკენ."
 
 #: ../plugins/ipod-sync/sync.c:291
+#, fuzzy
 msgid "Could not open calendar/todo!"
-msgstr ""
+msgstr "არა გახსნა კალენდარი!"
 
 #: ../plugins/ipod-sync/sync.c:292
+#, fuzzy
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
+msgstr "არა გახსნა Evolution კალენდარი სია -სკენ."
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
 #, fuzzy, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "ოპერაცია ვერ/არ ჩატარდა -სკენ"
+msgstr "ვერ განხორციელდა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:407
 #, c-format
+#, fuzzy
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr ""
+msgstr "- კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:433
 #, fuzzy, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "შეცდომა"
+msgstr "- კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:488
+#, fuzzy
 msgid "Unable to find any calendars"
-msgstr ""
+msgstr "-სკენ პოვნა ნებისმიერი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:495
+#, fuzzy
 msgid "Unable to find this meeting in any calendar"
-msgstr ""
+msgstr "-სკენ პოვნა - ნებისმიერი კალენდარი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:499
+#, fuzzy
 msgid "Unable to find this task in any task list"
-msgstr ""
+msgstr "-სკენ პოვნა დრო - ნებისმიერი დრო სია"
 
 #: ../plugins/itip-formatter/itip-formatter.c:503
+#, fuzzy
 msgid "Unable to find this journal entry in any journal"
-msgstr ""
+msgstr "-სკენ პოვნა ელემენტი - ნებისმიერი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:529
+#, fuzzy
 msgid "Searching for an existing version of this appointment"
-msgstr ""
+msgstr "ვეძებ -"
 
 #: ../plugins/itip-formatter/itip-formatter.c:726
+#, fuzzy
 msgid "Unable to parse item"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
+#, fuzzy
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr ""
+msgstr "-სკენ -სკენ კალენდარი წმ წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as accepted"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as tentative"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as declined"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
+#, fuzzy
 msgid "Sent to calendar '%s' as canceled"
-msgstr ""
+msgstr "გაგზავნა -სკენ კალენდარი წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
+#, fuzzy
 msgid "Organizer has removed the delegate %s "
-msgstr ""
+msgstr "წმ "
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
+#, fuzzy
 msgid "Sent a cancelation notice to the delegate"
-msgstr ""
+msgstr "გაგზავნა a -სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:909
+#, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
-msgstr ""
+msgstr "არა -სკენ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
+#, fuzzy
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
+msgstr "არა მცდარი"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
+#, fuzzy
 msgid "Unable to update attendee. %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr ""
 
 #: ../plugins/itip-formatter/itip-formatter.c:1152
+#, fuzzy
 msgid "The calendar attached is not valid"
-msgstr ""
+msgstr "კალენდარი არა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1153
+#, fuzzy
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr ""
+msgstr "-სკენ შეიცავს a კალენდარი კალენდარი არა a iCalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
 #: ../plugins/itip-formatter/itip-formatter.c:1278
+#, fuzzy
 msgid "The item in the calendar is not valid"
-msgstr ""
+msgstr "- კალენდარი არა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1188
 #: ../plugins/itip-formatter/itip-formatter.c:1203
 #: ../plugins/itip-formatter/itip-formatter.c:1279
+#, fuzzy
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr ""
+msgstr "შეიცავს a კალენდარი კალენდარი შეიცავს არა ამოცანები ან"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1213
+#, fuzzy
 msgid "The calendar attached contains multiple items"
-msgstr ""
+msgstr "კალენდარი შეიცავს"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1214
+#, fuzzy
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr ""
+msgstr "ვის ყველა - ფაილი და კალენდარი"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:1994
+#, fuzzy
 msgid "_Delete message after acting"
-msgstr ""
+msgstr "წაშლა"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2004
 #: ../plugins/itip-formatter/itip-formatter.c:2036
@@ -16747,8 +17373,9 @@ msgstr "კონფლიქტების ძებნა"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2019
+#, fuzzy
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
+msgstr "ამორჩევა -სკენ ძიება"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -16895,145 +17522,173 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 
 #: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published the following meeting information:"
-msgstr ""
+msgstr "<b> წმ</b>:"
 
 #: ../plugins/itip-formatter/itip-view.c:351
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has delegated the following meeting to you:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:354
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ ეთ:"
 
 #: ../plugins/itip-formatter/itip-view.c:356
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests your presence at the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> ეთ:"
 
 #: ../plugins/itip-formatter/itip-view.c:362
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ -სკენ დამატება -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:364
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to add to an existing meeting:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent back the following meeting response:"
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has canceled the following meeting."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has proposed the following meeting changes."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
-msgstr ""
+msgstr "<b> წმ</b> წმ:"
 
 #: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has declined the following meeting changes."
-msgstr ""
+msgstr "<b> წმ</b>."
 
 #: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has published the following task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has published the following task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:419
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
-msgstr ""
+msgstr "<b> წმ</b> - წმ -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ a დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has assigned you a task:"
-msgstr ""
+msgstr "<b> წმ</b> a დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:430
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ -სკენ დამატება -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> wishes to add to an existing task:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დამატება -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
+#, fuzzy
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> -სკენ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has sent back the following assigned task response:"
-msgstr ""
+msgstr "<b> წმ</b> გაგზავნილი დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has canceled the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has proposed the following task assignment changes:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> through %s has declined the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> წმ დრო:"
 
 #: ../plugins/itip-formatter/itip-view.c:453
 #, c-format
+#, fuzzy
 msgid "<b>%s</b> has declined the following assigned task:"
-msgstr ""
+msgstr "<b> წმ</b> დრო:"
 
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:705
@@ -17061,8 +17716,9 @@ msgid "_Decline"
 msgstr "_უარი"
 
 #: ../plugins/itip-formatter/itip-view.c:714
+#, fuzzy
 msgid "_Tentative all"
-msgstr ""
+msgstr "ყველა"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
@@ -17083,8 +17739,9 @@ msgstr "_გააგზავე ინფორმაცია"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:728
+#, fuzzy
 msgid "_Update Attendee Status"
-msgstr ""
+msgstr "განახლება სტატუსი"
 
 #: ../plugins/itip-formatter/itip-view.c:731
 msgid "_Update"
@@ -17107,42 +17764,49 @@ msgid "Comment:"
 msgstr "კომენტარი:"
 
 #: ../plugins/itip-formatter/itip-view.c:977
+#, fuzzy
 msgid "Send u_pdates to attendees"
-msgstr ""
+msgstr "გაგზავნა u -სკენ"
 
 #: ../plugins/itip-formatter/itip-view.c:986
+#, fuzzy
 msgid "A_pply to all instances"
-msgstr ""
+msgstr "A -სკენ ყველა"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
+#, fuzzy
 msgid "Displays text/calendar parts in messages."
-msgstr ""
+msgstr "ტექსტი კალენდარი -."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
+#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
 "&quot;{1}&quot; ?"
-msgstr ""
+msgstr "&quot;&quot; -სკენ დამატება&quot;&quot;?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
 msgid "This meeting has been delegated"
 msgstr ""
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#, fuzzy
 msgid "This response is not from a current attendee. Add the sender as an attendee?"
-msgstr ""
+msgstr "არა a დამატება?"
 
 #: ../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
 msgid "Disable Account"
@@ -17155,57 +17819,69 @@ msgstr "სისტემის შეცდომა: %s"
 
 #: ../plugins/mail-remote/client.c:32
 #, c-format
+#, fuzzy
 msgid "Camel error: %s"
-msgstr ""
+msgstr "შეცდომა წმ"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
+#, fuzzy
 msgid "Account cannot send e-mail"
-msgstr ""
+msgstr "ანგარიში e ფოსტა"
 
 #: ../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
+#, fuzzy
 msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr ""
+msgstr "A a ფოსტა."
 
 #: ../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
+#, fuzzy
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr ""
+msgstr "A - - a ფოსტა."
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
+#, fuzzy
 msgid "Con_vert to Meeting"
-msgstr ""
+msgstr "-სკენ შეხვედრა"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
+#, fuzzy
 msgid "Mail to meeting"
-msgstr ""
+msgstr "ფოსტა -სკენ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr ""
+msgstr "A - ამოცანები - a ფოსტა."
 
 #: ../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 ""
+msgstr "ფოსტა -სკენ დრო"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+#, fuzzy
 msgid "Convert the selected message to a new task"
-msgstr ""
+msgstr "გარდაქმნა -სკენ a ახალი დრო"
 
 #: ../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
@@ -17214,99 +17890,117 @@ 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 "მიღება სია"
 
 #: ../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
+#, fuzzy
 msgid "Mailing _List"
-msgstr ""
+msgstr "სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
+#, fuzzy
 msgid ""
 "Provide actions for common mailing list commands (subscribe, "
 "unsubscribe, ...)."
-msgstr ""
+msgstr "სია."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 #: ../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 "-სკენ სია"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
+#, fuzzy
 msgid "Action not available"
-msgstr ""
+msgstr "მოქმედება არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
+#, fuzzy
 msgid ""
 "An e-mail message will be sent to the URL \"{0}\". You can either send the "
 "message automatically, or see and change it first.\n"
 "\n"
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
-msgstr ""
+msgstr "e ფოსტა გაგზავნილი -სკენ URL თქვენ ან და პირველი არა სია გაგზავნილი."
 
 #: ../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 "არა e ფოსტა მოქმედება"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
+#, fuzzy
 msgid "Posting not allowed"
-msgstr ""
+msgstr "არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
+#, fuzzy
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr ""
+msgstr "-სკენ სია არა a სია კონტაქტი სია."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
+#, fuzzy
 msgid "Send e-mail message to mailing list?"
-msgstr ""
+msgstr "გაგზავნა e ფოსტა -სკენ სია?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
+#, fuzzy
 msgid ""
 "The action could not be performed. This means the header for this action did "
 "not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
-msgstr ""
+msgstr "მოქმედება არა თავსართი მოქმედება არა შეიცავს ნებისმიერი მოქმედება არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:13
+#, fuzzy
 msgid ""
 "The {0} header of this message is malformed and could not be processed.\n"
 "\n"
 "Header: {1}"
-msgstr ""
+msgstr "თავსართი - და არა არა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
+#, fuzzy
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
+msgstr "არა შეიცავს თავსართი მოქმედება."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -17317,33 +18011,39 @@ msgid "_Send message"
 msgstr "წერილის _გაგზავნა"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
+msgstr "კონტაქტი - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+#, fuzzy
 msgid "Get an archive of the list this message belongs to"
-msgstr ""
+msgstr "მიღება - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+#, fuzzy
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
+msgstr "მიღება შესახებ - სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
 msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
+msgstr "a -სკენ სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr ""
+msgstr "ხელის მოწერა -სკენ სია -სკენ"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr ""
+msgstr "ხელმოუწერელი -სკენ სია -სკენ"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 #, fuzzy
 msgid "Mark All Read"
-msgstr "ყველა წაკითხული"
+msgstr "ყველა წაკითხვა"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 #, fuzzy
@@ -17351,53 +18051,58 @@ msgid "Mark me_ssages as read"
 msgstr "წაკითხული"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+#, fuzzy
 msgid "Used for marking all the messages under a folder as read"
-msgstr ""
+msgstr "გამოყენებულია ყველა a"
 
 #: ../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
 msgid "Marks the selected calendar for offline viewing."
-msgstr "კავშირგარეშე რეჟიმი."
+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
+#, fuzzy
 msgid "_Mark Calendar for offline use"
-msgstr ""
+msgstr "კალენდარი ხაზიდან გასვლა"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin which implements mono plugins."
-msgstr ""
+msgstr "A მონო."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 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 "a D ახალი ფოსტა."
 
 #: ../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
 msgid "New mail notify"
-msgstr "ახალი"
+msgstr "ახალი ფოსტა"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 #, fuzzy
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "A ჩართული გამორთული."
+msgstr "A ჩართული ან გამორთული."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -17406,8 +18111,9 @@ 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
 msgid "_Plugins"
@@ -17424,8 +18130,9 @@ msgid "Description"
 msgstr "აღწერა"
 
 #: ../plugins/plugin-manager/plugin-manager.c:193
+#, fuzzy
 msgid "Note: Some changes will not take effect until restart"
-msgstr ""
+msgstr "შენიშვნა არა"
 
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
@@ -17433,12 +18140,13 @@ msgid "Plugin"
 msgstr "პლაგინი"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
 "disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
-msgstr ""
+msgstr "A a -სკენ გამორთვა HTML არა არა"
 
 #. but then we also need to create our own section frame
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
@@ -17447,35 +18155,40 @@ msgid "Plain Text Mode"
 msgstr "გლუვი ტექსტი რეჟიმი"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
+#, fuzzy
 msgid "Prefer plain-text"
-msgstr ""
+msgstr "ტექსტი"
 
 #: ../plugins/prefer-plain/prefer-plain.c:105
+#, fuzzy
 msgid "Show HTML if present"
-msgstr ""
+msgstr "ჩვენება HTML აწმყო"
 
 #: ../plugins/prefer-plain/prefer-plain.c:106
 msgid "Prefer PLAIN"
 msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:107
+#, fuzzy
 msgid "Only ever show PLAIN"
-msgstr ""
+msgstr "მხოლოდ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML რეჟიმი"
 
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
+#, fuzzy
 msgid "Gives an option to print mail from composer"
-msgstr ""
+msgstr "-სკენ ბეჭდვა ფოსტა"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../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
+#, fuzzy
 msgid "Print Pre_view"
-msgstr ""
+msgstr "_ესკიზი"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
@@ -17486,17 +18199,19 @@ msgid "Evolution Profiler"
 msgstr "ევოლუშენ პროფაილერი"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+#, fuzzy
 msgid "Writes a log of profiling data events."
-msgstr ""
+msgstr "a -."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+#, fuzzy
 msgid "Allows calendars to be published to the web"
-msgstr ""
+msgstr "-სკენ -სკენ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 #, fuzzy
 msgid "Calendar Publishing"
-msgstr "კალენდარი"
+msgstr "კალენდარი გამომცემლობა"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 #, fuzzy
@@ -17506,29 +18221,30 @@ msgstr "ადგილმდებარეობა"
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 #, fuzzy
 msgid "_Publish Calendar Information"
-msgstr "კალენდარი ინფორმაცია"
+msgstr "გამოქვეყნება კალენდარი ინფორმაცია"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 #, fuzzy
 msgid "Are you sure you want to remove this URL?"
-msgstr "-სკენ URL?"
+msgstr "-სკენ ამოშლა URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 #, fuzzy
 msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\"> ადგილმდებარეობა</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>"
+msgstr "<span weight=\"bold\"> წყაროები</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
+#, fuzzy
 msgid ""
 "Daily\n"
 "Weekly\n"
 "Manual (via Actions menu)"
-msgstr ""
+msgstr "ყოველდღიურად მოქმედებები მენიუ"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
@@ -17537,14 +18253,15 @@ msgstr "პ_ორტი:"
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
 #, fuzzy
 msgid "Publishing Location"
-msgstr "ადგილმდებარეობა"
+msgstr "გამომცემლობა მდებარეობა"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
 #, fuzzy
 msgid "Publishing _Frequency:"
-msgstr "სიხშირე:"
+msgstr "გამომცემლობა სიხშირე:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
+#, fuzzy
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -17553,7 +18270,7 @@ msgid ""
 "WebDAV (HTTP)\n"
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
-msgstr ""
+msgstr "SSH FTP HTTP მდებარეობა"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
@@ -17564,49 +18281,58 @@ msgid "_File:"
 msgstr "_ფაილი:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
 msgid "_Publish as:"
-msgstr ""
+msgstr "გამოქვეყნება:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr ""
+msgstr "დაკავებული"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
+#, fuzzy
 msgid "Spamassassin (built-in)"
-msgstr ""
+msgstr "-"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
+#, fuzzy
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr ""
+msgstr "ფილტრები -სკენ."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
 msgid "Spamassassin junk plugin"
 msgstr ""
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr ""
+msgstr "A ყველა ან - a ეთ."
 
 #. the path to the shared library
 #: ../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:338
+#, fuzzy
 msgid "Select save base name"
-msgstr ""
+msgstr "ამორჩევა შენახვა სახელი"
 
 #: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
@@ -17622,8 +18348,9 @@ msgstr "შენახვა"
 #. * 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 ""
+msgstr "F T"
 
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "UID"
@@ -17641,7 +18368,7 @@ msgstr "კატეგორიების სია"
 #: ../plugins/save-calendar/csv-format.c:389
 #, fuzzy
 msgid "Comment List"
-msgstr "შენიშვნ სია"
+msgstr "კომენტარი სია"
 
 #: ../plugins/save-calendar/csv-format.c:391
 msgid "Created"
@@ -17662,29 +18389,31 @@ msgstr "დასრულება"
 #: ../plugins/save-calendar/csv-format.c:396
 #, fuzzy
 msgid "percent Done"
-msgstr "შესრულებული პროცენტი"
+msgstr "შესრულებულია"
 
 #: ../plugins/save-calendar/csv-format.c:398
 msgid "URL"
 msgstr "URL"
 
 #: ../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
 #, fuzzy
 msgid "Advanced options for the CSV format"
-msgstr "დამატებითი"
+msgstr "დეტალური CSV"
 
 #: ../plugins/save-calendar/csv-format.c:559
+#, fuzzy
 msgid "Prepend a header"
-msgstr ""
+msgstr "a თავსართი"
 
 #: ../plugins/save-calendar/csv-format.c:568
 #, fuzzy
@@ -17708,8 +18437,9 @@ msgid "Save Selected"
 msgstr "ამორჩეულის შენახვა"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
+#, fuzzy
 msgid "Saves selected calendar or tasks list to disk."
-msgstr ""
+msgstr "კალენდარი ან ამოცანები სია -სკენ."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -17721,8 +18451,9 @@ msgstr "_შენახვა დისკზე"
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
 #: ../plugins/save-calendar/rdf-format.c:158
+#, fuzzy
 msgid "%FT%T"
-msgstr ""
+msgstr "T"
 
 #: ../plugins/save-calendar/rdf-format.c:396
 msgid "RDF format (.rdf)"
@@ -17730,16 +18461,19 @@ msgstr ""
 
 #: ../plugins/save-calendar/save-calendar.c:169
 #: ../plugins/save-calendar/save-calendar.c:179
+#, fuzzy
 msgid "Select destination file"
-msgstr ""
+msgstr "ამორჩევა ფაილი"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
+#, fuzzy
 msgid "Select one source"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
+#, fuzzy
 msgid "Selects a single calendar or task source for viewing."
-msgstr ""
+msgstr "a კალენდარი ან დრო."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -17750,40 +18484,45 @@ msgid "Show _only this Task List"
 msgstr "აჩვენე _მხოლოდ ეს დავალებათა სია"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+#, fuzzy
 msgid "A plugin that handles the Startup wizard."
-msgstr ""
+msgstr "A დასაწყისი."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
+#, fuzzy
 msgid "Startup wizard"
-msgstr ""
+msgstr "დასაწყისი"
 
 #: ../plugins/startup-wizard/startup-wizard.c:85
 #, fuzzy
 msgid "Evolution Setup Assistant"
-msgstr "Evolution ინსტალაცია ასისტენტი"
+msgstr "Evolution პარამეტრები ასისტენტი"
 
 #: ../plugins/startup-wizard/startup-wizard.c:88
 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 ""
+msgstr "მოგესალმებით -სკენ Evolution Evolution -სკენ -სკენ ელფოსტა ანგარიშები და -სკენ იმპორტი ფაილი სხვა არა წინ -სკენ "
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
 #: ../shell/e-shell-importer.c:147
+#, fuzzy
 msgid "Please select the information that you would like to import:"
-msgstr ""
+msgstr "-სკენ იმპორტი:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
+#, fuzzy
 msgid "From %s:"
-msgstr ""
+msgstr "-დან წმ:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
@@ -17791,29 +18530,34 @@ msgid "Importing data."
 msgstr ""
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
+#, fuzzy
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
+msgstr "- -სკენ თემა."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
+#, fuzzy
 msgid "Subject Threading"
-msgstr ""
+msgstr "თემა"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
+#, fuzzy
 msgid "Thread messages by subject"
-msgstr ""
+msgstr "თემა"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
+#, fuzzy
 msgid "Fall back to threading messages by sub_ject"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "ევოლუშენ შელი"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
+#, fuzzy
 msgid "Evolution Shell Config factory"
-msgstr ""
+msgstr "Evolution გარსი"
 
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
@@ -17825,116 +18569,139 @@ msgid "Evolution Test component"
 msgstr "Evolution ტესტი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
 msgid "A GNOME Print description of the current printer settings"
-msgstr ""
+msgstr "A GNOME ბეჭდვა აღწერა -"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "კონფიგურაციის ვერსია"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
 msgid "Default sidebar width"
-msgstr ""
+msgstr "ნაგულისხმევი სიგანე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
 msgid "Default window height"
-msgstr ""
+msgstr "ნაგულისხმევი ფანჯარა სიმაღლე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
 msgid "Default window width"
-msgstr ""
+msgstr "ნაგულისხმევი ფანჯარა სიგანე"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr ""
+msgstr "ID ან - -სკენ ნაგულისხმები ეთ ზემოთ."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#, fuzzy
 msgid "Last upgraded configuration version"
-msgstr ""
+msgstr "ბოლო"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#, fuzzy
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr ""
+msgstr "სია - -სკენ -სკენ ხაზიდან გასვლა"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
 msgid "Printer settings"
 msgstr "პრინტერის პარამეტრები"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#, fuzzy
 msgid "Sidebar is visible"
-msgstr ""
+msgstr "ხოლული"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#, fuzzy
 msgid "Skip development warning dialog"
-msgstr ""
+msgstr "გამოტოვება გაფრთხილება დიალოგი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#, fuzzy
 msgid "Start in offline mode"
-msgstr ""
+msgstr "გაშვება - ხაზიდან გასვლა რეჟიმი"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr ""
+msgstr "- Evolution მაგალითი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
 msgid "The default height for the main window, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიმაღლე ფანჯარა - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#, fuzzy
 msgid "The default width for the main window, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიგანე ფანჯარა - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#, fuzzy
 msgid "The default width for the sidebar, in pixels."
-msgstr ""
+msgstr "ნაგულისხმები სიგანე - პიქსელი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
-msgstr ""
+msgstr "- Evolution მაგალითი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#, fuzzy
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
-msgstr ""
+msgstr "- ფანჯარა ტექსტი - GNOME."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#, fuzzy
 msgid "Toolbar is visible"
-msgstr ""
+msgstr "ინსტრუმენტთა პანელი ხოლული"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#, fuzzy
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
+msgstr "Evolution ზემოთ - ხაზიდან გასვლა რეჟიმი - ხაზზე რეჟიმი."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
 msgid "Whether the sidebar should be visible."
-msgstr ""
+msgstr "ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#, fuzzy
 msgid "Whether the toolbar should be visible."
-msgstr ""
+msgstr "ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#, fuzzy
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr ""
+msgstr "გაფრთხილება დიალოგი - - Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#, fuzzy
 msgid "Whether the window buttons should be visible."
-msgstr ""
+msgstr "ფანჯარა ხოლული."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#, fuzzy
 msgid "Window button style"
-msgstr ""
+msgstr "ფანჯარა"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:26
 #, fuzzy
 msgid "Window buttons are visible"
-msgstr "ფანჯარა ხილული"
+msgstr "ფანჯარა ხოლული"
 
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
@@ -17945,8 +18712,9 @@ msgid "Active Connections"
 msgstr "აქტიური შეერთებები"
 
 #: ../shell/e-active-connection-dialog.glade.h:3
+#, fuzzy
 msgid "Click OK to close these connections and go offline"
-msgstr ""
+msgstr "OK -სკენ დახურვა და ხაზიდან გასვლა"
 
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
@@ -17954,33 +18722,38 @@ msgid "(Untitled)"
 msgstr "(უსახელო)"
 
 #: ../shell/e-shell-importer.c:135
+#, fuzzy
 msgid "Choose the type of importer to run:"
-msgstr ""
+msgstr "- -სკენ:"
 
 #: ../shell/e-shell-importer.c:138
+#, fuzzy
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
 "\n"
 "You can select \"Automatic\" if you do not know, and Evolution will attempt "
 "to work it out."
-msgstr ""
+msgstr "ფაილი -სკენ იმპორტი Evolution და - ფაილი სია არა ავტომატური არა და Evolution -სკენ."
 
 #: ../shell/e-shell-importer.c:144
+#, fuzzy
 msgid "Choose the destination for this import"
-msgstr ""
+msgstr "იმპორტი"
 
 #: ../shell/e-shell-importer.c:150
+#, fuzzy
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
 "settings found. If you would like to\n"
 "try again, please click the \"Back\" button.\n"
-msgstr ""
+msgstr "Evolution -სკენ იმპორტი Netscape iCalendar არა -სკენ უკან არა"
 
 #: ../shell/e-shell-importer.c:285
+#, fuzzy
 msgid "F_ilename:"
-msgstr ""
+msgstr "F:"
 
 #: ../shell/e-shell-importer.c:290
 msgid "Select a file"
@@ -17991,12 +18764,14 @@ msgid "File _type:"
 msgstr "ფაილის _ტიპი:"
 
 #: ../shell/e-shell-importer.c:338
+#, fuzzy
 msgid "Import data and settings from _older programs"
-msgstr ""
+msgstr "იმპორტი და პროგრამები"
 
 #: ../shell/e-shell-importer.c:341
+#, fuzzy
 msgid "Import a _single file"
-msgstr ""
+msgstr "იმპორტი a ფაილი"
 
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
@@ -18007,44 +18782,52 @@ msgid "No folder name specified."
 msgstr "საქაღალდის სახელი არ არის მოცემული."
 
 #: ../shell/e-shell-utils.c:125
+#, fuzzy
 msgid "Folder name cannot contain the Return character."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს დაბრუნება."
 
 #: ../shell/e-shell-utils.c:131
+#, fuzzy
 msgid "Folder name cannot contain the character \"/\"."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს."
 
 #: ../shell/e-shell-utils.c:137
+#, fuzzy
 msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+msgstr "საქაღალდე სახელი შეიცავს."
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
 msgstr "საქაღალდის სახელები '.' და '..' დარეზერვირებულია."
 
 #: ../shell/e-shell-window-commands.c:71
+#, fuzzy
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr ""
+msgstr "GNOME არა -სკენ ჩართულია."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
+#, fuzzy
 msgid "Error executing %s."
-msgstr ""
+msgstr "შეცდომა წმ."
 
 #: ../shell/e-shell-window-commands.c:128
+#, fuzzy
 msgid "Bug buddy is not installed."
-msgstr ""
+msgstr "შეცდომა არა."
 
 #: ../shell/e-shell-window-commands.c:136
+#, fuzzy
 msgid "Bug buddy could not be run."
-msgstr ""
+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:530
+#, fuzzy
 msgid "translator-credits"
-msgstr ""
+msgstr "თარგმანი-შესრულებულია"
 
 #: ../shell/e-shell-window-commands.c:775
 #, fuzzy
@@ -18054,31 +18837,33 @@ msgstr "სამსახური ხაზზე"
 #: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 #, fuzzy
 msgid "_Work Offline"
-msgstr "სამსახური გასული"
+msgstr "სამსახური ხაზიდან გასული"
 
 #: ../shell/e-shell-window-commands.c:801
 #, fuzzy
 msgid "Work Offline"
-msgstr "სამსახური გასული"
+msgstr "სამსახური ხაზიდან გასული"
 
 #: ../shell/e-shell-window.c:368
 #, fuzzy
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution -სკენ კავშირგარეშე რეჟიმი."
+msgstr "Evolution ხაზზე ჩართულია -სკენ ხაზიდან გასვლა."
 
 #: ../shell/e-shell-window.c:376
 #, fuzzy
 msgid "Evolution is in the process of going offline."
-msgstr "Evolution კავშირგარეშე რეჟიმი."
+msgstr "Evolution - - ხაზიდან გასვლა."
 
 #: ../shell/e-shell-window.c:383
+#, fuzzy
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
+msgstr "Evolution ხაზიდან გასვლა ჩართულია -სკენ ხაზზე."
 
 #: ../shell/e-shell-window.c:783
 #, c-format
+#, fuzzy
 msgid "Switch to %s"
-msgstr ""
+msgstr "-სკენ წმ"
 
 #: ../shell/e-shell.c:633
 msgid "Uknown system error."
@@ -18086,8 +18871,9 @@ msgstr "უცნობი სისტემის შეცდომა."
 
 #: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
+#, fuzzy
 msgid "%ld KB"
-msgstr ""
+msgstr "კბ"
 
 #: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
@@ -18099,13 +18885,14 @@ msgid "Invalid arguments"
 msgstr "არასწორი"
 
 #: ../shell/e-shell.c:1265
+#, fuzzy
 msgid "Cannot register on OAF"
-msgstr ""
+msgstr "ჩართულია"
 
 #: ../shell/e-shell.c:1267
 #, fuzzy
 msgid "Configuration Database not found"
-msgstr "კონფიგურაცია მონაცემთა ბაზა"
+msgstr "გამართვა მონაცემთა ბაზა არა"
 
 #: ../shell/e-user-creatable-items-handler.c:685
 msgid "New"
@@ -18120,12 +18907,14 @@ msgid "_Test"
 msgstr "_ტესტი"
 
 #: ../shell/evolution-test-component.c:142
+#, fuzzy
 msgid "Create a new test item"
-msgstr ""
+msgstr "შექმნა a ახალი"
 
 #: ../shell/import.glade.h:1
+#, fuzzy
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
+msgstr "იმპორტი -სკენ ფაილი Evolution "
 
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -18138,30 +18927,34 @@ msgstr "ფაილის იმპორტი"
 #: ../shell/import.glade.h:4
 #, fuzzy
 msgid "Import Location"
-msgstr "მდებარეობის იმპორტი"
+msgstr "იმპორტი მდებარეობა"
 
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "იმპორტერის ტიპი"
 
 #: ../shell/import.glade.h:6
+#, fuzzy
 msgid "Select Importers"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../shell/import.glade.h:7
+#, fuzzy
 msgid "Select a File"
-msgstr ""
+msgstr "ამორჩევა a ფაილი"
 
 #: ../shell/import.glade.h:8
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
-msgstr ""
+msgstr "მოგესალმებით -სკენ Evolution იმპორტი ასისტენტი - ფაილი Evolution."
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:230
 #, no-c-format
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -18178,7 +18971,7 @@ msgid ""
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
-msgstr ""
+msgstr "-სკენ Evolution არა - Evolution არა დახურვა მონაცემები ან არა არა a - Evolution -სკენ და წმ არა პოვნა -სკენ ეთ არა და არა -სკენ - არა - და არა"
 
 #: ../shell/main.c:254
 msgid ""
@@ -18189,71 +18982,86 @@ msgstr ""
 "ევოლუშენის ჯგუფი\n"
 
 #: ../shell/main.c:261
+#, fuzzy
 msgid "Do not tell me again"
-msgstr ""
+msgstr "არა"
 
 #: ../shell/main.c:471
+#, fuzzy
 msgid "Start Evolution activating the specified component"
-msgstr ""
+msgstr "გაშვება Evolution"
 
 #: ../shell/main.c:475
+#, fuzzy
 msgid "Start in online mode"
-msgstr ""
+msgstr "გაშვება - ხაზზე რეჟიმი"
 
 #: ../shell/main.c:478
+#, fuzzy
 msgid "Forcibly shut down all Evolution components"
-msgstr ""
+msgstr "ქვემოთ ყველა Evolution"
 
 #: ../shell/main.c:482
+#, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr ""
+msgstr "Evolution 4"
 
 #: ../shell/main.c:485
+#, fuzzy
 msgid "Send the debugging output of all components to a file."
-msgstr ""
+msgstr "გაგზავნა - ყველა -სკენ a ფაილი."
 
 #: ../shell/main.c:487
+#, fuzzy
 msgid "Disable loading of any plugins."
-msgstr ""
+msgstr "გამორთე - ნებისმიერი."
 
 #: ../shell/main.c:518
 #, c-format
+#, fuzzy
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
+"წმ ხაზზე და ხაზიდან გასვლა\n"
+" გამოყენება წმ დახმარება მეტი არა"
 
 #: ../shell/shell.error.xml.h:1
+#, fuzzy
 msgid "Are you sure you want to forget all remembered passwords?"
-msgstr ""
+msgstr "-სკენ დავიწყება ყველა?"
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
 msgstr "გაგრძელება"
 
 #: ../shell/shell.error.xml.h:3
+#, fuzzy
 msgid "Delete old data from version {0}?"
-msgstr ""
+msgstr "წაშლა?"
 
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 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."
-msgstr ""
+msgstr "გასუფთავება ყველა თქვენ."
 
 #: ../shell/shell.error.xml.h:7
 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
+#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -18264,9 +19072,10 @@ msgid ""
 "\n"
 "Once deleted, you cannot downgrade to the previous version of Evolution "
 "without manual intervention.\n"
-msgstr ""
+msgstr "-&quot;&quot; შესახებ -სკენ არა ყველა - ფოსტა და კალენდარი აწმყო და - Evolution არა -სკენ - Evolution ხელით არა"
 
 #: ../shell/shell.error.xml.h:15
+#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -18274,78 +19083,87 @@ msgid ""
 "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 ""
+msgstr "- - a არა -სკენ ამოშლა -&quot;&quot; -სკენ ამოშლა -&quot;&quot; ეთ არა"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
 msgstr ""
 
 #: ../shell/shell.error.xml.h:20
+#, fuzzy
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
 "can continue."
-msgstr ""
+msgstr "და ზემოთ -სკენ - არა -სკენ მეტი - თავფურცელი."
 
 #: ../shell/shell.error.xml.h:23
+#, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
-msgstr ""
+msgstr "არა ემთხვევა Evolution არა დახმარება"
 
 #: ../shell/shell.error.xml.h:26
+#, fuzzy
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
 "\n"
 "{0}\n"
 "\n"
 "Click help for details."
-msgstr ""
+msgstr "არა ემთხვევა Evolution არა არა არა დახმარება."
 
 #: ../shell/shell.error.xml.h:31
 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 "Me"
 
 #: ../shell/shell.error.xml.h:34
+#, fuzzy
 msgid ""
 "{1}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
-msgstr ""
+msgstr "არა -სკენ არა -სკენ მონაცემები - არა"
 
 #: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
+#, fuzzy
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
 "\n"
 "Edit trust settings:"
-msgstr ""
+msgstr "სერთიფიკატი წმ a არა:"
 
 #: ../smime/gui/cert-trust-dialog.c:154
+#, fuzzy
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr ""
+msgstr "-"
 
 #: ../smime/gui/cert-trust-dialog.c:158
+#, fuzzy
 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 ""
+msgstr "არა არა -"
 
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
@@ -18353,8 +19171,9 @@ msgstr ""
 #: ../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 "ამორჩევა a -სკენ იმპორტი."
 
 #: ../smime/gui/certificate-manager.c:267
 #: ../smime/gui/certificate-manager.c:472
@@ -18382,18 +19201,21 @@ msgstr "E-Mail მისამართი"
 
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
+#, fuzzy
 msgid "Certificate Viewer: %s"
-msgstr ""
+msgstr "სერთიფიკატი წმ"
 
 #: ../smime/gui/component.c:47
 #, c-format
+#, fuzzy
 msgid "Enter the password for `%s'"
-msgstr ""
+msgstr "შეყვანა წმ"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
+#, fuzzy
 msgid "Enter new password for certificate database"
-msgstr ""
+msgstr "შეყვანა ახალი"
 
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
@@ -18402,38 +19224,47 @@ msgstr "შეიყვანეთ ახალი პაროლი"
 #. FIXME: add serial no, validity date, uses
 #: ../smime/gui/e-cert-selector.c:121
 #, c-format
+#, fuzzy
 msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
+"-სკენ\n"
+" თემა წმ არა"
 
 #: ../smime/gui/e-cert-selector.c:122
 #, c-format
+#, fuzzy
 msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
+"\n"
+" თემა წმ არა"
 
 #: ../smime/gui/e-cert-selector.c:174
+#, fuzzy
 msgid "Select certificate"
-msgstr ""
+msgstr "ამორჩევა"
 
 #: ../smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:2
+#, fuzzy
 msgid "<b>Certificate Fields</b>"
-msgstr ""
+msgstr "<b> სერთიფიკატი</b>"
 
 #: ../smime/gui/smime-ui.glade.h:3
+#, fuzzy
 msgid "<b>Certificate Hierarchy</b>"
-msgstr ""
+msgstr "<b> სერთიფიკატი</b>"
 
 #: ../smime/gui/smime-ui.glade.h:4
 #, fuzzy
 msgid "<b>Field Value</b>"
-msgstr "<b> მნიშვნელობა</b>"
+msgstr "<b> ველი მნიშვნელობა</b>"
 
 #: ../smime/gui/smime-ui.glade.h:5
 msgid "<b>Fingerprints</b>"
@@ -18461,40 +19292,45 @@ msgid "Authorities"
 msgstr ""
 
 #: ../smime/gui/smime-ui.glade.h:11
+#, fuzzy
 msgid "Backup"
-msgstr ""
+msgstr "სარეზერვო ასლი"
 
 #: ../smime/gui/smime-ui.glade.h:12
+#, fuzzy
 msgid "Backup All"
-msgstr ""
+msgstr "სარეზერვო ასლი ყველა"
 
 #: ../smime/gui/smime-ui.glade.h:13
+#, fuzzy
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr ""
+msgstr "ვიდრე ნებისმიერი და და."
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "სერტიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:15
+#, fuzzy
 msgid "Certificate Authority Trust"
-msgstr ""
+msgstr "სერთიფიკატი ნდობა"
 
 #: ../smime/gui/smime-ui.glade.h:16
+#, fuzzy
 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
 #, fuzzy
 msgid "Common Name (CN)"
-msgstr "სახელი CN"
+msgstr "საერთო სახელი CN"
 
 #: ../smime/gui/smime-ui.glade.h:19
 #, fuzzy
@@ -18502,12 +19338,14 @@ msgid "Contact Certificates"
 msgstr "კონტაქტი სერთიფიკატები"
 
 #: ../smime/gui/smime-ui.glade.h:21
+#, fuzzy
 msgid "Do not trust the authenticity of this certificate"
-msgstr ""
+msgstr "არა -"
 
 #: ../smime/gui/smime-ui.glade.h:22
+#, fuzzy
 msgid "Dummy window only"
-msgstr ""
+msgstr "ფიქტიური ფანჯარა"
 
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
@@ -18516,21 +19354,22 @@ msgstr "რედაქტირება"
 #: ../smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Certificate Trust Settings"
-msgstr "Email ნდობა პარამეტრები"
+msgstr "ელფოსტა სერთიფიკატი ნდობა პარამეტრები"
 
 #: ../smime/gui/smime-ui.glade.h:25
 #, fuzzy
 msgid "Email Recipient Certificate"
-msgstr "Email"
+msgstr "ელფოსტა ადრესატი სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:26
 #, fuzzy
 msgid "Email Signer Certificate"
-msgstr "Email"
+msgstr "ელფოსტა სერთიფიკატი"
 
 #: ../smime/gui/smime-ui.glade.h:27
+#, fuzzy
 msgid "Expires On"
-msgstr ""
+msgstr "ჩართ."
 
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
@@ -18542,8 +19381,9 @@ msgid "Issued On"
 msgstr "ჩართ."
 
 #: ../smime/gui/smime-ui.glade.h:31
+#, fuzzy
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5"
 
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
@@ -18567,36 +19407,43 @@ msgid "SSL Server Certificate"
 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
+#, fuzzy
 msgid "Trust this CA to identify email users."
-msgstr ""
+msgstr "ნდობა -სკენ ელფოსტა."
 
 #: ../smime/gui/smime-ui.glade.h:40
+#, fuzzy
 msgid "Trust this CA to identify software developers."
-msgstr ""
+msgstr "ნდობა -სკენ."
 
 #: ../smime/gui/smime-ui.glade.h:41
+#, fuzzy
 msgid "Trust this CA to identify web sites."
-msgstr ""
+msgstr "ნდობა -სკენ."
 
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "ხედი"
 
 #: ../smime/gui/smime-ui.glade.h:43
+#, fuzzy
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
+msgstr "თქვენ:"
 
 #: ../smime/gui/smime-ui.glade.h:44
+#, fuzzy
 msgid "You have certificates on file that identify these certificate authorities:"
-msgstr ""
+msgstr "თქვენ ჩართულია ფაილი:"
 
 #: ../smime/gui/smime-ui.glade.h:45
+#, fuzzy
 msgid "You have certificates on file that identify these people:"
-msgstr ""
+msgstr "თქვენ ჩართულია ფაილი:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -18609,12 +19456,14 @@ msgstr "რედაქტირება ნდობა"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:664
+#, fuzzy
 msgid "Certificate already exists"
-msgstr ""
+msgstr "სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
+#, fuzzy
 msgid "%d/%m/%Y"
-msgstr ""
+msgstr "Y"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:425
@@ -18642,81 +19491,89 @@ msgid "Version 3"
 msgstr "ვერსია 3"
 
 #: ../smime/lib/e-cert.c:634
+#, fuzzy
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:637
+#, fuzzy
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "MD5 RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:640
+#, fuzzy
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "SHA RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:667
+#, fuzzy
 msgid "PKCS #1 RSA Encryption"
-msgstr ""
+msgstr "RSA დაშიფვრა"
 
 #: ../smime/lib/e-cert.c:670
 #, fuzzy
 msgid "Certificate Key Usage"
-msgstr "გასაღები გამოყენება"
+msgstr "სერთიფიკატი გასაღები გამოყენება"
 
 #: ../smime/lib/e-cert.c:673
 #, fuzzy
 msgid "Netscape Certificate Type"
-msgstr "Netscape ტიპი"
+msgstr "Netscape სერთიფიკატი ტიპი"
 
 #: ../smime/lib/e-cert.c:676
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
-msgstr "გასაღები"
+msgstr "სერთიფიკატი გასაღები"
 
 #: ../smime/lib/e-cert.c:688
 #, c-format
+#, fuzzy
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "ობიექტი წმ"
 
 #: ../smime/lib/e-cert.c:739
 msgid "Algorithm Identifier"
 msgstr ""
 
 #: ../smime/lib/e-cert.c:747
+#, fuzzy
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "პარამეტრები"
 
 #: ../smime/lib/e-cert.c:769
 #, fuzzy
 msgid "Subject Public Key Info"
-msgstr "თემა გასაღები ინფორმაცია"
+msgstr "თემა საზოგადო გასაღები ინფორმაცია"
 
 #: ../smime/lib/e-cert.c:774
+#, fuzzy
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "თემა საზოგადო გასაღები"
 
 #: ../smime/lib/e-cert.c:789
 #, fuzzy
 msgid "Subject's Public Key"
-msgstr "თემა გასაღები"
+msgstr "თემა წმ საზოგადო გასაღები"
 
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 #, fuzzy
 msgid "Error: Unable to process extension"
-msgstr "შეცდომა -სკენ"
+msgstr "შეცდომა -სკენ გაფართოვება"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
+#, fuzzy
 msgid "Object Signer"
-msgstr ""
+msgstr "ობიექტი"
 
 #: ../smime/lib/e-cert.c:835
 #, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "SSL"
+msgstr "SSL სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:839
 #, fuzzy
 msgid "Email Certificate Authority"
-msgstr "Email"
+msgstr "ელფოსტა სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
@@ -18734,7 +19591,7 @@ msgstr "გასაღები"
 #: ../smime/lib/e-cert.c:879
 #, fuzzy
 msgid "Data Encipherment"
-msgstr "მონაცემი"
+msgstr "მონაცემები"
 
 #: ../smime/lib/e-cert.c:883
 #, fuzzy
@@ -18742,8 +19599,9 @@ msgid "Key Agreement"
 msgstr "გასაღები"
 
 #: ../smime/lib/e-cert.c:887
+#, fuzzy
 msgid "Certificate Signer"
-msgstr ""
+msgstr "სერთიფიკატი"
 
 #: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
@@ -18756,7 +19614,7 @@ msgstr "კრიტიკული"
 #: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 #, fuzzy
 msgid "Not Critical"
-msgstr "არა კრიტიკული"
+msgstr "კრიტიკული"
 
 #: ../smime/lib/e-cert.c:965
 msgid "Extensions"
@@ -18764,107 +19622,121 @@ msgstr "გაფართოებები"
 
 #: ../smime/lib/e-cert.c:1036
 #, c-format
+#, fuzzy
 msgid "%s = %s"
-msgstr ""
+msgstr "წმ წმ"
 
 #: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 #, fuzzy
 msgid "Certificate Signature Algorithm"
-msgstr "ხელმოწერა"
+msgstr "სერთიფიკატი ხელმოწერა"
 
 #: ../smime/lib/e-cert.c:1101
+#, fuzzy
 msgid "Issuer"
-msgstr ""
+msgstr "მფლობელი"
 
 #: ../smime/lib/e-cert.c:1155
+#, fuzzy
 msgid "Issuer Unique ID"
-msgstr ""
+msgstr "მფლობელი ID"
 
 #: ../smime/lib/e-cert.c:1174
+#, fuzzy
 msgid "Subject Unique ID"
-msgstr ""
+msgstr "თემა ID"
 
 #: ../smime/lib/e-cert.c:1217
 #, fuzzy
 msgid "Certificate Signature Value"
-msgstr "ხელმოწერა მნიშვნელობა"
+msgstr "სერთიფიკატი ხელმოწერა მნიშვნელობა"
 
 #: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ფაილის პაროლი"
 
 #: ../smime/lib/e-pkcs12.c:266
+#, fuzzy
 msgid "Enter password for PKCS12 file:"
-msgstr ""
+msgstr "შეყვანა ფაილი:"
 
 #: ../smime/lib/e-pkcs12.c:365
+#, fuzzy
 msgid "Imported Certificate"
-msgstr ""
+msgstr "იმპორტირებული სერთიფიკატი"
 
 #: ../tools/evolution-launch-composer.c:321
+#, fuzzy
 msgid "An attachment to add."
-msgstr ""
+msgstr "-სკენ დამატება."
 
 #: ../tools/evolution-launch-composer.c:322
+#, fuzzy
 msgid "Content type of the attachment."
-msgstr ""
+msgstr "შიგთავსი -."
 
 #: ../tools/evolution-launch-composer.c:323
+#, fuzzy
 msgid "The filename to display in the mail."
-msgstr ""
+msgstr "-სკენ - ფოსტა."
 
 #: ../tools/evolution-launch-composer.c:324
+#, fuzzy
 msgid "Description of the attachment."
-msgstr ""
+msgstr "აღწერა -."
 
 #: ../tools/evolution-launch-composer.c:325
+#, fuzzy
 msgid "Mark attachment to be shown inline by default."
-msgstr ""
+msgstr "-სკენ ნაგულისხმები."
 
 #: ../tools/evolution-launch-composer.c:326
+#, fuzzy
 msgid "Default subject for the message."
-msgstr ""
+msgstr "ნაგულისხმევი თემა."
 
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
 #: ../tools/killev.c:61
 #, c-format
+#, fuzzy
 msgid "Could not execute '%s': %s\n"
-msgstr ""
+msgstr "არა შესრულება წმ წმ არა"
 
 #: ../tools/killev.c:76
 #, c-format
+#, fuzzy
 msgid "Shutting down %s (%s)\n"
-msgstr ""
+msgstr "ქვემოთ წმ წმ არა"
 
 #: ../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 ""
+msgstr "შეცვლა პარამეტრები -"
 
 #: ../ui/evolution-addressbook.xml.h:4
 #, fuzzy
 msgid "Co_py All Contacts To..."
-msgstr "ყველა ვის."
+msgstr "ყველა მეგობრები ვის."
 
 #: ../ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Contact _Preview"
-msgstr "კონტაქტი წინასწარ ნახვა"
+msgstr "კონტაქტის წ_ინასწარი ნახვა"
 
 #: ../ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Copy Selected Contacts to Another Folder..."
-msgstr "დააკოპირე -სკენ საქაღალდე."
+msgstr "დააკოპირე მონიშნული მეგობრები -სკენ საქაღალდე."
 
 #: ../ui/evolution-addressbook.xml.h:8
 #, fuzzy
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "დააკოპირე"
+msgstr "დააკოპირე -"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 #, fuzzy
@@ -18876,8 +19748,9 @@ msgid "Copy to Folder..."
 msgstr "დააკოპირე საქაღალდეში..."
 
 #: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
 msgid "Create a new addressbook folder"
-msgstr ""
+msgstr "შექმნა a ახალი წიგნაკი"
 
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
@@ -18886,16 +19759,18 @@ msgid "Cut"
 msgstr "ამოჭრა"
 
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
+#, fuzzy
 msgid "Cut the selection"
-msgstr ""
+msgstr "ამოჭრა"
 
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
 msgstr "მისამართების წიგნაკის წა_შლა"
 
 #: ../ui/evolution-addressbook.xml.h:16
+#, fuzzy
 msgid "Delete selected contacts"
-msgstr ""
+msgstr "წაშლა"
 
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
@@ -18904,21 +19779,22 @@ msgstr "წაშალე ამორჩეული საქაღალდ�
 #: ../ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "Forward Contact"
-msgstr "კონტაქტი"
+msgstr "წინ კონტაქტი"
 
 #: ../ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Mo_ve All Contacts To..."
-msgstr "ორ ყველა ვის."
+msgstr "ორ ყველა მეგობრები ვის."
 
 #: ../ui/evolution-addressbook.xml.h:20
+#, fuzzy
 msgid "Move Selected Contacts to Another Folder..."
-msgstr ""
+msgstr "გადატანა მონიშნული მეგობრები -სკენ საქაღალდე."
 
 #: ../ui/evolution-addressbook.xml.h:21
 #, fuzzy
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "გადატანა"
+msgstr "გადატანა -"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -18931,12 +19807,14 @@ msgid "Paste"
 msgstr "ჩასმა"
 
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
+#, fuzzy
 msgid "Paste the clipboard"
-msgstr ""
+msgstr "ჩასმა"
 
 #: ../ui/evolution-addressbook.xml.h:25
+#, fuzzy
 msgid "Previews the contacts to be printed"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
@@ -18952,12 +19830,14 @@ msgid "S_ave Address Book As VCard"
 msgstr "S მისამართი"
 
 #: ../ui/evolution-addressbook.xml.h:32
+#, fuzzy
 msgid "Save selected contacts as a VCard."
-msgstr ""
+msgstr "შენახვა a."
 
 #: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
 msgid "Save the contacts of the selected folder as VCard"
-msgstr ""
+msgstr "შენახვა -"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
@@ -18970,8 +19850,9 @@ msgid "Select _All"
 msgstr "მონიშნე _ყველა"
 
 #: ../ui/evolution-addressbook.xml.h:36
+#, fuzzy
 msgid "Select all contacts"
-msgstr ""
+msgstr "ამორჩევა ყველა"
 
 #: ../ui/evolution-addressbook.xml.h:37
 #, fuzzy
@@ -18986,11 +19867,12 @@ msgstr "გაგზავნა -სკენ"
 #: ../ui/evolution-addressbook.xml.h:39
 #, fuzzy
 msgid "Send selected contacts to another person."
-msgstr "გაგზავნა -სკენ."
+msgstr "გაგზავნა -სკენ პირადი ფორმა."
 
 #: ../ui/evolution-addressbook.xml.h:40
+#, fuzzy
 msgid "Show contact preview window"
-msgstr ""
+msgstr "ჩვენება ფანჯარა"
 
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
@@ -19001,13 +19883,13 @@ msgid "Stop"
 msgstr "შეჩერება"
 
 #: ../ui/evolution-addressbook.xml.h:43
-#, fuzzy
 msgid "Stop Loading"
-msgstr "შეჩერება"
+msgstr "ჩატვირთვის შეჩერება"
 
 #: ../ui/evolution-addressbook.xml.h:44
+#, fuzzy
 msgid "View the current contact"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
@@ -19021,7 +19903,7 @@ msgstr "_დააკოპირე კონტაქტი..."
 #: ../ui/evolution-addressbook.xml.h:48
 #, fuzzy
 msgid "_Copy Folder Contacts To"
-msgstr "დააკოპირე საქაღალდე ვის"
+msgstr "დააკოპირე საქაღალდე მეგობრები ვის"
 
 #: ../ui/evolution-addressbook.xml.h:50
 msgid "_Delete Contact"
@@ -19030,17 +19912,17 @@ msgstr "კონტაქტის _წაშლა"
 #: ../ui/evolution-addressbook.xml.h:52
 #, fuzzy
 msgid "_Forward Contact..."
-msgstr "კონტაქტი."
+msgstr "წინ კონტაქტი."
 
 #: ../ui/evolution-addressbook.xml.h:53
 #, fuzzy
 msgid "_Move Contact to..."
-msgstr "კონტაქტი -სკენ."
+msgstr "გადატანა კონტაქტი -სკენ."
 
 #: ../ui/evolution-addressbook.xml.h:54
 #, fuzzy
 msgid "_Move Folder Contacts To"
-msgstr "საქაღალდე ვის"
+msgstr "გადატანა საქაღალდე მეგობრები ვის"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
@@ -19056,8 +19938,9 @@ msgid "_Save Contact as VCard..."
 msgstr "შენახვა კონტაქტი."
 
 #: ../ui/evolution-addressbook.xml.h:62
+#, fuzzy
 msgid "_Save Folder Contacts As VCard"
-msgstr ""
+msgstr "შენახვა საქაღალდე მეგობრები"
 
 #: ../ui/evolution-addressbook.xml.h:63
 #, fuzzy
@@ -19071,12 +19954,12 @@ msgstr "დღე"
 #: ../ui/evolution-calendar.xml.h:6
 #, fuzzy
 msgid "Delete _all Occurrences"
-msgstr "წაშლა"
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Delete all occurrences"
-msgstr "წაშლა"
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-calendar.xml.h:8
 #, fuzzy
@@ -19091,7 +19974,7 @@ msgstr "წაშლა"
 #: ../ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Go To"
-msgstr "ვის"
+msgstr "გადასვლა"
 
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
@@ -19114,8 +19997,9 @@ msgid "Next"
 msgstr "შემდეგი"
 
 #: ../ui/evolution-calendar.xml.h:18
+#, fuzzy
 msgid "Previews the calendar to be printed"
-msgstr ""
+msgstr "კალენდარი -სკენ"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
@@ -19127,29 +20011,34 @@ msgid "Print this calendar"
 msgstr "ამ კალენდრის დაბეჭდვა"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#, fuzzy
 msgid "Purg_e"
-msgstr ""
+msgstr "e"
 
 #: ../ui/evolution-calendar.xml.h:24
+#, fuzzy
 msgid "Purge old appointments and meetings"
-msgstr ""
+msgstr "გასუფთავება და"
 
 #: ../ui/evolution-calendar.xml.h:25
+#, fuzzy
 msgid "Select _Date"
-msgstr ""
+msgstr "ამორჩევა თარიღი"
 
 #: ../ui/evolution-calendar.xml.h:26
+#, fuzzy
 msgid "Select _Today"
-msgstr ""
+msgstr "ამორჩევა დღეს"
 
 #: ../ui/evolution-calendar.xml.h:27
+#, fuzzy
 msgid "Select a specific date"
-msgstr ""
+msgstr "ამორჩევა a თარიღი"
 
 #: ../ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Select today"
-msgstr "დღეს"
+msgstr "ამორჩევა დღეს"
 
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
@@ -19172,37 +20061,43 @@ msgid "Show the working week"
 msgstr "აჩვენე სამუშაო კვირა"
 
 #: ../ui/evolution-calendar.xml.h:35
+#, fuzzy
 msgid "View the current appointment"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../ui/evolution-calendar.xml.h:36
+#, fuzzy
 msgid "Week"
-msgstr ""
+msgstr "კვირა"
 
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "სამუშაო კვირა"
 
 #: ../ui/evolution-calendar.xml.h:42
+#, fuzzy
 msgid "_Open Appointment"
-msgstr ""
+msgstr "გახსნა შეხვედრა"
 
 #: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 #, fuzzy
 msgid "Copy selected text to the clipboard"
-msgstr "დააკოპირე -სკენ"
+msgstr "დააკოპირე ტექსტი -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:3
+#, fuzzy
 msgid "Copy selection to clipboard"
-msgstr ""
+msgstr "დააკოპირე -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
+#, fuzzy
 msgid "Cut selected text to the clipboard"
-msgstr ""
+msgstr "ამოჭრა ტექსტი -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:7
+#, fuzzy
 msgid "Cut selection to clipboard"
-msgstr ""
+msgstr "ამოჭრა -სკენ"
 
 #: ../ui/evolution-composer-entries.xml.h:9
 #, fuzzy
@@ -19212,31 +20107,36 @@ msgstr "ჩასმა"
 #: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 #, fuzzy
 msgid "Paste text from the clipboard"
-msgstr "ჩასმა"
+msgstr "ჩასმა ტექსტი"
 
 #: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
+#, fuzzy
 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
+#, fuzzy
 msgid "Click here to attach a file"
-msgstr ""
+msgstr "-სკენ მიმაგრება a ფაილი"
 
 #: ../ui/evolution-editor.xml.h:3
+#, fuzzy
 msgid "Click here to close the current window"
-msgstr ""
+msgstr "-სკენ დახურვა ფანჯარა"
 
 #: ../ui/evolution-editor.xml.h:4
+#, fuzzy
 msgid "Click here to save the current window"
-msgstr ""
+msgstr "-სკენ შენახვა ფანჯარა"
 
 #: ../ui/evolution-editor.xml.h:5
+#, fuzzy
 msgid "Click here to view help available"
-msgstr ""
+msgstr "-სკენ დახმარება"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -19280,12 +20180,12 @@ msgstr "_ოფციები"
 #: ../ui/evolution-event-editor.xml.h:2
 #, fuzzy
 msgid "All Day Event"
-msgstr "ყველა დღე შემთხვევა"
+msgstr "ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:3
 #, fuzzy
 msgid "All _Day Event"
-msgstr "ყველა დღე შემთხვევა"
+msgstr "ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
@@ -19295,8 +20195,9 @@ 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 ""
+msgstr "პირადი"
 
 #: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
 #: ../ui/evolution-task-editor.xml.h:3
@@ -19304,17 +20205,19 @@ 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 ""
+msgstr "-სკენ ან მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 #, fuzzy
 msgid "Insert advanced send options"
-msgstr "მომხმარებელი."
+msgstr "ჩამატება"
 
 #: ../ui/evolution-event-editor.xml.h:10
+#, fuzzy
 msgid "Make this a recurring event"
-msgstr ""
+msgstr "Make a მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
@@ -19324,16 +20227,17 @@ msgstr "სა_ზოგადო"
 #: ../ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Query free / busy information for the attendees"
-msgstr "თავისუფალი დაკავებული"
+msgstr "გამოკითხვა"
 
 #: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
 msgid "R_ole Field"
-msgstr ""
+msgstr "R ველი"
 
 #: ../ui/evolution-event-editor.xml.h:16
 #, fuzzy
 msgid "Show time as _busy"
-msgstr "ანახე"
+msgstr "ჩვენება"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 #, fuzzy
@@ -19341,20 +20245,24 @@ msgid "Time _Zone"
 msgstr "დროის სარ_ტყელი"
 
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#, fuzzy
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr ""
+msgstr "ტიპი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
-msgstr ""
+msgstr "RSVP ველი"
 
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#, fuzzy
 msgid "Toggles whether the Role field is displayed"
-msgstr ""
+msgstr "როლი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#, fuzzy
 msgid "Toggles whether the Status field is displayed"
-msgstr ""
+msgstr "სტატუსი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
@@ -19362,21 +20270,24 @@ 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 ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-event-editor.xml.h:24
+#, fuzzy
 msgid "Toggles whether to have All Day Event"
-msgstr ""
+msgstr "-სკენ ყველა დღე მოვლენა"
 
 #: ../ui/evolution-event-editor.xml.h:25
+#, fuzzy
 msgid "Toggles whether to show time as busy"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "_Alarms"
-msgstr "ჩამატება"
+msgstr "სიგნალები"
 
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
@@ -19395,13 +20306,13 @@ 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 "პრივატი"
+msgstr "_პრივატი"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#, fuzzy
 msgid "_RSVP"
-msgstr ""
+msgstr "RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:33
 #, fuzzy
@@ -19411,17 +20322,17 @@ msgstr "რესურსი"
 #: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 #, fuzzy
 msgid "_Status Field"
-msgstr "სტატუსი"
+msgstr "სტატუსი ველი"
 
 #: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 #, fuzzy
 msgid "_Type Field"
-msgstr "ტიპი"
+msgstr "ტიპი ველი"
 
 #: ../ui/evolution-mail-global.xml.h:2
 #, fuzzy
 msgid "Cancel the current mail operation"
-msgstr "გაუქმება"
+msgstr "შეწყვეტა ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:3
 #, fuzzy
@@ -19431,17 +20342,17 @@ msgstr "დააკოპირე"
 #: ../ui/evolution-mail-global.xml.h:4
 #, fuzzy
 msgid "Create a new folder for storing mail"
-msgstr "შექმნა a"
+msgstr "შექმნა a ახალი ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:5
 #, fuzzy
 msgid "Create or edit Search Folder definitions"
-msgstr "შექმნა ძებნა საქაღალდე"
+msgstr "შექმნა ან რედაქტირება ძებნა საქაღალდე"
 
 #: ../ui/evolution-mail-global.xml.h:6
 #, fuzzy
 msgid "Create or edit rules for filtering new mail"
-msgstr "შექმნა"
+msgstr "შექმნა ან რედაქტირება ახალი ფოსტა"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
@@ -19458,25 +20369,30 @@ msgid "Message _Preview"
 msgstr "შეტყობინება წინასწარ ნახვა"
 
 #: ../ui/evolution-mail-global.xml.h:10
+#, fuzzy
 msgid "Move the selected folder into another folder"
-msgstr ""
+msgstr "გადატანა"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
+#, fuzzy
 msgid "Permanently remove all deleted messages from all folders"
-msgstr ""
+msgstr "ამოშლა ყველა ყველა"
 
 #: ../ui/evolution-mail-global.xml.h:13
+#, fuzzy
 msgid "Search F_olders"
-msgstr ""
+msgstr "ძებნა F"
 
 #: ../ui/evolution-mail-global.xml.h:14
+#, fuzzy
 msgid "Show message preview window"
-msgstr ""
+msgstr "ჩვენება ფანჯარა"
 
 #: ../ui/evolution-mail-global.xml.h:15
+#, fuzzy
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr ""
+msgstr "ხელის მოწერა ან -სკენ ჩართულია"
 
 #: ../ui/evolution-mail-global.xml.h:16
 #, fuzzy
@@ -19490,7 +20406,7 @@ msgstr "_წერილების ფილტრები"
 #: ../ui/evolution-mail-global.xml.h:18
 #, fuzzy
 msgid "_Move Folder To..."
-msgstr "საქაღალდე ვის."
+msgstr "გადატანა საქაღალდე ვის."
 
 #: ../ui/evolution-mail-global.xml.h:19
 msgid "_New..."
@@ -19504,112 +20420,130 @@ msgid "_Subscriptions"
 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
+#, fuzzy
 msgid "Change the properties of this folder"
-msgstr ""
+msgstr "შეცვლა პარამეტრები -"
 
 #: ../ui/evolution-mail-list.xml.h:3
 #, fuzzy
 msgid "Collapse All _Threads"
-msgstr "ყველა"
+msgstr "ჩაკეცვა ყველა ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:4
+#, fuzzy
 msgid "Collapse all message threads"
-msgstr ""
+msgstr "ჩაკეცვა ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:5
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
-msgstr "დააკოპირე -სკენ"
+msgstr "დააკოპირე წმ -სკენ"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
-msgstr "ამოჭრა -სკენ"
+msgstr "ამოჭრა წმ -სკენ"
 
 #: ../ui/evolution-mail-list.xml.h:8
+#, fuzzy
 msgid "E_xpand All Threads"
-msgstr ""
+msgstr "E ყველა ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:9
+#, fuzzy
 msgid "E_xpunge"
-msgstr ""
+msgstr "E"
 
 #: ../ui/evolution-mail-list.xml.h:10
 #, fuzzy
 msgid "Expand all message threads"
-msgstr "ყველა შეტყობინება"
+msgstr "გაფართოება ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:12
+#, fuzzy
 msgid "Hide S_elected Messages"
-msgstr ""
+msgstr "დამალვა S შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:13
+#, fuzzy
 msgid "Hide _Deleted Messages"
-msgstr ""
+msgstr "დამალვა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:14
+#, fuzzy
 msgid "Hide _Read Messages"
-msgstr ""
+msgstr "დამალვა წაკითხვა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:15
+#, fuzzy
 msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
+msgstr "დამალვა a ხაზი"
 
 #: ../ui/evolution-mail-list.xml.h:16
 #, fuzzy
 msgid "Mar_k All Messages as Read"
-msgstr "ყველა წაკითხული"
+msgstr "მარ ყველა შეტყობინებები წაკითხვა"
 
 #: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
 msgid "Paste message(s) from the clipboard"
-msgstr ""
+msgstr "ჩასმა წმ"
 
 #: ../ui/evolution-mail-list.xml.h:18
+#, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
-msgstr ""
+msgstr "ამოშლა ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:19
+#, fuzzy
 msgid "Permanently remove this folder"
-msgstr ""
+msgstr "ამოშლა"
 
 #: ../ui/evolution-mail-list.xml.h:20
+#, fuzzy
 msgid "Select Message _Thread"
-msgstr ""
+msgstr "ამორჩევა შეტყობინება"
 
 #: ../ui/evolution-mail-list.xml.h:21
 #, fuzzy
 msgid "Select _All Messages"
-msgstr "ყველა"
+msgstr "ამორჩევა ყველა შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:22
+#, fuzzy
 msgid "Select all and only the messages that are not currently selected"
-msgstr ""
+msgstr "ამორჩევა ყველა და არა"
 
 #: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
+msgstr "ამორჩევა ყველა -"
 
 #: ../ui/evolution-mail-list.xml.h:24
 #, fuzzy
 msgid "Select all visible messages"
-msgstr "ხილული"
+msgstr "ამორჩევა ყველა ხოლული"
 
 #: ../ui/evolution-mail-list.xml.h:25
+#, fuzzy
 msgid "Sh_ow Hidden Messages"
-msgstr ""
+msgstr "დამალული შეტყობინებები"
 
 #: ../ui/evolution-mail-list.xml.h:26
+#, fuzzy
 msgid "Show messages that have been temporarily hidden"
-msgstr ""
+msgstr "ჩვენება დამალული"
 
 #: ../ui/evolution-mail-list.xml.h:27
+#, fuzzy
 msgid "Temporarily hide all messages that have already been read"
-msgstr ""
+msgstr "ყველა"
 
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
@@ -19618,12 +20552,12 @@ msgstr ""
 #: ../ui/evolution-mail-list.xml.h:29
 #, fuzzy
 msgid "Threaded Message list"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება სია"
 
 #: ../ui/evolution-mail-list.xml.h:31
 #, fuzzy
 msgid "_Group By Threads"
-msgstr "ჯგუფი"
+msgstr "ჯგუფი ძაფები"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -19631,23 +20565,25 @@ msgid "_Message"
 msgstr "_წერილი"
 
 #: ../ui/evolution-mail-message.xml.h:1
+#, fuzzy
 msgid "A_dd Sender to Address Book"
-msgstr ""
+msgstr "A გამგზავნი -სკენ მისამართი"
 
 #: ../ui/evolution-mail-message.xml.h:2
+#, fuzzy
 msgid "A_pply Filters"
-msgstr ""
+msgstr "A ფილტრები"
 
 #. Alphabetical by name, yo
 #: ../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
 #, fuzzy
@@ -19655,30 +20591,34 @@ 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
 #, fuzzy
 msgid "Compose _New Message"
-msgstr "ახალი შეტყობინება"
+msgstr "შექმნა ახალი შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:9
 #, fuzzy
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "a -სკენ"
+msgstr "შექმნა a -სკენ ყველა - -"
 
 #: ../ui/evolution-mail-message.xml.h:10
+#, fuzzy
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr ""
+msgstr "შექმნა a -სკენ სია -"
 
 #: ../ui/evolution-mail-message.xml.h:11
+#, fuzzy
 msgid "Compose a reply to the sender of the selected message"
-msgstr ""
+msgstr "შექმნა a -სკენ -"
 
 #: ../ui/evolution-mail-message.xml.h:12
+#, fuzzy
 msgid "Copy selected messages to another folder"
-msgstr ""
+msgstr "დააკოპირე -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:13
 #, fuzzy
@@ -19697,7 +20637,7 @@ msgstr "შექმნა a ძებნა საქაღალდე"
 #: ../ui/evolution-mail-message.xml.h:16
 #, fuzzy
 msgid "Create a Search Folder for this mailing list"
-msgstr "შექმნა a ძებნა საქაღალდე"
+msgstr "შექმნა a ძებნა საქაღალდე სია"
 
 #: ../ui/evolution-mail-message.xml.h:17
 #, fuzzy
@@ -19705,24 +20645,29 @@ msgid "Create a Search Folder for this sender"
 msgstr "შექმნა a ძებნა საქაღალდე"
 
 #: ../ui/evolution-mail-message.xml.h:18
+#, fuzzy
 msgid "Create a Search Folder for this subject"
-msgstr ""
+msgstr "შექმნა a ძებნა საქაღალდე თემა"
 
 #: ../ui/evolution-mail-message.xml.h:19
+#, fuzzy
 msgid "Create a rule to filter messages from this sender"
-msgstr ""
+msgstr "შექმნა a -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:20
+#, fuzzy
 msgid "Create a rule to filter messages to these recipients"
-msgstr ""
+msgstr "შექმნა a -სკენ -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:21
+#, fuzzy
 msgid "Create a rule to filter messages to this mailing list"
-msgstr ""
+msgstr "შექმნა a -სკენ -სკენ სია"
 
 #: ../ui/evolution-mail-message.xml.h:22
+#, fuzzy
 msgid "Create a rule to filter messages with this subject"
-msgstr ""
+msgstr "შექმნა a -სკენ თემა"
 
 #: ../ui/evolution-mail-message.xml.h:23
 #, fuzzy
@@ -19730,17 +20675,19 @@ msgid "Cut selected messages to the clipboard"
 msgstr "ამოჭრა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:24
+#, fuzzy
 msgid "Decrease the text size"
-msgstr ""
+msgstr "ტექსტი"
 
 #: ../ui/evolution-mail-message.xml.h:26
 #, fuzzy
 msgid "Display the next important message"
-msgstr "დისპლეი"
+msgstr "დისპლეი მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:27
+#, fuzzy
 msgid "Display the next message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:28
 #, fuzzy
@@ -19748,66 +20695,79 @@ msgid "Display the next thread"
 msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:29
+#, fuzzy
 msgid "Display the next unread message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:30
+#, fuzzy
 msgid "Display the previous important message"
-msgstr ""
+msgstr "დისპლეი მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:31
+#, fuzzy
 msgid "Display the previous message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:32
+#, fuzzy
 msgid "Display the previous unread message"
-msgstr ""
+msgstr "დისპლეი"
 
 #: ../ui/evolution-mail-message.xml.h:33
+#, fuzzy
 msgid "F_orward As..."
-msgstr ""
+msgstr "F."
 
 #: ../ui/evolution-mail-message.xml.h:34
+#, fuzzy
 msgid "Filter on Mailing _List..."
-msgstr ""
+msgstr "ფილტრი ჩართულია სია."
 
 #: ../ui/evolution-mail-message.xml.h:35
+#, fuzzy
 msgid "Filter on Se_nder..."
-msgstr ""
+msgstr "ფილტრი ჩართულია."
 
 #: ../ui/evolution-mail-message.xml.h:36
+#, fuzzy
 msgid "Filter on _Recipients..."
-msgstr ""
+msgstr "ფილტრი ჩართულია."
 
 #: ../ui/evolution-mail-message.xml.h:37
+#, fuzzy
 msgid "Filter on _Subject..."
-msgstr ""
+msgstr "ფილტრი ჩართულია თემა."
 
 #: ../ui/evolution-mail-message.xml.h:38
+#, fuzzy
 msgid "Filter the selected messages for junk status"
-msgstr ""
+msgstr "ფილტრი"
 
 #: ../ui/evolution-mail-message.xml.h:39
 #, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "ამოჭრა -სკენ"
+msgstr "ზემოთ"
 
 #: ../ui/evolution-mail-message.xml.h:40
+#, fuzzy
 msgid "Follow _Up..."
-msgstr ""
+msgstr "მიყოლა ზემოთ."
 
 #: ../ui/evolution-mail-message.xml.h:41
 #, fuzzy
 msgid "Force images in HTML mail to be loaded"
-msgstr "ძალდატანება -სკენ"
+msgstr "ძალდატანება - HTML ფოსტა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:43
+#, fuzzy
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
+msgstr "წინ - - a ახალი"
 
 #: ../ui/evolution-mail-message.xml.h:44
+#, fuzzy
 msgid "Forward the selected message quoted like a reply"
-msgstr ""
+msgstr "წინ a"
 
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
@@ -19818,12 +20778,14 @@ msgid "Forward the selected message to someone as an attachment"
 msgstr "ამორჩეული წერილის გადაგზავნა ვინმესთან დანართის სახით"
 
 #: ../ui/evolution-mail-message.xml.h:47
+#, fuzzy
 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
 #, fuzzy
@@ -19833,7 +20795,7 @@ msgstr "გახსენი a"
 #: ../ui/evolution-mail-message.xml.h:51
 #, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "გახსენი a"
+msgstr "მნიშვნელოვანი"
 
 #: ../ui/evolution-mail-message.xml.h:52
 #, fuzzy
@@ -19843,12 +20805,12 @@ msgstr "გახსენი a"
 #: ../ui/evolution-mail-message.xml.h:53
 #, fuzzy
 msgid "Mark the selected messages as not being junk"
-msgstr "გახსენი a"
+msgstr "არა"
 
 #: ../ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark the selected messages as not having been read"
-msgstr "გახსენი a"
+msgstr "არა"
 
 #: ../ui/evolution-mail-message.xml.h:55
 #, fuzzy
@@ -19860,8 +20822,9 @@ msgid "Mark the selected messages for deletion"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:57
+#, fuzzy
 msgid "Move selected messages to another folder"
-msgstr ""
+msgstr "გადატანა -სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19875,30 +20838,31 @@ msgstr "შემდეგი"
 #: ../ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "Next _Unread Message"
-msgstr "შემდეგი შეტყობინება"
+msgstr "შემდეგი წაუკითხავად შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:63
+#, fuzzy
 msgid "Open a window for composing a mail message"
-msgstr ""
+msgstr "გახსნა a ფანჯარა a ფოსტა"
 
 #: ../ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Open the selected messages in a new window"
-msgstr "გახსენი a"
+msgstr "გახსნა - a ახალი ფანჯარა"
 
 #: ../ui/evolution-mail-message.xml.h:65
 #, fuzzy
 msgid "Open the selected messages in the composer for editing"
-msgstr "გახსენი"
+msgstr "გახსნა -"
 
 #: ../ui/evolution-mail-message.xml.h:66
 #, fuzzy
 msgid "P_revious Unread Message"
-msgstr "შეტყობინება"
+msgstr "წაუკითხავად შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:67
 #, fuzzy
@@ -19911,16 +20875,19 @@ msgid "Pos_t New Message to Folder"
 msgstr "ახალი შეტყობინება -სკენ საქაღალდე"
 
 #: ../ui/evolution-mail-message.xml.h:69
+#, fuzzy
 msgid "Post a Repl_y"
-msgstr ""
+msgstr "a y"
 
 #: ../ui/evolution-mail-message.xml.h:70
+#, fuzzy
 msgid "Post a message to a Public folder"
-msgstr ""
+msgstr "a -სკენ a საზოგადო"
 
 #: ../ui/evolution-mail-message.xml.h:71
+#, fuzzy
 msgid "Post a reply to a message in a Public folder"
-msgstr ""
+msgstr "a -სკენ a - a საზოგადო"
 
 #: ../ui/evolution-mail-message.xml.h:72
 #, fuzzy
@@ -19941,18 +20908,19 @@ msgid "Re_direct"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:79
+#, fuzzy
 msgid "Redirect (bounce) the selected message to someone"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../ui/evolution-mail-message.xml.h:84
 #, fuzzy
 msgid "Reset the text to its original size"
-msgstr "განულება -სკენ ორიგინალი სიდიდე"
+msgstr "ხელახალი კონფიგურაცია ტექსტი -სკენ ორიგინალი"
 
 #: ../ui/evolution-mail-message.xml.h:85
 #, fuzzy
 msgid "Save the selected messages as a text file"
-msgstr "შენახვა a"
+msgstr "შენახვა a ტექსტი ფაილი"
 
 #: ../ui/evolution-mail-message.xml.h:86
 #, fuzzy
@@ -19977,37 +20945,42 @@ msgstr "ძებნა საქაღალდე."
 #: ../ui/evolution-mail-message.xml.h:90
 #, fuzzy
 msgid "Search for text in the body of the displayed message"
-msgstr "ძებნა"
+msgstr "ძებნა ტექსტი - -"
 
 #: ../ui/evolution-mail-message.xml.h:91
 #, fuzzy
 msgid "Select _All Text"
-msgstr "ყველა ტექსტი"
+msgstr "ამორჩევა ყველა ტექსტი"
 
 #: ../ui/evolution-mail-message.xml.h:92
+#, fuzzy
 msgid "Select all the text in a message"
-msgstr ""
+msgstr "ამორჩევა ყველა ტექსტი - a"
 
 #: ../ui/evolution-mail-message.xml.h:93
+#, fuzzy
 msgid "Set up the page settings for your current printer"
-msgstr ""
+msgstr "ზემოთ პანელი"
 
 #: ../ui/evolution-mail-message.xml.h:94
+#, fuzzy
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr ""
+msgstr "ჩვენება a - -"
 
 #: ../ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "Show messages in the normal style"
-msgstr "ანახე"
+msgstr "ჩვენება - საშუალო"
 
 #: ../ui/evolution-mail-message.xml.h:96
+#, fuzzy
 msgid "Show messages with all email headers"
-msgstr ""
+msgstr "ჩვენება ყველა ელფოსტა"
 
 #: ../ui/evolution-mail-message.xml.h:97
+#, fuzzy
 msgid "Show the raw email source of the message"
-msgstr ""
+msgstr "ჩვენება ელფოსტა -"
 
 #: ../ui/evolution-mail-message.xml.h:98
 #, fuzzy
@@ -20027,8 +21000,9 @@ msgid "_Attached"
 msgstr ""
 
 #: ../ui/evolution-mail-message.xml.h:102
+#, fuzzy
 msgid "_Caret Mode"
-msgstr ""
+msgstr "რეჟიმი"
 
 #: ../ui/evolution-mail-message.xml.h:103
 #, fuzzy
@@ -20043,17 +21017,17 @@ msgstr "წაშლა შეტყობინება"
 #: ../ui/evolution-mail-message.xml.h:108
 #, fuzzy
 msgid "_Find in Message..."
-msgstr "ძებნა შეტყობინება."
+msgstr "ძიება - შეტყობინება."
 
 #: ../ui/evolution-mail-message.xml.h:109
 #, fuzzy
 msgid "_Flag Completed"
-msgstr "შესრულებულია"
+msgstr "დასრულებულია"
 
 #: ../ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Go To"
-msgstr "ვის"
+msgstr "გადასვლა ვის"
 
 #: ../ui/evolution-mail-message.xml.h:112
 msgid "_Important"
@@ -20076,7 +21050,7 @@ msgstr "ჩატვირთვა სურათები"
 #: ../ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Message Source"
-msgstr "შეტყობინება"
+msgstr "შეტყობინება წყარო"
 
 #: ../ui/evolution-mail-message.xml.h:119
 #, fuzzy
@@ -20094,7 +21068,7 @@ msgstr ""
 #: ../ui/evolution-mail-message.xml.h:122
 #, fuzzy
 msgid "_Open in New Window"
-msgstr "გახსენი ახალი ფანჯარა"
+msgstr "გახსნა - ახალი ფანჯარა"
 
 #: ../ui/evolution-mail-message.xml.h:123
 #, fuzzy
@@ -20117,8 +21091,9 @@ msgid "_Undelete Message"
 msgstr "შეტყობინება"
 
 #: ../ui/evolution-mail-message.xml.h:130
+#, fuzzy
 msgid "_Unread"
-msgstr ""
+msgstr "წაუკითხავად"
 
 #: ../ui/evolution-mail-message.xml.h:131
 msgid "_Zoom In"
@@ -20156,26 +21131,27 @@ msgstr "ჩასმა"
 #: ../ui/evolution-memos.xml.h:10
 #, fuzzy
 msgid "Previews the list of memos to be printed"
-msgstr "-სკენ"
+msgstr "სია - -სკენ"
 
 #: ../ui/evolution-memos.xml.h:13
 #, fuzzy
 msgid "Print the list of memos"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა სია -"
 
 #: ../ui/evolution-memos.xml.h:14
 #, fuzzy
 msgid "View the selected memo"
-msgstr "ხედი"
+msgstr "ჩვენება"
 
 #: ../ui/evolution-memos.xml.h:18
 #, fuzzy
 msgid "_Open Memo"
-msgstr "გახსენი"
+msgstr "გახსნა"
 
 #: ../ui/evolution-message-composer.xml.h:2
+#, fuzzy
 msgid "Attach a file"
-msgstr ""
+msgstr "a ფაილი"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -20189,28 +21165,30 @@ msgid "Close the current file"
 msgstr "დახურე შემდეგი ფაილი"
 
 #: ../ui/evolution-message-composer.xml.h:5
+#, fuzzy
 msgid "Delete all but signature"
-msgstr ""
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-message-composer.xml.h:6
 #, fuzzy
 msgid "Encrypt this message with PGP"
-msgstr "დაშიფვრა"
+msgstr "დაშიფვრა PGP"
 
 #: ../ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "დაშიფვრა S დაშიფვრა"
+msgstr "დაშიფვრა S დაშიფვრა სერთიფიკატი"
 
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
+#, fuzzy
 msgid "For_mat"
-msgstr ""
+msgstr "-თვის"
 
 #: ../ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Get delivery notification when your message is read"
-msgstr "შემოწმება -სკენ"
+msgstr "მიღება"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
@@ -20234,16 +21212,19 @@ msgid "PGP Sign"
 msgstr "PGP ხელმოწერა"
 
 #: ../ui/evolution-message-composer.xml.h:16
+#, fuzzy
 msgid "R_equest Read Receipt"
-msgstr ""
+msgstr "R წაკითხვა მიღება"
 
 #: ../ui/evolution-message-composer.xml.h:17
+#, fuzzy
 msgid "S/MIME Encrypt"
-msgstr ""
+msgstr "S დაშიფვრა"
 
 #: ../ui/evolution-message-composer.xml.h:18
+#, fuzzy
 msgid "S/MIME Sign"
-msgstr ""
+msgstr "S ხელმოწერა"
 
 #: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
@@ -20252,7 +21233,7 @@ msgstr "შეინახე როგორც"
 #: ../ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save Draft"
-msgstr "შენახვა"
+msgstr "მონახაზის შენახვა"
 
 #: ../ui/evolution-message-composer.xml.h:22
 msgid "Save _As..."
@@ -20283,8 +21264,9 @@ msgid "Save the current file with a different name"
 msgstr "დაიმახსოვრე ფაილი განსხვავებული სახელით"
 
 #: ../ui/evolution-message-composer.xml.h:28
+#, fuzzy
 msgid "Save the message in a specified folder"
-msgstr ""
+msgstr "შენახვა - a"
 
 #: ../ui/evolution-message-composer.xml.h:29
 msgid "Send"
@@ -20292,8 +21274,9 @@ msgstr "გაგზავნა"
 
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
+#, fuzzy
 msgid "Send the mail in HTML format"
-msgstr ""
+msgstr "გაგზავნა ფოსტა - HTML"
 
 #: ../ui/evolution-message-composer.xml.h:31
 #, fuzzy
@@ -20303,57 +21286,67 @@ msgstr "გაგზავნა"
 #: ../ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Set the message priority to high"
-msgstr "-სკენ"
+msgstr "-სკენ მაღალი"
 
 #: ../ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Sign this message with your PGP key"
-msgstr "ხელმოწერა გასაღები"
+msgstr "ხელმოწერა PGP გასაღები"
 
 #: ../ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ხელმოწერა S ხელმოწერა"
+msgstr "ხელმოწერა S ხელმოწერა სერთიფიკატი"
 
 #: ../ui/evolution-message-composer.xml.h:35
+#, fuzzy
 msgid "Toggles whether the BCC field is displayed"
-msgstr ""
+msgstr "ბრმა ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:36
+#, fuzzy
 msgid "Toggles whether the CC field is displayed"
-msgstr ""
+msgstr "ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:37
+#, fuzzy
 msgid "Toggles whether the From chooser is displayed"
-msgstr ""
+msgstr "-დან"
 
 #: ../ui/evolution-message-composer.xml.h:38
+#, fuzzy
 msgid "Toggles whether the Post-To field is displayed"
-msgstr ""
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:39
+#, fuzzy
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
+msgstr "პასუხი ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:40
+#, fuzzy
 msgid "Toggles whether the To field is displayed"
-msgstr ""
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:42
+#, fuzzy
 msgid "_Bcc Field"
-msgstr ""
+msgstr "უხილავი ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:43
+#, fuzzy
 msgid "_Cc Field"
-msgstr ""
+msgstr "ასლი ველი"
 
 #: ../ui/evolution-message-composer.xml.h:45
+#, fuzzy
 msgid "_Delete all"
-msgstr ""
+msgstr "წაშლა ყველა"
 
 #: ../ui/evolution-message-composer.xml.h:48
+#, fuzzy
 msgid "_From Field"
-msgstr ""
+msgstr "-დან ველი"
 
 #: ../ui/evolution-message-composer.xml.h:49
 msgid "_Open..."
@@ -20362,7 +21355,7 @@ msgstr "_გახსნა..."
 #: ../ui/evolution-message-composer.xml.h:50
 #, fuzzy
 msgid "_Post-To Field"
-msgstr "ვის"
+msgstr "ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:51
 #, fuzzy
@@ -20370,8 +21363,9 @@ msgid "_Prioritize Message"
 msgstr "შეტყობინება"
 
 #: ../ui/evolution-message-composer.xml.h:52
+#, fuzzy
 msgid "_Reply-To Field"
-msgstr ""
+msgstr "პასუხი ვის ველი"
 
 #: ../ui/evolution-message-composer.xml.h:54
 msgid "_Security"
@@ -20380,15 +21374,16 @@ msgstr "_უსაფრთხოება"
 #: ../ui/evolution-message-composer.xml.h:55
 #, fuzzy
 msgid "_To Field"
-msgstr "ვის"
+msgstr "ვის ველი"
 
 #: ../ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_დახურვა"
 
 #: ../ui/evolution-signature-editor.xml.h:15
+#, fuzzy
 msgid "H_TML"
-msgstr ""
+msgstr "H"
 
 #: ../ui/evolution-signature-editor.xml.h:17
 #, fuzzy
@@ -20406,12 +21401,12 @@ msgstr "შენახვა და დახურვა"
 #: ../ui/evolution-signature-editor.xml.h:22
 #, fuzzy
 msgid "Save the current file and close the window"
-msgstr "შენახვა და"
+msgstr "შენახვა ფაილი და დახურვა ფანჯარა"
 
 #: ../ui/evolution-subscribe.xml.h:1
 #, fuzzy
 msgid "Add folder to your list of subscribed folders"
-msgstr "დამატება -სკენ"
+msgstr "დამატება -სკენ სია -"
 
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
@@ -20420,20 +21415,22 @@ msgstr "განაახლე სია"
 #: ../ui/evolution-subscribe.xml.h:4
 #, fuzzy
 msgid "Refresh List of Folders"
-msgstr "განაახლე სია საქაღალდეები"
+msgstr "განახლება სია - საქაღალდეები"
 
 #: ../ui/evolution-subscribe.xml.h:5
 #, fuzzy
 msgid "Remove folder from your list of subscribed folders"
-msgstr "წაშლა"
+msgstr "ამოშლა სია -"
 
 #: ../ui/evolution-subscribe.xml.h:7
+#, fuzzy
 msgid "Subscribe"
-msgstr ""
+msgstr "ხელის მოწერა"
 
 #: ../ui/evolution-subscribe.xml.h:8
+#, fuzzy
 msgid "Unsubscribe"
-msgstr ""
+msgstr "ხელმოუწერელი"
 
 #: ../ui/evolution-subscribe.xml.h:12
 #, fuzzy
@@ -20441,13 +21438,14 @@ msgid "_Invert Selection"
 msgstr "არჩეული"
 
 #: ../ui/evolution-task-editor.xml.h:4
+#, fuzzy
 msgid "Click change / view the status details of the task"
-msgstr ""
+msgstr "- დრო"
 
 #: ../ui/evolution-task-editor.xml.h:9
 #, fuzzy
 msgid "Status Details"
-msgstr "სტატუსი დეტალები"
+msgstr "სტატუსი ცნობები"
 
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
@@ -20460,68 +21458,72 @@ msgstr "_გაგზავნის ოფციები"
 #: ../ui/evolution-task-editor.xml.h:24
 #, fuzzy
 msgid "_Status Details"
-msgstr "სტატუსი დეტალები"
+msgstr "სტატუსი ცნობები"
 
 #: ../ui/evolution-tasks.xml.h:3
 #, fuzzy
 msgid "Copy selected tasks"
-msgstr "დააკოპირე"
+msgstr "დააკოპირე ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:5
 #, fuzzy
 msgid "Cut selected tasks"
-msgstr "ამოჭრა"
+msgstr "ამოჭრა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:7
 #, fuzzy
 msgid "Delete completed tasks"
-msgstr "წაშლა"
+msgstr "წაშლა დასრულებულია ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:8
+#, fuzzy
 msgid "Delete selected tasks"
-msgstr ""
+msgstr "წაშლა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:9
+#, fuzzy
 msgid "Mar_k as Complete"
-msgstr ""
+msgstr "მარ შესრულებულია"
 
 #: ../ui/evolution-tasks.xml.h:10
+#, fuzzy
 msgid "Mark selected tasks as complete"
-msgstr ""
+msgstr "ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:12
 #, fuzzy
 msgid "Paste tasks from the clipboard"
-msgstr "ჩასმა"
+msgstr "ჩასმა ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:13
+#, fuzzy
 msgid "Previews the list of tasks to be printed"
-msgstr ""
+msgstr "სია - ამოცანები -სკენ"
 
 #: ../ui/evolution-tasks.xml.h:16
 #, fuzzy
 msgid "Print the list of tasks"
-msgstr "ბეჭდვა"
+msgstr "ბეჭდვა სია - ამოცანები"
 
 #: ../ui/evolution-tasks.xml.h:18
 #, fuzzy
 msgid "Show task preview window"
-msgstr "ანახე"
+msgstr "ჩვენება დრო ფანჯარა"
 
 #: ../ui/evolution-tasks.xml.h:19
 #, fuzzy
 msgid "Task _Preview"
-msgstr "წინასწარ ნახვა"
+msgstr "ამოცანა წინასწარ ნახვა"
 
 #: ../ui/evolution-tasks.xml.h:20
 #, fuzzy
 msgid "View the selected task"
-msgstr "ხედი"
+msgstr "ჩვენება დრო"
 
 #: ../ui/evolution-tasks.xml.h:27
 #, fuzzy
 msgid "_Open Task"
-msgstr "გახსენი"
+msgstr "გახსნა ამოცანა"
 
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
@@ -20534,37 +21536,37 @@ 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 "შექმნა a"
+msgstr "შექმნა a ახალი ფანჯარა"
 
 #: ../ui/evolution.xml.h:6
 #, fuzzy
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა"
 
 #: ../ui/evolution.xml.h:7
 #, fuzzy
 msgid "Display window buttons with icons and text"
-msgstr "დისპლეი და"
+msgstr "დისპლეი ფანჯარა და ტექსტი"
 
 #: ../ui/evolution.xml.h:8
 #, fuzzy
 msgid "Display window buttons with icons only"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა"
 
 #: ../ui/evolution.xml.h:9
 #, fuzzy
 msgid "Display window buttons with text only"
-msgstr "დისპლეი"
+msgstr "დისპლეი ფანჯარა ტექსტი"
 
 #: ../ui/evolution.xml.h:10
 #, fuzzy
 msgid "Exit the program"
-msgstr "გასვლა პროგრამიდან"
+msgstr "გამოსვლა პროგრამა"
 
 #: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
@@ -20603,12 +21605,14 @@ msgid "Send / _Receive"
 msgstr "გაგზავნა / _მიღება"
 
 #: ../ui/evolution.xml.h:21
+#, fuzzy
 msgid "Send queued items and retrieve new items"
-msgstr ""
+msgstr "გაგზავნა და ახალი"
 
 #: ../ui/evolution.xml.h:22
+#, fuzzy
 msgid "Set up Pilot configuration"
-msgstr ""
+msgstr "ზემოთ"
 
 #: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
@@ -20624,24 +21628,28 @@ msgid "Status _Bar"
 msgstr "სტატუსი"
 
 #: ../ui/evolution.xml.h:26
+#, fuzzy
 msgid "Submit Bug Report"
-msgstr ""
+msgstr "შეცდომის პატაკის გაგზავნა"
 
 #. <menuitem name="HelpFAQ" verb=""
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
 #: ../ui/evolution.xml.h:31
+#, fuzzy
 msgid "Submit _Bug Report"
-msgstr ""
+msgstr "გაგზავნა შეცდომა"
 
 #: ../ui/evolution.xml.h:32
+#, fuzzy
 msgid "Submit a bug report using Bug Buddy"
-msgstr ""
+msgstr "გაგზავნა a შეცდომა"
 
 #: ../ui/evolution.xml.h:33
+#, fuzzy
 msgid "Toggle whether we are working offline."
-msgstr ""
+msgstr "ხაზიდან გასვლა."
 
 #: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
@@ -20652,12 +21660,14 @@ msgid "Tool_bar style"
 msgstr ""
 
 #: ../ui/evolution.xml.h:36
+#, fuzzy
 msgid "View/Hide the Side Bar"
-msgstr ""
+msgstr "ჩვენება დამალვა"
 
 #: ../ui/evolution.xml.h:37
+#, fuzzy
 msgid "View/Hide the Status Bar"
-msgstr ""
+msgstr "ჩვენება დამალვა სტატუსი"
 
 #: ../ui/evolution.xml.h:38
 msgid "_About"
@@ -20680,8 +21690,9 @@ msgid "_Icons only"
 msgstr "მხოლოდ _ხატულები"
 
 #: ../ui/evolution.xml.h:47
+#, fuzzy
 msgid "_Quick Reference"
-msgstr ""
+msgstr "მითითება"
 
 #: ../ui/evolution.xml.h:48
 msgid "_Quit"
@@ -20690,7 +21701,7 @@ msgstr "_გასვლა"
 #: ../ui/evolution.xml.h:49
 #, fuzzy
 msgid "_Switcher Appearance"
-msgstr "შესახედაობა"
+msgstr "იერსახე"
 
 #: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
@@ -20712,7 +21723,7 @@ msgstr "კომპანია"
 #: ../views/addressbook/galview.xml.h:2
 #, fuzzy
 msgid "_Address Cards"
-msgstr "მისამართი"
+msgstr "მისამართი ბარათი"
 
 #: ../views/addressbook/galview.xml.h:3
 #, fuzzy
@@ -20720,45 +21731,48 @@ msgid "_Phone List"
 msgstr "ტელეფონი სია"
 
 #: ../views/calendar/galview.xml.h:1
+#, fuzzy
 msgid "W_eek View"
-msgstr ""
+msgstr "ჩვენება"
 
 #: ../views/calendar/galview.xml.h:2
 #, fuzzy
 msgid "_Day View"
-msgstr "დღე ხედი"
+msgstr "დღე ჩვენება"
 
 #: ../views/calendar/galview.xml.h:3
 #, fuzzy
 msgid "_List View"
-msgstr "სია ხედი"
+msgstr "სია ჩვენება"
 
 #: ../views/calendar/galview.xml.h:4
 #, fuzzy
 msgid "_Month View"
-msgstr "თვე ხედი"
+msgstr "თვე ჩვენება"
 
 #: ../views/calendar/galview.xml.h:5
 #, fuzzy
 msgid "_Work Week View"
-msgstr "სამსახური ხედი"
+msgstr "სამსახური კვირა ჩვენება"
 
 #: ../views/mail/galview.xml.h:1
 #, fuzzy
 msgid "As _Sent Folder"
-msgstr "საქაღალდე"
+msgstr "გაგზავნა საქაღალდე"
 
 #: ../views/mail/galview.xml.h:2
+#, fuzzy
 msgid "By S_tatus"
-msgstr ""
+msgstr "S"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By Se_nder"
 msgstr ""
 
 #: ../views/mail/galview.xml.h:4
+#, fuzzy
 msgid "By Su_bject"
-msgstr ""
+msgstr "კვ"
 
 #: ../views/mail/galview.xml.h:5
 #, fuzzy
@@ -20766,8 +21780,9 @@ msgid "By _Follow Up Flag"
 msgstr "მიყოლა ზემოთ"
 
 #: ../views/mail/galview.xml.h:6
+#, fuzzy
 msgid "_Messages"
-msgstr ""
+msgstr "შეტყობინებები"
 
 #: ../views/memos/galview.xml.h:1
 #, fuzzy
@@ -20777,7 +21792,7 @@ msgstr "_წევრები"
 #: ../views/tasks/galview.xml.h:1
 #, fuzzy
 msgid "With _Due Date"
-msgstr "თარიღი"
+msgstr "ვადა თარიღი"
 
 #: ../views/tasks/galview.xml.h:2
 #, fuzzy
@@ -20799,8 +21814,9 @@ msgid "<b>_Selection</b>"
 msgstr "<b> არჩეული</b>"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#, fuzzy
 msgid "Select a Time Zone"
-msgstr ""
+msgstr "ამორჩევა a დრო"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
 #, fuzzy
@@ -20808,11 +21824,12 @@ msgid "TimeZone Combobox"
 msgstr "მხტუნავი მენიუ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
+#, fuzzy
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
 "Use the right mouse button to zoom out."
-msgstr ""
+msgstr "გამოყენება მარცხენა -სკენ - ჩართულია - და a მარჯვენა -სკენ."
 
 #: ../widgets/menus/gal-define-views-dialog.c:76
 #: ../widgets/menus/gal-define-views-model.c:188
@@ -20822,18 +21839,21 @@ msgstr ""
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
+#, fuzzy
 msgid "Define Views for %s"
-msgstr ""
+msgstr "ხედები წმ"
 
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
+#, fuzzy
 msgid "Define Views"
-msgstr ""
+msgstr "ხედები"
 
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
+#, fuzzy
 msgid "Define Views for \"%s\""
-msgstr ""
+msgstr "ხედები წმ"
 
 #: ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit..."
@@ -20843,12 +21863,14 @@ msgstr "_რედაქტირება..."
 #: ../widgets/table/e-table-header-item.c:1839
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
+#, fuzzy
 msgid "Table"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#, fuzzy
 msgid "Instance"
-msgstr ""
+msgstr "Instance"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
@@ -20859,18 +21881,21 @@ msgid "_Create new view"
 msgstr "ახალი ხედის _შექმნა"
 
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:5
+#, 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
+#, fuzzy
 msgid "Custom View"
-msgstr ""
+msgstr "სხვა ჩვენება"
 
 #: ../widgets/menus/gal-view-instance.c:588
+#, fuzzy
 msgid "Save Custom View"
-msgstr ""
+msgstr "შენახვა სხვა ჩვენება"
 
 #: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
@@ -20885,23 +21910,25 @@ msgstr "ა_ხლანდელი ხედი"
 #: ../widgets/menus/gal-view-menus.c:359
 #, fuzzy
 msgid "Save Custom View..."
-msgstr "შენახვა სხვა ხედი."
+msgstr "შენახვა სხვა ჩვენება."
 
 #: ../widgets/menus/gal-view-new-dialog.c:80
 msgid "Factory"
 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
 msgid "Name of new view:"
 msgstr "ახალი ხედის სახელი:"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#, fuzzy
 msgid "Type of View"
-msgstr ""
+msgstr "ტიპი - ჩვენება"
 
 #: ../widgets/menus/gal-view-new-dialog.glade.h:4
 msgid "Type of view:"
@@ -20915,8 +21942,9 @@ msgstr ""
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
+#, fuzzy
 msgid "%B %Y"
-msgstr ""
+msgstr "B Y"
 
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
@@ -20926,8 +21954,9 @@ msgstr "თვის კალენდარი"
 #: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
 #: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
 #: ../widgets/text/e-text.c:3564
+#, fuzzy
 msgid "Fill color"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/misc/e-canvas-background.c:464
 #: ../widgets/misc/e-canvas-background.c:465
@@ -20944,8 +21973,9 @@ msgstr ""
 #: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
 #: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
 #: ../widgets/text/e-text.c:3586
+#, fuzzy
 msgid "Fill stipple"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/misc/e-canvas-background.c:485
 #: ../widgets/misc/e-canvas-background.c:486
@@ -20971,8 +22001,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3015
+#, fuzzy
 msgid "Minimum width"
-msgstr ""
+msgstr "სიგანე"
 
 #: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:975
@@ -20984,22 +22015,24 @@ msgstr "მინიმალური სიგანე"
 
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
-#, fuzzy
 msgid "Spacing"
 msgstr "ინტერვალი"
 
 #: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
+#, fuzzy
 msgid "Now"
-msgstr ""
+msgstr "ახლა"
 
 #: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
+#, fuzzy
 msgid "The time must be in the format: %s"
-msgstr ""
+msgstr "- წმ"
 
 #: ../widgets/misc/e-cell-percent.c:76
+#, fuzzy
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr ""
+msgstr "და"
 
 #: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
@@ -21008,7 +22041,7 @@ msgstr "ბალტიური"
 #: ../widgets/misc/e-charset-picker.c:65
 #, fuzzy
 msgid "Central European"
-msgstr "ცენტრალურ ევროპული"
+msgstr "ცენტრალური ევროპა"
 
 #: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
@@ -21035,7 +22068,6 @@ msgid "Korean"
 msgstr "კორეული"
 
 #: ../widgets/misc/e-charset-picker.c:72
-#, fuzzy
 msgid "Thai"
 msgstr "ტაილანდური"
 
@@ -21052,8 +22084,9 @@ msgid "Western European"
 msgstr "დასავლეთ ევროპა"
 
 #: ../widgets/misc/e-charset-picker.c:76
+#, fuzzy
 msgid "Western European, New"
-msgstr ""
+msgstr "დასავლური ახალი"
 
 #: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
@@ -21070,22 +22103,24 @@ msgid "Ukrainian"
 msgstr "უკრაინული"
 
 #: ../widgets/misc/e-charset-picker.c:105
+#, fuzzy
 msgid "Visual"
-msgstr ""
+msgstr "იერსახე"
 
 #: ../widgets/misc/e-charset-picker.c:174
 #, fuzzy, c-format
 msgid "Unknown character set: %s"
-msgstr "უცნობი"
+msgstr "უცნობი წმ"
 
 #: ../widgets/misc/e-charset-picker.c:219
 #, fuzzy
 msgid "Character Encoding"
-msgstr "კოდირება"
+msgstr "სიმბოლო კოდირება"
 
 #: ../widgets/misc/e-charset-picker.c:234
+#, fuzzy
 msgid "Enter the character set to use"
-msgstr ""
+msgstr "შეყვანა -სკენ"
 
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
@@ -21105,16 +22140,19 @@ msgid "Date and Time"
 msgstr "დრო და თარიღი"
 
 #: ../widgets/misc/e-dateedit.c:340
+#, fuzzy
 msgid "Text entry to input date"
-msgstr ""
+msgstr "ტექსტი ელემენტი -სკენ თარიღი"
 
 #: ../widgets/misc/e-dateedit.c:362
+#, fuzzy
 msgid "Click this button to show a calendar"
-msgstr ""
+msgstr "-სკენ a კალენდარი"
 
 #: ../widgets/misc/e-dateedit.c:384
+#, fuzzy
 msgid "Combo box to select time"
-msgstr ""
+msgstr "-სკენ"
 
 #: ../widgets/misc/e-dateedit.c:385
 msgid "Time"
@@ -21131,73 +22169,82 @@ msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #: ../widgets/misc/e-expander.c:181
+#, fuzzy
 msgid "Expanded"
-msgstr ""
+msgstr "გაფართოებული"
 
 #: ../widgets/misc/e-expander.c:182
+#, fuzzy
 msgid "Whether or not the expander is expanded"
-msgstr ""
+msgstr "ან არა"
 
 #: ../widgets/misc/e-expander.c:190
+#, fuzzy
 msgid "Text of the expander's label"
-msgstr ""
+msgstr "გამფართოებლის ჭდის ტექსტი"
 
 #: ../widgets/misc/e-expander.c:197
 #, fuzzy
 msgid "Use underline"
-msgstr "გამოყენება"
+msgstr "ხაზგასმის გამოყენება"
 
 #: ../widgets/misc/e-expander.c:198
+#, fuzzy
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
-msgstr ""
+msgstr "თუ მითითებულია, ტექსტის ხაზგასმა ნიშნავს, რომ შემდეგი სიმბოლო გამოიყენება როგორც სხარტულა."
 
 #: ../widgets/misc/e-expander.c:206
+#, fuzzy
 msgid "Space to put between the label and the child"
-msgstr ""
+msgstr "დამატებითი არე წარწერასა და ქვეელემენტს შორის"
 
 #: ../widgets/misc/e-expander.c:215
 #, fuzzy
 msgid "Label widget"
-msgstr "სათაური"
+msgstr "წარწერის მართვის ელემენტი"
 
 #: ../widgets/misc/e-expander.c:216
+#, 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:3312
+#, fuzzy
 msgid "Expander Size"
-msgstr ""
+msgstr "გამფართოებლის ზომა"
 
 #: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
+#, fuzzy
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "გამფართოებლის ისრის ზომა"
 
 #: ../widgets/misc/e-expander.c:231
 #, fuzzy
 msgid "Indicator Spacing"
-msgstr "ინტერვალი"
+msgstr "მაჩვენებლის ველები"
 
 #: ../widgets/misc/e-expander.c:232
 #, fuzzy
 msgid "Spacing around expander arrow"
-msgstr "ინტერვალი"
+msgstr "გამფართოებლის ისრის ველები"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:163
 #, fuzzy
 msgid "Advanced Search"
-msgstr "დამატებითი ძებნა"
+msgstr "დეტალური ძებნა"
 
 #: ../widgets/misc/e-filter-bar.c:202
+#, fuzzy
 msgid "_Searches"
-msgstr ""
+msgstr "ძიება"
 
 #: ../widgets/misc/e-filter-bar.c:204
 #, fuzzy
 msgid "Searches"
-msgstr "ძებნები"
+msgstr "ძიება"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:227
@@ -21213,17 +22260,17 @@ msgstr "შენახვა ძებნა."
 #: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 #, fuzzy
 msgid "_Edit Saved Searches..."
-msgstr "რედაქტირება."
+msgstr "რედაქტირება შენახულია ძიება."
 
 #: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 #, fuzzy
 msgid "_Advanced Search..."
-msgstr "დამატებითი ძებნა."
+msgstr "დეტალური ძებნა."
 
 #: ../widgets/misc/e-image-chooser.c:172
 #, fuzzy
 msgid "Choose Image"
-msgstr "არჩევა სურათი"
+msgstr "გამოსახულება"
 
 #: ../widgets/misc/e-map.c:627
 msgid "World Map"
@@ -21243,7 +22290,7 @@ msgstr ""
 #: ../widgets/misc/e-pilot-settings.c:111
 #, fuzzy
 msgid "Sync Private Records:"
-msgstr "პრივატი:"
+msgstr "პირადი:"
 
 #: ../widgets/misc/e-pilot-settings.c:120
 #, fuzzy
@@ -21251,16 +22298,18 @@ msgid "Sync Categories:"
 msgstr "კატეგორიები:"
 
 #: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#, fuzzy
 msgid "Empty message"
-msgstr ""
+msgstr "ცარიელი"
 
 #: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr ""
 
 #: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#, fuzzy
 msgid "Column width"
-msgstr ""
+msgstr "სვეტი სიგანე"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
@@ -21275,7 +22324,7 @@ msgstr "_ძებნა"
 #: ../widgets/misc/e-search-bar.c:594
 #, fuzzy
 msgid "_Find Now"
-msgstr "ძებნა"
+msgstr "ძიება ახლა"
 
 #: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
@@ -21314,7 +22363,7 @@ msgstr "კურსორი"
 #: ../widgets/table/e-tree-selection-model.c:818
 #, fuzzy
 msgid "Cursor Column"
-msgstr "კურსორი"
+msgstr "კურსორი სვეტი"
 
 #: ../widgets/misc/e-selection-model.c:214
 msgid "Sorter"
@@ -21323,7 +22372,7 @@ msgstr ""
 #: ../widgets/misc/e-selection-model.c:221
 #, fuzzy
 msgid "Selection Mode"
-msgstr "არჩეული რეჟიმი"
+msgstr "მონიშვნის რეჟიმი"
 
 #: ../widgets/misc/e-selection-model.c:229
 #, fuzzy
@@ -21335,9 +22384,8 @@ msgid "When de_leted:"
 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
 msgid "<b>Replies</b>"
@@ -21346,7 +22394,7 @@ msgstr "<b>პასუხები</b>"
 #: ../widgets/misc/e-send-options.glade.h:3
 #, fuzzy
 msgid "<b>Return Notification</b>"
-msgstr "<b> შეტყობინება</b>"
+msgstr "<b> დაბრუნება ნოიფიკაცია</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:4
 #, fuzzy
@@ -21354,53 +22402,61 @@ msgid "<b>Status Tracking</b>"
 msgstr "<b> სტატუსი</b>"
 
 #: ../widgets/misc/e-send-options.glade.h:5
+#, fuzzy
 msgid "A_uto-delete sent item"
-msgstr ""
+msgstr "A წაშლა გაგზავნილი"
 
 #: ../widgets/misc/e-send-options.glade.h:6
+#, fuzzy
 msgid "C_lassification"
-msgstr ""
+msgstr "C"
 
 #: ../widgets/misc/e-send-options.glade.h:7
+#, fuzzy
 msgid "Creat_e a sent item to track information"
-msgstr ""
+msgstr "e a გაგზავნილი -სკენ"
 
 #: ../widgets/misc/e-send-options.glade.h:8
+#, fuzzy
 msgid "Deli_vered and opened"
-msgstr ""
+msgstr "და"
 
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "ზოგადი პრამეტრები"
 
 #: ../widgets/misc/e-send-options.glade.h:10
+#, fuzzy
 msgid ""
 "None\n"
 "Mail Receipt"
-msgstr ""
+msgstr "არა მიღება"
 
 #: ../widgets/misc/e-send-options.glade.h:12
+#, fuzzy
 msgid ""
 "Public\n"
 "Private\n"
 "Confidential\n"
-msgstr ""
+msgstr "საზოგადო არა"
 
 #: ../widgets/misc/e-send-options.glade.h:16
+#, fuzzy
 msgid "R_eply requested"
-msgstr ""
+msgstr "R მოთხოვნილი"
 
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "Sta_tus Tracking"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:19
+#, fuzzy
 msgid ""
 "Undefined\n"
 "High\n"
 "Standard\n"
 "Low"
-msgstr ""
+msgstr "დაუდგენელი"
 
 #: ../widgets/misc/e-send-options.glade.h:23
 msgid "When acce_pted:"
@@ -21428,20 +22484,23 @@ msgid "_All information"
 msgstr "სრული ინფორმაცია"
 
 #: ../widgets/misc/e-send-options.glade.h:29
+#, fuzzy
 msgid "_Delay message delivery"
-msgstr ""
+msgstr "დაყოვნება"
 
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_Delivered"
 msgstr ""
 
 #: ../widgets/misc/e-send-options.glade.h:32
+#, fuzzy
 msgid "_Set expiration date"
-msgstr ""
+msgstr "თარიღი"
 
 #: ../widgets/misc/e-send-options.glade.h:33
+#, fuzzy
 msgid "_Until:"
-msgstr ""
+msgstr "მდე:"
 
 #: ../widgets/misc/e-send-options.glade.h:34
 msgid "_When convenient"
@@ -21469,24 +22528,26 @@ msgstr "-სკენ -სკენ URL"
 #: ../widgets/misc/gal-categories.glade.h:2
 #, fuzzy
 msgid "Edit Master Category List..."
-msgstr "რედაქტირება კატეგორია სია."
+msgstr "რედაქტირება პირველადი კატეგორია სია."
 
 #: ../widgets/misc/gal-categories.glade.h:3
+#, fuzzy
 msgid "Item(s) belong to these _categories:"
-msgstr ""
+msgstr "ელემენტი წმ -სკენ:"
 
 #: ../widgets/misc/gal-categories.glade.h:4
 #, fuzzy
 msgid "_Available Categories:"
-msgstr "მისაწვდომია კატეგორიები:"
+msgstr "ხელმისაწვდომი კატეგორიები:"
 
 #: ../widgets/misc/gal-categories.glade.h:5
 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"
@@ -21495,52 +22556,59 @@ msgstr "%l:%M %p"
 #: ../widgets/table/e-cell-pixbuf.c:397
 #, fuzzy
 msgid "Selected Column"
-msgstr "მონიშნულია"
+msgstr "მონიშნული სვეტი"
 
 #: ../widgets/table/e-cell-pixbuf.c:404
+#, fuzzy
 msgid "Focused Column"
-msgstr ""
+msgstr "სვეტი"
 
 #: ../widgets/table/e-cell-pixbuf.c:411
+#, fuzzy
 msgid "Unselected Column"
-msgstr ""
+msgstr "სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1749
+#, fuzzy
 msgid "Strikeout Column"
-msgstr ""
+msgstr "ხაზგადასმული სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1756
 #, fuzzy
 msgid "Underline Column"
-msgstr "ხაზგასმული"
+msgstr "ხაზგასმული სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1763
 #, fuzzy
 msgid "Bold Column"
-msgstr "მუქი"
+msgstr "მუქი სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1770
 #, fuzzy
 msgid "Color Column"
-msgstr "ფერი"
+msgstr "ფერი სვეტი"
 
 #: ../widgets/table/e-cell-text.c:1784
+#, fuzzy
 msgid "BG Color Column"
-msgstr ""
+msgstr "ფერი სვეტი"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:1
+#, fuzzy
 msgid "<- _Remove"
-msgstr ""
+msgstr "ამოშლა"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
+#, fuzzy
 msgid "A_vailable Fields:"
-msgstr ""
+msgstr "A:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
+#, fuzzy
 msgid "Ascending"
-msgstr ""
+msgstr "ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
@@ -21557,36 +22625,35 @@ 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 "ადი _ზევით"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:11
+#, fuzzy
 msgid "Sh_ow these fields in order:"
-msgstr ""
+msgstr "-:"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
 #: ../widgets/table/e-table-config.c:563
 #: ../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
@@ -21597,7 +22664,7 @@ msgstr "სორტირება"
 #: ../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
@@ -21605,8 +22672,9 @@ msgid "Then By"
 msgstr ""
 
 #: ../widgets/table/e-table-config-no-group.glade.h:17
+#, fuzzy
 msgid "_Add ->"
-msgstr ""
+msgstr "დამატება"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:18
 #: ../widgets/table/e-table-config.glade.h:16
@@ -21619,13 +22687,13 @@ msgid "_Sort..."
 msgstr "_სორტირება..."
 
 #: ../widgets/table/e-table-config.c:150
-#, fuzzy
 msgid "State"
 msgstr "მდგომარეობა"
 
 #: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
+#, fuzzy
 msgid "(Ascending)"
-msgstr ""
+msgstr "ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 #, fuzzy
@@ -21637,13 +22705,14 @@ msgid "Not sorted"
 msgstr ""
 
 #: ../widgets/table/e-table-config.c:355
+#, fuzzy
 msgid "No grouping"
-msgstr ""
+msgstr "არა"
 
 #: ../widgets/table/e-table-config.c:584
 #, fuzzy
 msgid "Available Fields"
-msgstr "მისაწვდომია"
+msgstr "ხელმისაწვდომი"
 
 #: ../widgets/table/e-table-config.glade.h:17
 #, fuzzy
@@ -21653,7 +22722,7 @@ msgstr "ჯგუფი."
 #: ../widgets/table/e-table-config.glade.h:19
 #, fuzzy
 msgid "_Show these fields in order:"
-msgstr "ანახე:"
+msgstr "ჩვენება -:"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
@@ -21668,7 +22737,7 @@ msgstr ""
 #: ../widgets/table/e-table-header-item.c:1818
 #, fuzzy
 msgid "Full Header"
-msgstr "სრული"
+msgstr "სრული ზედა კოლონტიტული"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 #, fuzzy
@@ -21676,14 +22745,16 @@ msgid "Add a column..."
 msgstr "დამატება a."
 
 #: ../widgets/table/e-table-field-chooser.glade.h:1
+#, fuzzy
 msgid "Field Chooser"
-msgstr ""
+msgstr "ველი"
 
 #: ../widgets/table/e-table-field-chooser.glade.h:2
+#, fuzzy
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
-msgstr ""
+msgstr "ვის დამატება a -სკენ ცხრილი - -სკენ."
 
 #: ../widgets/table/e-table-group-container.c:346
 #, c-format
@@ -21720,8 +22791,9 @@ msgstr "ფერები"
 #: ../widgets/table/e-table-group-leaf.c:581
 #: ../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
+#, fuzzy
 msgid "Horizontal Draw Grid"
-msgstr ""
+msgstr "ჰორიზონტალური ასახვა ბადე"
 
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-container.c:912
@@ -21729,8 +22801,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:588
 #: ../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
+#, fuzzy
 msgid "Vertical Draw Grid"
-msgstr ""
+msgstr "ვერტიკალური ასახვა ბადე"
 
 #: ../widgets/table/e-table-group-container.c:918
 #: ../widgets/table/e-table-group-container.c:919
@@ -21738,8 +22811,9 @@ msgstr ""
 #: ../widgets/table/e-table-group-leaf.c:595
 #: ../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 ""
+msgstr "ასახვა"
 
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-container.c:926
@@ -21748,7 +22822,7 @@ msgstr ""
 #: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 #, fuzzy
 msgid "Cursor mode"
-msgstr "კურსორი"
+msgstr "კურსორი რეჟიმი"
 
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-container.c:933
@@ -21766,8 +22840,9 @@ msgstr "არჩეული"
 #: ../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
+#, fuzzy
 msgid "Length Threshold"
-msgstr ""
+msgstr "სიგრძე"
 
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-container.c:947
@@ -21776,8 +22851,9 @@ msgstr ""
 #: ../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
+#, fuzzy
 msgid "Uniform row height"
-msgstr ""
+msgstr "რიგი სიმაღლე"
 
 #: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-container.c:954
@@ -21789,17 +22865,17 @@ msgstr "გაყინული"
 #: ../widgets/table/e-table-header-item.c:1466
 #, fuzzy
 msgid "Customize Current View"
-msgstr "გამართვა ხედი"
+msgstr "გამართვა მიმდინარე ჩვენება"
 
 #: ../widgets/table/e-table-header-item.c:1486
 #, fuzzy
 msgid "Sort Ascending"
-msgstr "სორტირება"
+msgstr "სორტირება ზრდადობის მიხედვით"
 
 #: ../widgets/table/e-table-header-item.c:1487
 #, fuzzy
 msgid "Sort Descending"
-msgstr "სორტირება"
+msgstr "სორტირება კლებადობით"
 
 #: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
@@ -21808,7 +22884,7 @@ msgstr ""
 #: ../widgets/table/e-table-header-item.c:1490
 #, fuzzy
 msgid "Group By This Field"
-msgstr "ჯგუფი"
+msgstr "ჯგუფი ველი"
 
 #: ../widgets/table/e-table-header-item.c:1491
 #, fuzzy
@@ -21818,30 +22894,31 @@ msgstr "ჯგუფი"
 #: ../widgets/table/e-table-header-item.c:1493
 #, fuzzy
 msgid "Remove This Column"
-msgstr "წაშლა"
+msgstr "ამოშლა სვეტი"
 
 #: ../widgets/table/e-table-header-item.c:1494
 #, fuzzy
 msgid "Add a Column..."
-msgstr "დამატება a."
+msgstr "დამატება a სვეტი."
 
 #: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "განთავსება"
 
 #: ../widgets/table/e-table-header-item.c:1497
+#, fuzzy
 msgid "Best Fit"
-msgstr ""
+msgstr "საუკეთესო"
 
 #: ../widgets/table/e-table-header-item.c:1498
 #, fuzzy
 msgid "Format Columns..."
-msgstr "ფორმატი."
+msgstr "ფორმატი სვეტები."
 
 #: ../widgets/table/e-table-header-item.c:1500
 #, fuzzy
 msgid "Customize Current View..."
-msgstr "გამართვა ხედი."
+msgstr "გამართვა მიმდინარე ჩვენება."
 
 #: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
@@ -21857,65 +22934,70 @@ msgstr "სორტირება ინფორმაცია"
 #: ../widgets/table/e-table-header-item.c:1846
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
-#, fuzzy
 msgid "Tree"
 msgstr "განშტოება"
 
 #: ../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:2959 ../widgets/table/e-table-item.c:2960
+#, fuzzy
 msgid "Table model"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 #, fuzzy
 msgid "Cursor row"
-msgstr "კურსორი"
+msgstr "კურსორი რიგი"
 
 #: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
 #: ../widgets/table/e-tree.c:3299
 #, fuzzy
 msgid "Always search"
-msgstr "ყოველთვის"
+msgstr "ყოველთვის ძიება"
 
 #: ../widgets/table/e-table.c:3322
 #, fuzzy
 msgid "Use click to add"
-msgstr "-სკენ"
+msgstr "გამოყენება -სკენ დამატება"
 
 #: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#, fuzzy
 msgid "ETree table adapter"
-msgstr ""
+msgstr "ცხრილი"
 
 #: ../widgets/table/e-tree.c:3305
+#, fuzzy
 msgid "Retro Look"
-msgstr ""
+msgstr "შეხედვა"
 
 #: ../widgets/table/e-tree.c:3306
 #, fuzzy
 msgid "Draw lines and +/- expanders."
-msgstr "და."
+msgstr "ასახვა და."
 
 #: ../widgets/text/e-entry-test.c:49
+#, fuzzy
 msgid "Minicard Test"
-msgstr ""
+msgstr "ტესტი"
 
 #: ../widgets/text/e-entry-test.c:50
 #, fuzzy
 msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "საავტორო უფლებები C."
+msgstr "C კოდი."
 
 #: ../widgets/text/e-entry-test.c:52
+#, fuzzy
 msgid "This should test the minicard canvas item"
-msgstr ""
+msgstr "ტილო"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 #, fuzzy
 msgid "Event Processor"
-msgstr "შემთხვევა პროცესორი"
+msgstr "მოვლენა პროცესორი"
 
 #: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 msgid "Font"
@@ -21927,8 +23009,9 @@ msgstr ""
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
 #: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
+#, fuzzy
 msgid "Justification"
-msgstr ""
+msgstr "მორგება"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
 #: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
@@ -21945,12 +23028,13 @@ msgstr ""
 #: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 #, fuzzy
 msgid "Line wrap"
-msgstr "სტრიქონი"
+msgstr "სტრიქონების გადატანა"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+#, fuzzy
 msgid "Break characters"
-msgstr ""
+msgstr "შეწყვეტა ასო-ნიშნები"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
 #: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
@@ -21962,22 +23046,25 @@ msgstr "მაქსიმალური"
 #: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 #, fuzzy
 msgid "Allow newlines"
-msgstr "დაუშვი"
+msgstr "ნების დართვა"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
 #: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
+#, fuzzy
 msgid "Draw borders"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
 #: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+#, fuzzy
 msgid "Draw background"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
 #: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
+#, fuzzy
 msgid "Draw button"
-msgstr ""
+msgstr "ასახვა"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
 #: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
@@ -21986,25 +23073,28 @@ 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:2721
 #, fuzzy
 msgid "Input Methods"
-msgstr "შესავალი"
+msgstr "შეტანის პარამეტრები"
 
 #: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "მუქი"
 
 #: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
+#, fuzzy
 msgid "Strikeout"
-msgstr ""
+msgstr "ხაზგადასმული"
 
 #: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
+#, fuzzy
 msgid "Anchor"
-msgstr ""
+msgstr "ღუზა"
 
 #: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 #, fuzzy
@@ -22021,63 +23111,99 @@ msgid "Clip"
 msgstr ""
 
 #: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
+#, fuzzy
 msgid "Fill clip rectangle"
-msgstr ""
+msgstr "შევსება"
 
 #: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
+#, fuzzy
 msgid "X Offset"
-msgstr ""
+msgstr "X წანაცვლება"
 
 #: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#, fuzzy
 msgid "Y Offset"
-msgstr ""
+msgstr "Y წანაცვლება"
 
 #: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 #, fuzzy
 msgid "Text width"
-msgstr "ტექსტი"
+msgstr "ტექსტის სიგანე"
 
 #: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 #, fuzzy
 msgid "Text height"
-msgstr "ტექსტი"
+msgstr "ტექსტის სიმაღლე"
 
 #: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 #, fuzzy
 msgid "IM Context"
-msgstr "მოკ-შე"
+msgstr "მოკ-შე კონტექსტი"
 
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 #, fuzzy
 msgid "Handle Popup"
 msgstr "მხტუნავი"
 
+#, 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."
-msgstr ""
+msgstr "Evolution -სკენ SSL TLS - a -თვის მაგალითი და LDAP a ეთ Evolution -სკენ SSL TLS."
+
+#, fuzzy
+msgid "(%ld seconds)"
+msgstr "წამი"
+
+msgid "(%d %s %d %s)"
+msgstr "(%d·%s·%d·%s)"
+
+msgid "(%d %s)"
+msgstr "(%d·%s)"
+
+msgid " %u second"
+msgstr " %u წამი"
+
+msgid " %u seconds"
+msgstr " %u წამი"
+
+msgid " %u minute"
+msgstr " %u წუთი"
+
+msgid " %u minutes"
+msgstr " %u წუთი"
+
+msgid "%u hour"
+msgstr "%u საათი"
+
+msgid "%u hours"
+msgstr "%u საათი"
 
 #, fuzzy
 msgid "Task Table"
-msgstr "ამოცანა"
+msgstr "ამოცანა ცხრილი"
 
 #, fuzzy
 msgid "Memo Table"
-msgstr "ამოცანა"
+msgstr "ცხრილი"
 
 #, fuzzy
 msgid "Timezone Button"
 msgstr "დროის ზონა ღილაკი"
 
 #, fuzzy
+msgid "(%d seconds)"
+msgstr "წამი"
+
+#, fuzzy
 msgid "The Evolution Groupware Suite"
 msgstr "Evolution"
 
 #, fuzzy
 msgid "Mail Accounts Table"
-msgstr "ანგარიშები"
+msgstr "ფოსტა ანგარიშები ცხრილი"
 
 #, fuzzy
 msgid "Attachment Button"
@@ -22090,8 +23216,9 @@ msgstr "არა"
 msgid "Filters"
 msgstr "ფილტრები"
 
+#, fuzzy
 msgid "_Show animated images"
-msgstr ""
+msgstr "ჩვენება"
 
 msgid "<b>%s (%s)</b>"
 msgstr "<b>%s (%s)</b>"
@@ -22101,7 +23228,7 @@ msgstr "<b>%s</b>"
 
 #, fuzzy
 msgid "Message List"
-msgstr "შეტყობინება სია"
+msgstr "შეტყობინების სია"
 
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">ავტომატური კონტაქტები</span>"
@@ -22109,8 +23236,9 @@ msgstr "<span weight=\"bold\">ავტომატური კონტაქ�
 msgid "<span weight=\"bold\">Conflict Search</span>"
 msgstr "<span weight=\"bold\">კონფლიქტების ძებნა</span>"
 
+#, fuzzy
 msgid "_All day Event"
-msgstr ""
+msgstr "ყველა დღე მოვლენა"
 
 msgid "Previous Button"
 msgstr "წინა ღილაკი"
@@ -22119,9 +23247,8 @@ msgstr "წინა ღილაკი"
 msgid "Text Date Entry"
 msgstr "ტექსტი თარიღი"
 
-#, fuzzy
 msgid "Date Button"
-msgstr "თარიღი ღილაკი"
+msgstr "თარიღის ღილაკი"
 
 #, fuzzy
 msgid "Search Text Entry"
diff --git a/po/lt.po b/po/lt.po
index 3154f8bdb7..564b2a3f40 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,9 +4,6 @@
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2004
 # Žygimantas Beručka <zygis@gnome.org>, 2004-2006.
 # 
-# „In the beginning back in nineteen fifty five
-# Man didn't know 'bout a rock 'n' roll show
-# 'N all that jive
 # The white man had the schmaltz, the black man had the blues
 # No one knew what they was gonna do
 # But Tschaikovsky had the news, he said "Let there be rock"“
@@ -15,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-03 12:04+0200\n"
-"PO-Revision-Date: 2006-03-03 12:05+0200\n"
+"POT-Creation-Date: 2006-04-20 13:55+0300\n"
+"PO-Revision-Date: 2006-04-20 13:56+0300\n"
 "Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
@@ -119,7 +116,7 @@ msgstr "Eiti į datą"
 msgid "a table to view and select the current time range"
 msgstr "lentelė skirta žiūrėti ir pasirinkti dabartiniam laiko rėžiui"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -127,25 +124,25 @@ msgstr[0] "Turi %d įvykį."
 msgstr[1] "Turi %d įvykius."
 msgstr[2] "Turi %d įvykių."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Neturi įvykių."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Darbo savaitės vaizdas: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dienos vaizdas: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "kalendoriaus vaizdas darbo savaitei"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "kalendoriaus vaizdas vienai ar daugiau dienų"
 
@@ -221,21 +218,21 @@ msgstr "Peršokimo mygtukas"
 msgid "Click here, you can find more events."
 msgstr "Norėdami rasti daugiau įvykių, spauskite čia."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Mėnesio vaizdas: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Savaitės vaizdas: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "kalendoriaus vaizdas mėnesiui"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "kalendoriaus vaizdas vienai ar daugiau savaičių"
 
@@ -550,9 +547,9 @@ msgstr "Čia konfigūruojamas automatinis užbaigimas"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontaktai"
 
@@ -823,7 +820,7 @@ msgstr "Išsaugoti kaip Vcard..."
 msgid "_Properties..."
 msgstr "_Savybės..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Kontaktų šaltinio parinkiklis"
 
@@ -832,12 +829,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Autorizacija nepavyko.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Įveskite %s slaptažodį (naudotojas %s)"
@@ -1196,12 +1193,9 @@ msgstr "kortelės"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -2469,7 +2463,7 @@ msgstr "Paslauga"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Vieta"
@@ -2533,15 +2527,15 @@ msgstr "Pakeista"
 msgid "Contact Editor - %s"
 msgstr "Kontaktų redaktorius - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Prašau parinkti šiam kontaktui paveikslėlį"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Nėra paveikslėlio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2549,7 +2543,7 @@ msgstr ""
 "Kontakto duomenys netinkami:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Netinkamas kontaktas."
 
@@ -2706,8 +2700,8 @@ msgstr "_SŽ paslauga:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Vieta:"
 
@@ -2879,7 +2873,7 @@ msgstr "Šaltinis"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2892,7 +2886,7 @@ msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3112,7 +3106,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../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"
@@ -3695,19 +3689,19 @@ msgstr "Evolution CSV ir Tab importavimas"
 msgid "Importing ..."
 msgstr "Importuojama..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP duomenų apsikeitimo formatas (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importavimas"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard importavimas"
 
@@ -3770,7 +3764,7 @@ msgstr "Formatas"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Antraštė"
@@ -3875,8 +3869,8 @@ msgstr "Pustoniai"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Dydis:"
 
@@ -4357,7 +4351,7 @@ msgid "_Save Changes"
 msgstr "Iš_saugoti pakeitimus"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Siųsti"
 
@@ -4471,14 +4465,14 @@ msgid "Memos"
 msgstr "Užrašai"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Užduotys"
@@ -4497,9 +4491,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution kalendoriaus perspėjimo pranešimo tarnyba"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutė"
@@ -4634,67 +4625,37 @@ msgstr "Nepavyko sukurti perspėjimo pranešimų tarnybos gamyklos"
 msgid "invalid time"
 msgstr "netinkamas laikas"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld sekundės)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "sekundė"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "sekundžių"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr "%u sekundė"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr "%u sekundės"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr "%u minutė"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr "%u minutės"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d valanda"
+msgstr[1] "%d valandos"
+msgstr[2] "%d valandų"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "%u valanda"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutė"
+msgstr[1] "%d minutės"
+msgstr[2] "%d minučių"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u valandos"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekundė"
+msgstr[1] "%d sekundės"
+msgstr[2] "%d sekundžių"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5108,10 +5069,10 @@ msgstr "Spausdinti"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5369,7 +5330,7 @@ msgstr "minutę(es)"
 msgid "start of appointment"
 msgstr "įvykio pradžią"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Veiksmas/jungiklis"
 
@@ -5487,7 +5448,7 @@ msgid "Display"
 msgstr "Vaizdavimas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Laisvas/užsiėmęs"
@@ -5847,11 +5808,11 @@ msgstr "_Perkelti"
 msgid "Cancel _Drag"
 msgstr "Atšaukti _tempimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5859,19 +5820,19 @@ msgstr[0] "<b>%d</b> priedas"
 msgstr[1] "<b>%d</b> priedai"
 msgstr[2] "<b>%d</b> priedų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Paslėpti prie_dų juostą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Rodyti prie_dų juostą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5880,82 +5841,82 @@ msgstr "Rodyti prie_dų juostą"
 msgid "_Remove"
 msgstr "_Pašalinti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Savybės"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Prisegti priedą..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Rodyti priedus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Norėdami perjungti priedų skydelio matomumą paspauskite tarpą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Keisti paskyrimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Susitikimas - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Paskyrimas -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Priskirta užduotis - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "priedas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Pakeitimai padaryti šiame punkte bus prarasti, jei atsiras atnaujinimai"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
@@ -6042,85 +6003,85 @@ msgid "Recurrence"
 msgstr "Pasikartojimas"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Šiam įvykiui yra perspėjimas"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Kale_ndorius:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganizatorius:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "_Delegatai"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "D_alyviai"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Įvykis be pradžios datos"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Įvykis be pabaigos datos"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Klaidinga pabaigos data"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Klaidingas pradžios laikas"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Pasirinktas organizatorius nebeturi sąskaitos."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Būtinas bent vienas dalyvis."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Pridėti"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nepavyko atverti kalendoriaus „%s“."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6128,7 +6089,7 @@ msgstr[0] "%d dieną prieš paskyrimą"
 msgstr[1] "%d dienas prieš paskyrimą"
 msgstr[2] "%d dienų prieš paskyrimą"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6136,7 +6097,7 @@ msgstr[0] "%d valandą prieš paskyrimą"
 msgstr[1] "%d valandas prieš paskyrimą"
 msgstr[2] "%d valandų prieš paskyrimą"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
@@ -6144,7 +6105,7 @@ msgstr[0] "%d minutę prieš paskyrimą"
 msgstr[1] "%d minutes prieš paskyrimą"
 msgstr[2] "%d minučių prieš paskyrimą"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Prisitaikyti"
 
@@ -6153,7 +6114,7 @@ msgstr "Prisitaikyti"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6282,14 +6243,14 @@ msgstr "Narys"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6326,7 +6287,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Nepavyko atverti „%s“ užrašų."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupė:"
@@ -6426,6 +6387,15 @@ msgstr "lygiai"
 msgid "first"
 msgstr "pirmas"
 
+#. 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:998
+msgid "second"
+msgstr "sekundė"
+
 #. 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.
@@ -6570,7 +6540,7 @@ msgstr "<span weight=\"bold\">Būsena</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Užbaigta"
@@ -6646,11 +6616,11 @@ msgstr "_Užduotis"
 msgid "Task Details"
 msgstr "Užduoties informacija"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Galutinio termino data klaidinga"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
@@ -6736,33 +6706,6 @@ msgstr[0] "%d savaitė"
 msgstr[1] "%d savaitės"
 msgstr[2] "%d savaičių"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d valanda"
-msgstr[1] "%d valandos"
-msgstr[2] "%d valandų"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutė"
-msgstr[1] "%d minutės"
-msgstr[2] "%d minučių"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekundė"
-msgstr[1] "%d sekundės"
-msgstr[2] "%d sekundžių"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Nežinomas veiksmas, kurį reikia atlikti"
@@ -6923,27 +6866,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Taip"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ne"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6960,35 +6903,35 @@ msgstr "Pasikartojantis"
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Išsaugoti kaip..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Pasirinkite aplanką, kuriame išsaugoti pasirinktus priedus..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neįvardintas_paveikslėlis.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Nustatyti kaip _foną"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Išsaugoti pažymėtus"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Atverti su %s..."
@@ -7408,7 +7351,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7421,7 +7364,7 @@ msgstr "Negalutinis sutikimas"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7753,81 +7696,81 @@ msgid "Resources"
 msgstr "Resursai"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individas"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupė"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resursas"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Kambarys"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Pirmininkas"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Būtinas dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Nebūtinas dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Negalutinis"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Pavestas"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Dalyvis"
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Vykdomas"
 
 #. 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %Y m. %B %e"
 
@@ -7836,7 +7779,7 @@ msgstr "%A, %Y m. %B %e"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
@@ -7922,7 +7865,7 @@ msgstr "Spragtelėkite norėdami pridėti užrašą"
 msgid "Memo sort"
 msgstr "Užrašų rūšiavimas"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7941,7 +7884,7 @@ msgstr "Įkeliami užrašai"
 msgid "Opening memos at %s"
 msgstr "Atveriami %s užrašai"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
@@ -7950,20 +7893,20 @@ msgstr "Trinami pasirinkti objektai..."
 msgid "Enter the password for %s"
 msgstr "Įveskite „%s“ slaptažodį"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Išvaloma"
 
@@ -8243,12 +8186,6 @@ msgstr "Nepavyko perkelti kalendoriaus „%s“"
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nepavyko perkelti „%s“ užduočių"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d sekundės)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1-a"
@@ -10158,7 +10095,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Priedų juosta"
 
@@ -10358,7 +10295,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Dėl „{0}“, Jums gali reikti pasirinkti kitus pašto nustatymus."
 
 #: ../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 "Dėl „{1}“."
 
@@ -10477,11 +10414,11 @@ msgstr "Iš_saugoti laišką"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Grupinio darbo įrankis"
 
@@ -10648,7 +10585,7 @@ msgstr "Ar norite ją perrašyti?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Rinkmena egzistuoja „{0}“."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Perrašyti"
 
@@ -10823,7 +10760,7 @@ msgstr "Trūksta datos."
 msgid "Missing file name."
 msgstr "Trūksta rinkmenos pavadinimo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Trūksta vardo."
 
@@ -10895,6 +10832,10 @@ msgstr " "
 msgid "months"
 msgstr "mėnesių"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "sekundžių"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "esamas laikas"
@@ -11075,7 +11016,7 @@ msgstr "[Numatytasis]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Įjungta"
 
@@ -11108,14 +11049,14 @@ msgstr "Parašas(ai)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas laiškas --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
 #. 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:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11441,7 +11382,7 @@ msgstr "Juodraščiai"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
@@ -11527,7 +11468,7 @@ msgstr "_Naujas aplankas..."
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Išt_uštinti šiukšlinę"
 
@@ -12138,20 +12079,20 @@ msgstr "Kitą kartą neberodyti šios žinutės."
 msgid "Message Filters"
 msgstr "Laiškų filtrai"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "laiškas"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Išsaugoti laišką..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
@@ -13926,13 +13867,13 @@ 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 ""
 "Ne tuščias aplankas esantis „{1}“ jau egzistuoja.\n"
 "\n"
-"Galite ignoruoti šį aplanką, perrašyti, pridėti jo turinį arba išeiti.\n"
+"Galite ignoruoti šį aplanką, perrašyti, pridėti jo turinį arba išeiti."
 
-#: ../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}?"
@@ -13940,13 +13881,13 @@ msgstr ""
 "Paprašyta „{1}“ perskaitymo patvirtinimo. Siųsti {0} patvirtinimą apie "
 "perskaitymą?"
 
-#: ../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 "Parašas pavadinimu „{0}“ jau yra. Nurodykite kitą pavadinimą."
 
-#: ../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."
@@ -13954,25 +13895,25 @@ msgstr ""
 "Pridėdami reikšmingą temos eilutę Jūs padėsite gavėjams suprasti apie ką yra "
 "Jūsų laiškas."
 
-#: ../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 "Ar tikrai norite ištrinti šį abonementą ir visus jo tarpininkus?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Ar tikrai norite ištrinti šį abonementą?"
 
-#: ../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 ""
 "Ar tikrai norite išjungti šį abonementą ir ištrinti visus jo tarpininkus?"
 
-#: ../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 "Ar tikrai norite tuo pačiu metu atverti {0} laiškų?"
 
-#: ../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?"
@@ -13980,7 +13921,7 @@ msgstr ""
 "Ar tikrai norite visam laikui pašalinti visus laiškus ištrintus visuose "
 "aplankuose?"
 
-#: ../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;?"
@@ -13988,79 +13929,79 @@ msgstr ""
 "Ar tikrai norite visam laikui pašalinti visus laiškus ištrintus iš aplanko "
 "„{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 "Ar tikrai norite išsiųsti laišką HTML formatu?"
 
-#: ../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 "Ar tikrai norite išsiųsti laišką vien tik su BCC gavėjais?"
 
-#: ../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 "Ar tikrai norite išsiųsti laišką neparašę temos?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Dėl „{0}“."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Nes „{2}“."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Tuščias parašas"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Nepavyko pridėti paieškos aplanko „{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 "Nepavyko nukopijuoti aplanko „{0}“ į „{1}“."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Nepavyko sukurti aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Nepavyko sukurti laikino saugojimo aplanko."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Nepavyko sukurti aplanko saugojimui, nes „{1}“."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Negalima ištrinti aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Negalima ištrinti sisteminio aplanko „{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 "Nepavyko pakeisti paieškos aplanko „{0}“, nes tokio aplanko nėra."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nepavyko perkelti aplanko „{0}“ į „{1}“."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Nepavyko atverti šaltinio „{1}“"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Nepavyko atverti šaltinio „{2}“."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Nepavyko atverti tikslo „{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 "
@@ -14070,31 +14011,31 @@ msgstr ""
 "negalėsite naudotis šiuo tiekėju tol, kol nesutiksite su licencijos "
 "sąlygomis."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Nepavyko pervadinti „{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 "Nepavyko pervadinti ar perkelti sisteminio aplanko „{0}“."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Nepavyko išsaugoti abonemento pakeitimų."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Nepavyko išsaugoti į aplanką „{0}“."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Nepavyko išsaugoti į rinkmeną „{0}“."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Nepavyko nustatyti parašo scenarijaus „{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."
@@ -14103,71 +14044,71 @@ msgstr ""
 "daugumoje slaptažodių yra svarbus raidžių registras; gali būti įjungtas Jūsų "
 "„CapsLock“ klavišas."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Nepavyko išsaugoti parašo rinkmenos."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Ištrinti „{0}“?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Ištrinti abonementą?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Atsisakyti pakeitimų?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Netrinti"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Neišjungti"
 
-#: ../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 "Ar norite, kad operacija būtų vykdoma poaplankiuose?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Ar norite pažymėti visus laiškus skaitytais?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Ar norite išsaugoti pakeitimus?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Įveskite slaptažodį."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Įvyko klaida, įkeliant filtro informaciją."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Klaida vykdant operaciją."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Klaida kol {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Rinkmena egzistuoja, bet negalima jos perrašyti."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Rinkmena egzistuoja, bet nėra standartinė rinkmena."
 
-#: ../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 "Jeigu nuspręsite tęsti, Jūs nebegalėsite atkurti šių žinučių."
 
-#: ../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."
@@ -14175,12 +14116,12 @@ msgstr ""
 "Jeigu ištrinsite šį aplanką, visas jo turinys ir jo dukterinių aplankų "
 "turinys bus iš karto ištrintas."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Jeigu tęsite, visa tarpinių abonementų informacija bus visam laikui ištrinta."
 
-#: ../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."
@@ -14188,11 +14129,11 @@ msgstr ""
 "Jeigu tęsite, abonemento informacija ir visa\n"
 "tarpinė informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jeigu tęsite, abonemento informacija bus visam laikui ištrinta."
 
-#: ../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."
@@ -14200,19 +14141,19 @@ msgstr ""
 "Jeigu išeisite, šios žinutės bus neišiųstos kol Evolution nebus paleistą dar "
 "kartą."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignoruoti"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Netinkama autentikacija"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Pašto filtrai automatiškai atnaujinami."
 
-#: ../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 "
@@ -14224,35 +14165,35 @@ msgstr ""
 "laiško gavėjai. Norėdami to išvengti, Jūs turėtumėte pridėti bent vieną Kam: "
 "arba CC: gavėją."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Pažymėti visus laiškus perskaitytais"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Pažymėti laiškus, pasirinktame aplanke, perskaitytais"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Trūkstamas aplankas."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Nepasirinkta jokių šaltinių."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Didelio laiškų kiekio atidarymas tuo pačiu metu gali ilgai užtrukti."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Patikrinkite Jūsų abonemento nustatymus ir bandykite dar kartą."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Įjunkite šį abonementą arba siųskite naudodamiesi kitų abonementu."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14260,7 +14201,7 @@ msgstr ""
 "Prašom įvesti tinkamą el. pašto adresą laukelyje Kam:. Jūs galite ieškoti "
 "el. pašto adresų paspausdami šalia įvedimo laukelio esantį mygtuką Kam:."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14272,49 +14213,49 @@ msgstr ""
 "{0}\n"
 "Vistiek išsiųsti?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Įveskite unikalų šio parašo pavadinimą."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Palaukite."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Perkelinėjant seną pašto aplanką „{0}“ iškilo problema."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Užklausiamas serveris"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Serveriui siunčiama užklausa dėl palaikomų autentifikacijos mechanizmų "
 "sąrašo."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Paprašyta perskaitymo patvirtinimo."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Tikrai ištrinti aplanką „{0}“ ir visus poaplankius?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Paieškos aplankai automatiškai atnaujinami."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Siųsti patvirtinimą"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Toks parašas jau yra"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14322,7 +14263,7 @@ msgstr ""
 "Sisteminiai aplankai yra reikalingi korektiškam Ximian Evolution "
 "funkcionavimui ir negali būti pervadinti, perkelti ar pašalinti."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14339,7 +14280,7 @@ msgstr ""
 "laiško gavėjai. Norėdami to išvengti, Jūs turėtumėte pridėti bent vieną Kam: "
 "arba CC: gavėją."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14353,7 +14294,7 @@ msgstr ""
 "    „{1}“\n"
 "Ir buvo atnaujinti."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14367,23 +14308,11 @@ msgstr ""
 "    „{1}“\n"
 "Ir buvo atnaujintos."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Laiškas buvo išsiųstas su išorine programa „sendmail“. Sendmail pranešė "
-"sekančią klaidą: būsena 67: laiškas neišsiųstas.\n"
-"Laiškas išsaugotas aplanke „Paruošti siųsti“. Patikrinkite ar laiške nėra "
-"klaidų ir siųskite iš naujo."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Scenarijaus rinkmena turi egzistuoti ir būti vykdomoji."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14391,7 +14320,7 @@ msgstr ""
 "Šis aplankas galėjo būti pridėtas aklai, paleiskite\n"
 "paieškos aplankų redaktorių ir pridėkite jį tiksliai, jeigu reikia."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14399,12 +14328,12 @@ msgstr ""
 "Šio laiško išsiųsti negalima, nes abonementas, kurį naudodami siunčiate, yra "
 "neįjungtas"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Šio laiško negalima išsiųsti - nenurodėte nei vieno gavėjo"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14412,11 +14341,11 @@ msgstr ""
 "Šis serveris nepalaiko tokio tipo autentikacijos, taip pat gali būti, kad "
 "nepalaiko jos išvis."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Šis parašas buvo pakeistas, tačiau neišsaugotas."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -14424,11 +14353,11 @@ msgstr ""
 "Visi laiškai, pasirinktame aplanke bei jo poaplankiuose, bus pažymėti "
 "skaitytais."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nepavyko prisijungti prie GroupWise serverio."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14436,39 +14365,39 @@ msgstr ""
 "Nepavyko atverti šio abonemento juodraščių aplanko. Ar vietoje to naudoti "
 "sistemos juodraščių aplanką?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Nepavyko perskaityti licencijos rinkmenos."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Nau_doti numatytąjį"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Naudoti numatytąjį juodraščių aplanką?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Jūs neįvedėte visos būtinos informacijos."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Jūs turite neišsiųstų laiškų, vistiek norite išeiti?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Jūs negalite sukurti dviejų abonementų tuo pačiu vardu."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Jūs turite pavadinti ši paieškos aplanką."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Jūs turite nurodyti aplanką."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14478,27 +14407,23 @@ msgstr ""
 "Pasirinkdami aplankus individualiai, ir/arba pasirinkdami visus vietinius "
 "aplankus, visus nuotolinius aplankus, arba ir tuos, ir tuos."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Jūsų prisijungimas į serverį „{0}“ kaip „{0}“ nepavyko."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Jūsų laiškas su tema „{0}“ buvo nepristatytas."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Pridėti"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "A_tsisakyti pakeitimų"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "Išval_yti"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Atverti laiškus"
 
@@ -14569,7 +14494,7 @@ msgstr "%Y %b %d"
 msgid "Messages"
 msgstr "Laiškai"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -15033,8 +14958,8 @@ msgstr "Autentikacijos tipas"
 msgid "Ch_eck for Supported Types"
 msgstr "Pati_krinti kokie tipai palaikomi"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -15214,14 +15139,14 @@ msgstr "Exchange aplankų medis"
 msgid "Unsubscribe Folder..."
 msgstr "Atsisakyti aplanko..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Tikrai atsisakyti aplanko „%s“?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Atsisakyti „%s“"
@@ -15663,7 +15588,7 @@ msgstr "Leidžia atsisakyti pašto aplankų, aplankų medžio kontekstiniame men
 msgid "Unsubscribe Folders"
 msgstr "Atsisakyti aplanko"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Sąrašas"
 
@@ -16882,7 +16807,7 @@ msgstr "Vietos"
 msgid "_Publish Calendar Information"
 msgstr "_Publikuoti Kalendoriaus informaciją"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Ar tikrai norite ištrinti ši adresą?"
 
@@ -17251,7 +17176,7 @@ msgstr "Šoninis skydelis yra matomas"
 msgid "Skip development warning dialog"
 msgstr "Praleisti bandomosios versijos perspėjimo langą"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Paleisti neprisijungiant"
 
@@ -17442,7 +17367,7 @@ msgstr "Nepavyko paleisti Bug buddy."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Paskutinysis vertėjas:\n"
@@ -17452,15 +17377,15 @@ msgstr ""
 "Gediminas Paulauskas <menesis@chatsubo.lt>,\n"
 "Tomas Kuliavas <tokul@users.sf.net>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -17565,7 +17490,7 @@ msgstr ""
 "Šis meistras padės Jums įkelti išorines rinkmena. į Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17601,7 +17526,7 @@ msgstr ""
 "Tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir mes\n"
 "nekantriai laukiame Jūsų pagalbos tobulinant šį produktą!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17609,35 +17534,35 @@ msgstr ""
 "Ačiū\n"
 "Evolution komanda\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Daugio to neberodyti"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution paleidimas aktyvuoja nurodytą komponentą"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Paleisti prisijungiant"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Priverstinai uždaryti visus Evolution komponentus"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Priverstinai re-migruoti iš Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į rinkmeną."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Atjungti bet kokių įskiepių įkėlimą."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20114,7 +20039,7 @@ msgid "_Edit..."
 msgstr "_Keisti..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20559,12 +20484,12 @@ msgstr "Tekstas"
 msgid "Find _Now"
 msgstr "_Surasti"
 
-#: ../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 "Žymeklio iilutė"
 
-#: ../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 "Žymeklio stulpelis"
@@ -20895,14 +20820,14 @@ msgstr "_Rodyti šiuos laukelius šia tvarka:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD kodas"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Pilna antraštė"
 
@@ -21068,17 +20993,17 @@ msgstr "Formatuoti stulpelius..."
 msgid "Customize Current View..."
 msgstr "Prisitaikyti esamą vaizdą..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Šriftų rinkinys"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rūšiavimo info"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -21256,3 +21181,47 @@ msgstr "IM turinys"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Išsiskleidžianti rodyklė"
+
+#~ msgid "(%ld seconds)"
+#~ msgstr "(%ld sekundės)"
+
+#~ msgid "(%d %s %d %s)"
+#~ msgstr "(%d %s %d %s)"
+
+#~ msgid "(%d %s)"
+#~ msgstr "(%d %s)"
+
+#~ msgid " %u second"
+#~ msgstr "%u sekundė"
+
+#~ msgid " %u seconds"
+#~ msgstr "%u sekundės"
+
+#~ msgid " %u minute"
+#~ msgstr "%u minutė"
+
+#~ msgid " %u minutes"
+#~ msgstr "%u minutės"
+
+#~ msgid "%u hour"
+#~ msgstr "%u valanda"
+
+#~ msgid "%u hours"
+#~ msgstr "%u valandos"
+
+#~ msgid "(%d seconds)"
+#~ msgstr "(%d sekundės)"
+
+#~ 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 ""
+#~ "Laiškas buvo išsiųstas su išorine programa „sendmail“. Sendmail pranešė "
+#~ "sekančią klaidą: būsena 67: laiškas neišsiųstas.\n"
+#~ "Laiškas išsaugotas aplanke „Paruošti siųsti“. Patikrinkite ar laiške nėra "
+#~ "klaidų ir siųskite iš naujo."
+
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Jūsų laiškas su tema „{0}“ buvo nepristatytas."
diff --git a/po/nl.po b/po/nl.po
index b29221d633..70163eed67 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -53,7 +53,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-28 23:09+0200\n"
+"POT-Creation-Date: 2006-05-27 12:44+0200\n"
 "PO-Revision-Date: 2006-05-27 13:56+0200\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -65,7 +65,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adresboek"
 
@@ -79,10 +79,10 @@ msgstr "Nieuw contact"
 msgid "New Contact List"
 msgstr "Nieuwe contactenlijst"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
-#, fuzzy, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
+#: ../a11y/addressbook/ea-minicard-view.c:152
+#, c-format
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
 msgstr[0] "Huidige adresboekmap heeft %d kaart"
 msgstr[1] "Huidige adresboekmap heeft %d kaarten"
 
@@ -104,34 +104,34 @@ msgid "evolution minicard"
 msgstr "evolution minikaart"
 
 # wekkers/alarmen
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Het heeft alarmeringen."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Het herhaalt zich."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Het is een bijeenkomst."
 
-#: ../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 "Agendanotitie: Samenvatting 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 "Agendanotitie: bevat geen samenvatting."
 
 # is dit goed?
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "agendanotitie weergeven"
 
 # aandacht grijpen/betere vertaling?
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Focus grijpen"
 
@@ -203,10 +203,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -237,10 +235,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -444,8 +440,7 @@ msgstr "GroupWise adresboek aanmaken:"
 
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "LDAP server did not respond with valid schema information."
-msgstr ""
-"Het antwoord van de LDAP server bevatte geen geldige schema-informatie."
+msgstr "Het antwoord van de LDAP server bevatte geen geldige schema-informatie."
 
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "Server Version"
@@ -453,8 +448,7 @@ msgstr "Server-versie"
 
 #: ../addressbook/addressbook.error.xml.h:16
 msgid "Some features may not work properly with your current server"
-msgstr ""
-"Bepaalde functies werken mogelijk niet correct met uw huidige server-versie"
+msgstr "Bepaalde functies werken mogelijk niet correct met uw huidige server-versie"
 
 #: ../addressbook/addressbook.error.xml.h:17
 msgid "The Evolution addressbook has quit unexpectedly."
@@ -462,8 +456,7 @@ msgstr "Het Evolution adresboek is plotseling gesloten."
 
 # verkleinen ipv herschalen
 #: ../addressbook/addressbook.error.xml.h:18
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "De afbeelding die u heeft uitgekozen is groot. Wilt u het verkleinen en "
 "opslaan?"
@@ -549,8 +542,7 @@ msgstr ""
 "opslaan?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Uw contacten voor {0} zullen niet beschikbaar zijn totdat Evolution herstart "
 "is."
@@ -610,7 +602,7 @@ msgstr "Automatsch aanvullen hier configureren"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
@@ -675,7 +667,7 @@ msgstr "Op deze computer"
 #: ../calendar/gui/memos-component.c:202 ../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:105
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -739,9 +731,9 @@ msgstr "De inhoud van het adresboek lokaal kopiëren voor offline gebruik"
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
@@ -784,12 +776,12 @@ msgid "Address Book Properties"
 msgstr "Adresboek eigenschappen"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Bezig met overzetten..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
@@ -864,35 +856,35 @@ msgstr "Mapnaam mag geen '/' bevatten"
 msgid "A Folder with this name already exists"
 msgstr "Een map met deze naam bestaat al"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Nieuw adresboek"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1096
+#: ../mail/em-folder-tree.c:2054 ../mail/em-folder-view.c:1091
 #: ../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 "_Verwijderen"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Opslaan als VCard.."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Contactenbron-selectie"
 
@@ -901,7 +893,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
@@ -952,7 +944,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI voor de laatst gebruikte map in het dialoog: namen selecteren."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Positie van verticale paneel"
 
@@ -1032,10 +1024,8 @@ msgid "Email address"
 msgstr "E-mail adres"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr ""
-"Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1286,6 +1276,7 @@ msgstr "minuten"
 #: ../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
@@ -1336,13 +1327,13 @@ msgstr "<b>Werk</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1395,7 +1386,7 @@ msgstr "Telefoon"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Werk"
@@ -1423,9 +1414,10 @@ msgid "_Calendar:"
 msgstr "_Agenda:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#, fuzzy
-msgid "_Categories..."
-msgstr "Categorieë_n..."
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Categorieën"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1514,8 +1506,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Post_code:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Adres"
 
@@ -1523,7 +1515,7 @@ msgstr "Adres"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../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
@@ -2509,7 +2501,7 @@ msgstr "Zimbabwe"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Naam"
@@ -2520,7 +2512,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2530,7 +2522,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2560,17 +2552,17 @@ msgid "Other"
 msgstr "Overige"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2605,16 +2597,16 @@ msgid "Contact Editor - %s"
 msgstr "Contacten-editor - %s"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Selecteer een afbeelding voor dit contact"
 
 # foto is beter
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Geen afbeelding"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2622,23 +2614,23 @@ msgstr ""
 "De contact-data is ongeldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' heeft een ongeldige opmaak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' is leeg"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ongeldig contact."
 
@@ -2650,23 +2642,23 @@ msgstr "Contact snel toevoegen"
 msgid "_Edit Full"
 msgstr "Volledig be_werken"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "_Volledige naam"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
 msgstr "E-_mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Adresboek selecteren"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Weet u zeker dat u\n"
 "contactenlijst (%s) wilt verwijderen?"
@@ -2680,10 +2672,10 @@ msgstr ""
 "contactenlijsten wilt verwijderen?"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Weet u zeker dat u \n"
 "contact (%s) wilt verwijderen?"
@@ -2794,7 +2786,6 @@ msgid "_IM Service:"
 msgstr "_IM-dienst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2810,7 +2801,7 @@ msgid "Add an email to the List"
 msgstr "Voeg een email toe aan de lijst"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:874
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
@@ -2843,7 +2834,7 @@ msgstr "_Selecteren"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../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
@@ -2852,15 +2843,15 @@ msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 msgid "Book"
 msgstr "Boek"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Is nieuwe lijst"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:747
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "_Leden"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Leden contactenlijst"
 
@@ -2981,9 +2972,9 @@ msgid "Save as VCard..."
 msgstr "Opslaan als VCard.."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1241
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Openen"
@@ -3041,13 +3032,13 @@ msgstr "K_nippen"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1249
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3125 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1082 ../mail/message-list.c:1742
+#: ../composer/e-msg-composer.c:3120 ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077 ../mail/message-list.c:1724
 #: ../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-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
@@ -3109,7 +3100,7 @@ msgid "Company Phone"
 msgstr "Bedrijfstelefoon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "E-mail"
@@ -3161,7 +3152,7 @@ msgstr "Manager"
 
 # mobieltje? mobiele? pocket?
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Mobiele telefoon"
 
@@ -3170,7 +3161,7 @@ msgid "Nickname"
 msgstr "Bijnaam"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Opmerkingen"
 
@@ -3179,7 +3170,7 @@ msgid "Office"
 msgstr "Kantoor"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -3358,94 +3349,68 @@ msgstr "Geselecteerd"
 msgid "Has Cursor"
 msgstr "Heeft cursor"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163 ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "Verwijzing in browser _openen"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2467
-msgid "_Copy Link Location"
-msgstr "Verwijzing _kopiëren"
-
-# verzenden naar...
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-#, fuzzy
-msgid "_Send New Message To ..."
-msgstr "_Nieuw bericht sturen aan..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "E-mail_adres kopiëren"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(kaart)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "kaart"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Lijstleden"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Positie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#, fuzzy
-msgid "Video Chat"
-msgstr "_Video-chat:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Video conferentie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "werk"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-#, fuzzy
-msgid "Home Page"
-msgstr "_Webstek:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-#, fuzzy
-msgid "Web Log"
-msgstr "_Weblog:"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
+msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "persoonlijk"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Functie"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Homepage"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Blog"
-
 #. E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3635,7 +3600,7 @@ msgid "Error adding list"
 msgstr "Fout bij toevoegen lijst"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Fout bij toevoegen kaart"
 
@@ -3652,7 +3617,7 @@ msgid "Error removing list"
 msgstr "Fout bij verwijderen lijst"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Fout bij verwijderen kaart"
 
@@ -3687,58 +3652,58 @@ msgstr "Overschrijven"
 #. 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:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "contact"
 msgstr[1] "contacten"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Adresboek selecteren"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "lijst"
 
 # kaart verplaatsen naar
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Verplaats kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Kopieer kaart naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Verplaats kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Kopieer kaarten naar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Meerdere Vkaarten"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "Vkaart voor %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Contactinformatie"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Contactinformatie voor %s"
@@ -3835,12 +3800,12 @@ msgstr "Evolution VCard import assistent"
 msgid "Print envelope"
 msgstr "Envelop afdrukken"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Druk kaart af"
 
@@ -3993,7 +3958,7 @@ msgstr "Schaduw"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4086,8 +4051,7 @@ msgid "Export in asynchronous mode"
 msgstr "Exporteren in asynchrone modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
 msgstr ""
 "Het aantal kaarten in een uitvoerbestand in asynchrone modus, standaard "
 "aantal is 100."
@@ -4097,8 +4061,7 @@ msgid "NUMBER"
 msgstr "NUMMER"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Fout in argument op opdrachtregel, gebruik --help voor uitleg."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4158,8 +4121,7 @@ msgstr ""
 "worden hersteld."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+msgid "All information in this journal will be deleted and can not be restored."
 msgstr ""
 "Alle informatie in dit journaal zal verwijderd worden en kan niet hersteld "
 "worden."
@@ -4179,8 +4141,7 @@ msgstr ""
 "worden."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Alle informatie over deze afspraak zullen worden verwijderd en kunnen niet "
 "hersteld worden."
@@ -4194,8 +4155,7 @@ msgstr ""
 "kunnen worden hersteld."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Alle informatie over deze bijeenkomst zal verwijderd worden en kan niet "
 "hersteld worden."
@@ -4235,17 +4195,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Weet u zeker dat u deze afspraak wilt verwijderen?"
 
 #: ../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 "Weet u zeker dat u deze dagboekaantekening wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Weet u zeker dat u deze bijeenkomst wilt verwijderen?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Weet u zeker dat u deze taak wilt verwijderen?"
 
@@ -4300,8 +4257,7 @@ msgstr ""
 "kunnen deze ook accepteren."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-mailuitnodigingen worden naar alle deelnemers verzonden zodat ze antwoord "
 "kunnen geven."
@@ -4445,8 +4401,7 @@ msgstr "Wilt u deze taak versturen naar de deelnemers.?"
 
 #: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
-"Wilt u alle deelnemers de vernieuwde informatie over de bijeenkomst sturen?"
+msgstr "Wilt u alle deelnemers de vernieuwde informatie over de bijeenkomst sturen?"
 
 #: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
@@ -4478,13 +4433,11 @@ msgstr "U heeft deze memo gewijzigd maar nog niet opgeslagen."
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
-"Uw agenda's zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
+msgstr "Uw agenda's zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
-"Uw taken zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
+msgstr "Uw taken zullen niet beschikbaar zijn totdat Evolution opnieuw gestart is."
 
 #: ../calendar/calendar.error.xml.h:68
 #: ../composer/mail-composer.error.xml.h:27
@@ -4529,8 +4482,8 @@ msgstr "Meerdaagse agendanotities splitsen:"
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Kon evolution-data-server niet starten"
 
@@ -4569,7 +4522,7 @@ msgid "Calendar and Tasks"
 msgstr "Agenda en taken"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Agenda's"
 
@@ -4620,7 +4573,7 @@ msgstr "Memo's"
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4643,13 +4596,13 @@ msgstr "_Taken"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution agenda alarmeringsdienst"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuut"
 msgstr[1] "minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4662,7 +4615,7 @@ msgstr[0] "uur"
 msgstr[1] "uren"
 
 # uur is beter: 5 uur en 10 minuten
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Begintijd"
 
@@ -4673,8 +4626,8 @@ msgstr "Afspraken"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1618
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4690,7 +4643,7 @@ msgstr "Sluimer_tijd:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4707,32 +4660,33 @@ msgstr "_Sluimeren"
 msgid "location of appointment"
 msgstr "locatie van de afspraak"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Geen omschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Geen locatieinformatie beschikbaar."
 
 # wekkers/alarmen/alarmeringen
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "U heeft %d alarmeringen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4744,7 +4698,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4761,7 +4715,7 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
@@ -4832,10 +4786,8 @@ msgid "Calendars to run alarms for"
 msgstr "Agenda's met alarmeringen"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr ""
-"Kleur van de lijn van Marcus Bains in de tijdbalk (leeg voor standaard)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr "Kleur van de lijn van Marcus Bains in de tijdbalk (leeg voor standaard)."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
@@ -4851,8 +4803,7 @@ msgstr "Bevestigen bij het leegmaken"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
-msgstr ""
-"Dagen waarop de begin- en eindtijden van werkuren zichbaar moeten zijn."
+msgstr "Dagen waarop de begin- en eindtijden van werkuren zichbaar moeten zijn."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
@@ -4868,107 +4819,92 @@ msgid "Default reminder value"
 msgstr "Standaard herinneringswaarde"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-#, fuzzy
-msgid "Event Gradient"
-msgstr "Agendanotitie-informatie"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Vrij/bezet server-URLs"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Vrij/bezet sjabloon-URL"
 
-#: ../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
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Voltooide taken verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Taakeenheden verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Taakwaarde verbergen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Horizontale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Het uur waarop de werkdag eindigt, in 24-uurs formaat, 0 tot 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Het uur waarop de werkdag begint, in 24-uurs formaat, 0 tot 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Tijdverdeling die getoont worden in dag- en werkweekweergave, in minuten."
+msgstr "Tijdverdeling die getoont worden in dag- en werkweekweergave, in minuten."
 
 # wekkertijd/alarmtijd
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Laatste alarmeringstijd"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Lijst met server-URLs voor vrij/bezet publicatie."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Lijn van Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Kleur van lijn van Marcus Bains - Dagweergave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Kleur van lijn van Marcus Bains - Tijdbalk"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minuut waarop de werkdag eindigt, 0 tot 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minuut waarop de werkdag begint, 0 tot 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Maandweergave, horizontale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Maandweergave, verticale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Aantal eenheden voor het bepalen van een standaard herinnering."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
-msgstr ""
-"Aantal eenheden voor het bepalen wanneer taken verborgen moeten worden."
+msgstr "Aantal eenheden voor het bepalen wanneer taken verborgen moeten worden."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Kleur van verlopen taken"
 
 # wat een rotzin!
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -4979,7 +4915,7 @@ msgstr ""
 # engels: zin klopt niet:
 # Position of the horizontal pane, between the view and the date navigator
 # calendar and task list in the month view, in pixels.
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -4987,7 +4923,7 @@ msgstr ""
 "Positie van het horizontale paneel, tussen het weergavegedeelte en de "
 "datumkiezer-agenda en de takenlijst, bij maandweergave, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -4995,7 +4931,7 @@ msgstr ""
 "Positie van het verticale paneel, tussen takenlijst en de taken-"
 "voorbeelpaneel, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5003,7 +4939,7 @@ msgstr ""
 "Positie van het verticale paneel, tussen het weergavegedeelte en de "
 "datumkiezer-agenda en takenlijst, bij maandweergave, in pixels."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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."
@@ -5013,68 +4949,68 @@ msgstr ""
 "pixels."
 
 # Programma's die kunnen fungeren als deel van een alarm
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programma's die door alarmeringen mogen worden uitgevoerd."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Het RSVP-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Het rol-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Eindtijden van afspraken tonen in week- en maandweergave"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Het categorieën-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Alarmeringen tonen in het mededelingengebied"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Het statusveld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
 # FIXME: dit moet duidelijker
 # weergavepaneel/voorbeeldpaneel
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Toon het voorbeeld paneel"
 
 # BUG, betere vertaling
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Het voorbeeldweergavepaneel tonen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Het tijdzoneveld tonen in de gebeurtenis/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Het type-veld tonen in de gebeurtenis/taak/bijeenkomst-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "De weeknummers tonen in datumkiezer"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Kleur van taken die vandaag verlopen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Taken verticale paneelpositie"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5084,7 +5020,7 @@ msgstr ""
 "vervangen door het gebruikersnaam-deel van het mailadres en %d wordt "
 "vervangen door het domein."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5093,64 +5029,53 @@ msgstr ""
 "onvertaalde Olsen tijdzone databaselocatie zoals \"Europe/Amsterdam\"."
 
 # tijdverdeling
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Tijdonderverdeling"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Tijd wanneer de laatste alarmering is afgegaan, in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "24-uurs tijdsformaat"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Eenheid voor een standaard-herinnering, \"minuten\", \"uren\" of \"dagen\"."
+msgstr "Eenheid voor een standaard-herinnering, \"minuten\", \"uren\" of \"dagen\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Eenheid wanneer taken worden verborgen, \"minuten\", \"uren\" of \"dagen\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Eenheid wanneer taken worden verborgen, \"minuten\", \"uren\" of \"dagen\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Week begint"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Weekdag waarmee de week begint, van zondag (0) tot zaterdag (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr ""
-"Of het mededelingengebied wordt gebruikt voor het weergeven van alarmeringen."
+msgstr "Of het mededelingengebied wordt gebruikt voor het weergeven van alarmeringen."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
-msgstr ""
-"Of om bevestiging wordt gevraagd bij het wissen van eem afspraak of taak."
+msgstr "Of om bevestiging wordt gevraagd bij het wissen van eem afspraak of taak."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr ""
 "Of om bevestiging wordt gevraagd bij het definitief verwijderen van "
 "afspraken en taken."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5158,84 +5083,75 @@ msgstr ""
 "Of weekenden in de maandweergave worden gecomprimeerd waardoor zaterdag en "
 "zondag de ruimte krijgen van één weekdag."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
-msgstr ""
-"If de eindtijden van afspraken worden getoond in week- en maandweergave."
+msgstr "If de eindtijden van afspraken worden getoond in week- en maandweergave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr ""
 "Of de lijn van Marcus Bains (lijn op de huidige tijd) wordt getoond in de "
 "agenda."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Of voltooide taken verborgen worden in in de takenweergave."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Of een standaard herinnering ingesteld wordt bij afspraken."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Of het RSVP-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
+msgstr "Of het RSVP-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr ""
 "Of het categorieën-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-"
 "editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr ""
-"Of het rol-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
+msgstr "Of het rol-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
-msgstr ""
-"Of het status-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
+msgstr "Of het status-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
-msgstr ""
-"Of de tijd in een 24-uursformaat getoond wordt in plaats van als am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgstr "Of de tijd in een 24-uursformaat getoond wordt in plaats van als am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
-msgstr ""
-"Of het tijdzone-veld getoond wordt in de gebeurtenis/bijeenkomsten-editor"
+msgstr "Of het tijdzone-veld getoond wordt in de gebeurtenis/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
-msgstr ""
-"Of het type-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
+msgstr "Of het type-veld getoond wordt in de gebeurtenis/taken/bijeenkomsten-editor"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Of weeknummers getoond worden in de datumkiezer."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Werkdagen"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Werkdag laatste uur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Werkdag laatste minuut"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Werdag eerste uur"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Werkdag eerste minuut"
 
@@ -5269,7 +5185,7 @@ msgstr "Afdrukken"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5336,64 +5252,62 @@ msgstr "Bijwerken van agenda's mislukt."
 #: ../calendar/gui/calendar-component.c:1139
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"Kan de agenda '%s' niet openen voor het maken van notities en bijeenkomsten"
+msgstr "Kan de agenda '%s' niet openen voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
-msgstr ""
-"Er is geen agenda beschikbaar voor het maken van notities en bijeenkomsten"
+msgstr "Er is geen agenda beschikbaar voor het maken van notities en bijeenkomsten"
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Agendabron-selectie"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Nieuwe bijeenkomst"
 
 # Combinatietoets is Shift+Ctrl+E
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "Bij_eenkomst"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "A_genda"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
@@ -5553,22 +5467,22 @@ msgstr "_Toevoegen"
 msgid "Alarms"
 msgstr "Alarmeringen"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../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:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
-#, fuzzy
-msgid "_Suggest automatic display of attachment"
+#: ../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"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Bijlage-eigenschappen"
@@ -5577,19 +5491,19 @@ msgstr "Bijlage-eigenschappen"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Omschrijving:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME-type:"
@@ -5614,8 +5528,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u en %d zullen worden vervangen door gebruiker en domein van het email-"
 "adres.</i>"
@@ -5656,7 +5569,7 @@ msgid "Display"
 msgstr "Weergave"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:587
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Vrij/Bezet"
@@ -5756,7 +5669,7 @@ msgid "Thursday"
 msgstr "Donderdag"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Tijd_zone:"
 
@@ -5846,46 +5759,44 @@ msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-#, fuzzy
-msgid "Cop_y calendar contents locally for offline operation"
+msgid "Copy calendar contents locally for offline operation"
 msgstr "De inhoud van de agenda lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-#, fuzzy
-msgid "Cop_y task list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
 msgstr "De inhoud van de takenlijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-#, fuzzy
-msgid "Cop_y memo list contents locally for offline operation"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
 msgstr "De inhoud van het memo's-lijst lokaal kopiëren voor offline gebruik"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Kleur:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Takenlijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Memo's-lijst"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Agenda-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Takenlijst-eigenschappen"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nieuwe memo's-lijst"
 
@@ -5963,8 +5874,7 @@ msgstr "Deze dagboekaantekening is gewijzigd."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr ""
-"%s  U heeft iets gewijzigd. Deze wijzigingen weggooien en de editor sluiten?"
+msgstr "%s  U heeft iets gewijzigd. Deze wijzigingen weggooien en de editor sluiten?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -5997,29 +5907,29 @@ msgstr " (Verloopt "
 msgid "Due "
 msgstr "Verloopdatum "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2861
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Bijgevoegd bericht - %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:2866
-#: ../composer/e-msg-composer.c:3062
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Bijgevoegd bericht"
 msgstr[1] "%d bijgevoegde berichten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3126
-#: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1743
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3128
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1745
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "_Slepen annuleren"
 
@@ -6027,7 +5937,7 @@ msgstr "_Slepen annuleren"
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2490
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6040,102 +5950,102 @@ msgid "Hide Attachment _Bar"
 msgstr "Bijlagenbal_k verbergen"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Bijlagenbal_k tonen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3624
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "_Verwijderen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3625 ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Eigenschappen"
 
 # bijlage toevoegen/bestand bijvoegen
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3627
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Bijlage toevoegen..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Bijlagen tonen"
 
 # te tonen/verbergen | aan/uit te zetten
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Druk op de spatiebalk om de bijlagenbalk te tonen|verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Afspraak bewerken"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bijeenkomst - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Toegewezen taak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekaantekening - %s"
 
 # samenvatting/onderwerp
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555 ../widgets/misc/e-attachment-bar.c:363
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bijlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2764
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
@@ -6151,10 +6061,6 @@ msgstr "Kan doel niet openen"
 msgid "Destination is read only"
 msgstr "Doel is alleen lezen"
 
-#: ../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 "De agendanotitie kon niet verwijderd worden door een CORBA-fout."
@@ -6173,8 +6079,7 @@ msgstr "Dit item kon niet verwijderd worden door een CORBA-probleem"
 
 #: ../calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
-msgstr ""
-"De agendanotitie kon niet verwijderd worden omdat u geen recht hiertoe heeft"
+msgstr "De agendanotitie kon niet verwijderd worden omdat u geen recht hiertoe heeft"
 
 # u geen recht hiertoe heeft
 #: ../calendar/gui/dialogs/delete-error.c:73
@@ -6220,11 +6125,11 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:560
 msgid "Appoint_ment"
 msgstr "_Afspraak"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:564
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Herhaling"
@@ -6241,7 +6146,7 @@ msgid "Cale_ndar:"
 msgstr "_Agenda:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6345,7 +6250,7 @@ msgstr "Aanpassen"
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
-#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2282
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388 ../mail/em-account-prefs.c:475
 #: ../mail/em-junk-hook.c:78
@@ -6395,13 +6300,17 @@ msgstr "_Omschrijving:"
 msgid "Event Description"
 msgstr "Agendanotitie omschrijving"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Locatie: "
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Samenvatting:"
 
 # de a wordt gebruikt voor _annuleren, de m bij omschrijving
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "Ala_rm"
 
@@ -6479,7 +6388,7 @@ msgstr "RSVP"
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -6584,13 +6493,11 @@ msgstr ""
 # Er wordt hier welke bedoeld ipv wat
 #: ../calendar/gui/dialogs/recur-comp.c:58
 msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr ""
-"U bent een zich herhalende taak aan het aanpassen. Welke wilt u aanpassen?"
+msgstr "U bent een zich herhalende taak aan het aanpassen. Welke wilt u aanpassen?"
 
 # Er wordt hier welke bedoeld ipv wat
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
 msgstr ""
 "U bent een zich herhalende dagboekaantekening aan het aanpassen. Welke wilt "
 "u aanpassen?"
@@ -6798,14 +6705,14 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Voltooid"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1017
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Hoog"
 
@@ -6820,14 +6727,14 @@ msgstr "In behandeling"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1015
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Laag"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normaal"
 
@@ -7028,7 +6935,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2832
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
@@ -7112,7 +7019,7 @@ msgstr "Vrij"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Bezig"
 
@@ -7126,17 +7033,17 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nee"
@@ -7147,21 +7054,21 @@ msgstr "Nee"
 #: ../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:1329
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:718
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Toegewezen"
 
@@ -7169,7 +7076,7 @@ msgstr "Toegewezen"
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1939
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr ""
 "Selecteer een map waarin de geselecteerde bijlagen in moeten worden "
@@ -7180,9 +7087,9 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1243
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Opslaan als..."
 
@@ -7249,25 +7156,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: ../calendar/gui/e-calendar-table.c:1105
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: ../calendar/gui/e-calendar-table.c:1242 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Open _website"
 
-#: ../calendar/gui/e-calendar-table.c:1244
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7275,44 +7182,44 @@ msgstr "Open _website"
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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 "K_nippen"
 
-#: ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Plakken"
 
-#: ../calendar/gui/e-calendar-table.c:1254 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: ../calendar/gui/e-calendar-table.c:1255 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1256
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: ../calendar/gui/e-calendar-table.c:1257
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: ../calendar/gui/e-calendar-table.c:1262
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: ../calendar/gui/e-calendar-table.c:1495
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
@@ -7347,107 +7254,107 @@ msgstr "Begindatum"
 msgid "Task sort"
 msgstr "Taken sorteren"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Verplaatsen van items"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopiëren van items"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Nieuwe _afspraak..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Nieuwe a_gendanotitie voor de hele dag"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nieuwe _bijeenkomst"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Nieuwe _taak"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Huidige weergave"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "_Selecteer vandaag"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecteer dag..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda _kopiëren..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Bijeenkomst delegeren..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst plannen..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Beantwoorden"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "_Allen beantwoorden"
 
 # instantie/gebeurtenis
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "_Maak deze instantie verplaatsbaar"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Verwijder deze instantie"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle instanties"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
 
 # hoe laat/tijd/wanneer
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tijd: %s %s"
@@ -7478,7 +7385,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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
@@ -7489,21 +7396,19 @@ msgstr "%02i minuten delingen"
 #. 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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1525
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:745 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
@@ -7615,7 +7520,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7629,7 +7534,7 @@ msgstr "Voorlopig geaccepteerd"
 # afgezegd/geweigerd/afgewezen
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7646,8 +7551,7 @@ msgstr ""
 
 # met punt op het einde
 #: ../calendar/gui/e-itip-control.c:1226
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
+msgid "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "De taak is geannuleerd, echter zij is niet in uw takenlijsten terug te "
 "vinden."
@@ -7850,8 +7754,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
+msgstr "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
@@ -7860,8 +7763,7 @@ msgstr "Bezoekerstatus ververst\n"
 #: ../calendar/gui/e-itip-control.c:1974
 #: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
+msgstr "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
@@ -7968,63 +7870,63 @@ msgid "Resources"
 msgstr "Hulpbronnen"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Persoon"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Groep"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Hulpbron"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Kamer"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Voorzitter"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Optionele deelnemer"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Niet-deelnemer"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Heeft actie nodig"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Voorlopig"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -8036,14 +7938,14 @@ msgid "Attendee                          "
 msgstr "Aanwezige                         "
 
 # bezig/in uitvoer
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "In uitvoer"
 
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -8051,87 +7953,87 @@ msgstr "%A, %d %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d-%m-%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d-%m-%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afwezig"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Aan_wezigen..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pties"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Alleen kantooruren t_onen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Uitge_zoomd tonen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "Vrij/Bezet _actualiseren"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Alle mensen en hulpbronnen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Alle _mensen en één hulpbron"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Vereiste mensen"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
 # geselecteerde memo's verwijderen/verwijder de ..
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Verwijder de geselecteerde memo's"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Klik hier om een memo toe te voegen"
 
@@ -8192,8 +8094,7 @@ msgstr "Selecteer een tijdzone"
 #. 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:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1509
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8343,11 +8244,6 @@ msgstr "iCalendar-informatie"
 msgid "You must be an attendee of the event."
 msgstr "U moet een bezoeker zijn van het evenement."
 
-#: ../calendar/gui/memos-component.c:450
-#, fuzzy
-msgid "_New Memo List"
-msgstr "Nieuwe memo's-lijst"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -8437,8 +8333,7 @@ msgstr ""
 #. FIXME: set proper domain/code
 #: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr ""
-"Het migreren van de oude instellingen van evolution/config.xmldb is mislukt"
+msgstr "Het migreren van de oude instellingen van evolution/config.xmldb is mislukt"
 
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
@@ -8754,7 +8649,7 @@ msgstr "Ta_kenlijst"
 msgid "Create a new task list"
 msgstr "Nieuwe takenlijst toevoegen"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8766,11 +8661,11 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
@@ -10366,7 +10261,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1022
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Bijlagenbalk"
 
@@ -10374,28 +10269,28 @@ msgstr "Bijlagenbalk"
 #: ../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
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan bestand %s niet bijvoegen: %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
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan bestand %s niet bijvoegen: geen normaal bestand"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Doel van bericht"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Kies een map waar het bericht geplaatst moet worden."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
@@ -10406,45 +10301,45 @@ msgstr "Klik hier voor het adresboek"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "A_ntwoordadres:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Van:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "_Onderwerp:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Aan:"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Geef de geadresseerden"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10457,15 +10352,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Versturen naar:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Versturen naar:"
 
@@ -10473,13 +10368,12 @@ msgstr "Versturen naar:"
 msgid "A_ttach"
 msgstr "_Bijlage toevoegen"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Bijlage invoegen"
 
 #: ../composer/e-msg-composer.c:828
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
 "dit account"
@@ -10493,13 +10387,13 @@ msgstr ""
 "ingesteld voor dit account"
 
 # sneltoets moet k zijn
-#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Bijlagenbal_k verbergen"
 
 # sneltoets moet k zijn
-#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Bijlagenbal_k tonen"
 
@@ -10525,23 +10419,23 @@ msgstr "Naamloos Bericht"
 msgid "Open File"
 msgstr "Bestand openen"
 
-#: ../composer/e-msg-composer.c:2162 ../mail/em-account-editor.c:606
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Automatisch gegenereerd"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "_Handtekening:"
 
 # een nieuw bericht opstellen/stel een nieuw bericht op
-#: ../composer/e-msg-composer.c:2533 ../composer/e-msg-composer.c:3752
-#: ../composer/e-msg-composer.c:3755
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Stel een nieuw bericht op"
 
 # # Het origineel heeft <b> in plaats van </b>
-#: ../composer/e-msg-composer.c:4979
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10573,8 +10467,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr ""
-"Vanwege &quot;{0}&quot; zult u mogelijk andere mail-opties moeten kiezen."
+msgstr "Vanwege &quot;{0}&quot; zult u mogelijk andere mail-opties moeten kiezen."
 
 # vanwege
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
@@ -10705,7 +10598,7 @@ msgstr "Bericht op_slaan"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10843,7 +10736,7 @@ msgstr ""
 "Als u een bericht ontvangt met een ongeldige aanvraag voor leestbevestiging, "
 "wat moet Evolution dan doen?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10851,7 +10744,7 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
@@ -10969,23 +10862,23 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Selecteer een tijd om mee te vergelijken"
 
-#: ../filter/filter-file.c:293 ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Belangrijk"
 
 #. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Te doen"
 
 #. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Later"
@@ -11036,11 +10929,11 @@ msgid "Include threads"
 msgstr "Discussies bijsluiten"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Inkomend"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:329
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Uitgaand"
 
@@ -11136,7 +11029,7 @@ msgstr "geleden"
 msgid "months"
 msgstr "maanden"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:180
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "seconden"
 
@@ -11169,10 +11062,8 @@ msgid "Composer Preferences"
 msgstr "Berichten opstellen"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
+msgid "Configure mail preferences, including security and message display, here"
+msgstr "Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
@@ -11208,7 +11099,7 @@ msgstr "Evolution configuratie voor opstellen van nieuw bericht"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-mail voorkeuren"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11337,7 +11228,7 @@ msgid "Protocol"
 msgstr "Protocol"
 
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Naamloos"
 
@@ -11518,7 +11409,7 @@ msgstr "Troep"
 msgid "Junk Test"
 msgstr "Troep test"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
 
@@ -11595,7 +11486,7 @@ msgstr "Start een programma"
 msgid "Score"
 msgstr "Score"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:56
 msgid "Sender"
 msgstr "Afzender"
 
@@ -11627,9 +11518,9 @@ msgstr "begint met"
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1659
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:14
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11718,50 +11609,50 @@ msgstr "Verzonden"
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Mailmappen-boom"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "verplaatsen map %s"
 
 # map wordt gekopieerd
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Bezig met kopiëren van map %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieerd naar map %s"
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet neerzetten in hoogste niveau-opslag"
 
-#: ../mail/em-folder-tree.c:984 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: ../mail/em-folder-tree.c:985 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
 # mappen in %s worden gescannd/doorzocht/gelezen
-#: ../mail/em-folder-tree.c:1690 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappen in \"%s\" worden doorzocht"
 
-#: ../mail/em-folder-tree.c:2049 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11769,28 +11660,28 @@ msgstr "Mappen in \"%s\" worden doorzocht"
 msgid "_View"
 msgstr "Beel_d"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "In _nieuw venster openen"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Kopiëren..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "_Verplaatsen..."
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: ../mail/em-folder-tree.c:2062 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "He_rnoemen..."
 
-#: ../mail/em-folder-tree.c:2067 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Prullenbak legen"
 
@@ -11799,13 +11690,13 @@ msgstr "_Prullenbak legen"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopiëren van `%s' naar `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Kopiëren"
 
@@ -11828,159 +11719,159 @@ msgstr "Map aanmaken"
 msgid "Specify where to create the folder:"
 msgstr "Geef aan waar de map moet komen:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "Be_werken als nieuw bericht..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Naar map _verplaatsen..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Als gelezen mar_keren"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Aanmerken als belan_grijk"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Aanmerken als _onbelangrijk"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Aanmerken als _troep"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Aanmerken als _geen-troep"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Aanmerken voor vervolg_actie..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Label"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Geen"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Aanmerken als voltooid"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Zoekmap op _onderwerp"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Zoekmap op afze_nder"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Zoekmap op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Zoekmap op mailing_lijst"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filter op onder_werp"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filter op af_zender"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filter op _geadresseerden"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filter op _mailinglijst"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1972 ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Standaard"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Bericht afdrukken"
 
-#: ../mail/em-folder-view.c:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Ophalen van bericht mislukt"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "Verwijzing _kopiëren"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "_Zoekmap aanmaken"
 
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "Van dit _adres"
 
-#: ../mail/em-folder-view.c:2471
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Naar dit adres"
 
-#: ../mail/em-folder-view.c:2825
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik hier om mail te versturen naar %s"
 
-#: ../mail/em-folder-view.c:2830
-msgid "Click to hide/unhide addresses"
-msgstr ""
-
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Zoekresultaten: %d"
 
 # Niet ondertekend of positief getal?
-#: ../mail/em-format-html-display.c:781 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Niet getekend"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11988,11 +11879,11 @@ msgstr ""
 "Dit bericht is niet ondertekend, Er kan niet worden aangetoond dat het "
 "authentiek is."
 
-#: ../mail/em-format-html-display.c:782 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Geldige handtekening"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12000,11 +11891,11 @@ msgstr ""
 "Dit bericht is geldig en is ondertekend, de afzender van dit bericht is zeer "
 "waarschijnlijk degene die hij claimt te zijn."
 
-#: ../mail/em-format-html-display.c:783 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Ongeldige handtekening"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12012,11 +11903,11 @@ msgstr ""
 "De handtekening van dit bericht kan niet worden geverifieerd, het is "
 "onderweg mogelijk gewijzigd."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12024,11 +11915,11 @@ msgstr ""
 "Dit bericht is ondertekend met een geldige handtekening maar de afzender van "
 "het bericht kan niet worden geverifieerd."
 
-#: ../mail/em-format-html-display.c:790 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Niet versleuteld"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12036,11 +11927,11 @@ msgstr ""
 "Dit bericht is niet versleuteld.  De inhoud van het bericht kan tijdens de "
 "weg die het over het internet aflegt, mogelijk door anderen gelezen worden."
 
-#: ../mail/em-format-html-display.c:791 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Versleuteld, zwak"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -12050,11 +11941,11 @@ msgstr ""
 "Het zal voor een buitenstaander moeilijk zijn, maar niet onmogelijk, om "
 "binnen een redelijke tijd de inhoud van dit bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:792 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12062,11 +11953,11 @@ msgstr ""
 "Dit bericht is versleuteld. Het zal voor een buitenstaander moeilijk zijn om "
 "de inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:793 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Versleuteld, sterk"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -12076,75 +11967,75 @@ msgstr ""
 "voor een buitenstaander zeer moeilijk zijn om binnen een redelijke tijd de "
 "inhoud van het bericht te ontcijferen."
 
-#: ../mail/em-format-html-display.c:894 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Dit certificaat is niet weer te geven"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Afgerond op %B %d, %Y, %l:%M %p"
 
 # overtijd
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Te laat:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "op %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "In bericht weerge_ven"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "Op _breedte passend"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "_Oorspronkelijke grootte"
 
-#: ../mail/em-format-html-display.c:1693 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bijlage"
 
 # in moeten worden opgeslagen / worden opgeslagen
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selecteer een map waarin de bijlagen moeten worden opgeslagen..."
 
 # "selectie opslaan" is in principe fout, maar we kijken aan of het problemen oplevert.
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Selectie opslaan..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d _bijlage"
 msgstr[1] "%d bijlagen"
 
-#: ../mail/em-format-html-display.c:2021 ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "Op_slaan"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "_Alles opslaan"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Geen bijlage"
 
@@ -12158,95 +12049,95 @@ msgstr "Pagina %d van %d"
 msgid "Retrieving `%s'"
 msgstr "Bezig met ophalen `%s'"
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Misvormd extern-berichtgedeelte."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Verwijzing naar FTP site (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Verwijzing naar lokaal bestand (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Verwijzing naar externe gegevens (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Bezig met opmaken van bericht"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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 "Van"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Antwoordadres"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Aan"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "E-mailprogramma"
 
 # a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 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:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../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 "Datum"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Nieuwsgroepen"
@@ -12296,7 +12187,7 @@ msgstr "Een keer per week"
 msgid "Once per month"
 msgstr "Een keer per maand"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12308,48 +12199,48 @@ msgstr ""
 "\n"
 "Een ogenblik geduld, uw mappen worden door Evolution gemigreerd..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kon nieuwe map `%s' niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Kon map `%s' niet kopiëren naar `%s': %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kon niet scannen voor bestaande mailboxen op `%s': %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kon oude POP3 op-server-houden data `%s' niet openen: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kon POP3 op-server-houden data-map `%s' niet aanmaken: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Kon POP3 op-server-houden data `%s' niet kopiëren: %s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Aanmaken van locate mail-opslag `%s' mislukt: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Kon locale mail-mappen niet maken op `%s': %s"
 
 # 'vorige versie' gebruikt ipv 'vorige installatie'
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12366,6 +12257,10 @@ msgstr "_Afzender beantwoorden"
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "Verwijzing in browser _openen"
+
 # verzenden naar...
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
@@ -12398,28 +12293,28 @@ msgstr "Selecteer een server"
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Dit bericht niet meer tonen."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Berichtenfilters"
 
-#: ../mail/em-utils.c:516 ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "bericht"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Bericht opslaan..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Adres toevoegen"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Berichten van %s"
@@ -12461,112 +12356,87 @@ msgid "Composer Window default width"
 msgstr "Standaardbreedte van venster bij het opmaken van nieuwe berichten"
 
 #: ../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 "Standaard tekenset voor het maken van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Standaard karakterset voor het opmaken van nieuwe berichten."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Standaard karakterset voor het weergegeven van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Standaard karakterset voor de weergave van berichten."
 
 # manier van doorsturen
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Standaard doorstuurstijl"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
-msgstr ""
-"Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
+msgstr "Standaard hoogte van het berichtvenster bij het maken van nieuwe berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Standaard hoogte van het bericht venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Standaard hoogte van het aanmeld venster"
 
 # standaard manier van antwoorden
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Standaard antwoordstijl"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
-msgstr ""
-"Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
+msgstr "Standaard breedte van berichtvenster bij het maken van nieuwe berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Standaard breedte van het bericht venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Standaard breedte van het aanmeld venster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Teken indicatoren voor verkeerd gespelde woorden als u typt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Prullenbakken legen bij afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Prullenbakken legen bij het afsluiten van Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Zet cursor mode aan zodat u een cursor kan zien bij het lezen van e-mail."
-
-#: ../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 ""
+msgstr "Zet cursor mode aan zodat u een cursor kan zien bij het lezen van e-mail."
 
 # cursor modus aan/uit
 # activeren/deactiveren
 # (de)activeren
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Aanzetten/uitzetten cursor mode"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Hoogte van het berichtenlijst paneel"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Hoogte van het berichtenlijst paneel."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -12574,7 +12444,7 @@ msgstr ""
 "Als een gebruiker 10 of meer berichten tegelijkertijd probeert te openen, "
 "vraag de gebruiker dan of hij dat werkelijk wilt doen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12585,23 +12455,23 @@ msgstr ""
 "weergave in de GNOME mime-type database gebruikt worden voor weergave van de "
 "inhoud."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "De laatste keer dat de prullenbak geleegd was"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Lijst met labels en de bijpassende kleuren"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Lijst met geaccepteerde licenties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Lijst met accounts"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12610,11 +12480,11 @@ msgstr ""
 "bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan /"
 "apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lijst van aangepaste koppen en of ze ingeschakeld zijn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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."
@@ -12623,21 +12493,21 @@ msgstr ""
 "lijst bestaat uit tekenreeksen met naam:kleur waarbij kleur in HTML hex-"
 "codering is."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lijst met mime-types die voor bonobo component weergave gecheckt moeten "
 "worden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Lijst met protocolnamen waarvan de licentie geaccepteerd is."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Laad afbeeldingen voor HTML berichten over http"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12648,105 +12518,98 @@ msgstr ""
 "Afbeeldingen ophalen als de afzender in het adresboek staat 2 - Altijd "
 "afbeeldingen van het internet ophalen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Filter acties bijhouden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Filter acties bijhouden in het gespecificeerde log bestand."
 
 # Logbestand waarin filteracties worden gelogt
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Logbestand voor filteracties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Markeer als gelezen na een bepaalde timeout"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Markeer als gelezen ne een bepaalde tijd."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markeer citaten in het bericht \"Voorbeeld\""
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markeer citaten in het bericht \"Voorbeeld\"."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Standaardhoogte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Berichtweergave (\"normal\", \"full headers\", \"source\")"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
-msgstr ""
-"Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
+msgstr "Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr ""
-"Minimumtijd tussen het legen van de prullenbak bij afsluiten, in dagen."
+msgstr "Minimumtijd tussen het legen van de prullenbak bij afsluiten, in dagen."
 
 # Nieuwe mail melding geluidsbestand
 # geluid voor/bij nieuw bericht
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Geluidsbestand bij melding van nieuw bericht"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Nieuwe mail meldingstype"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Waarschuwen wanneer geen onderwerp is ingevuld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Waarschuwen wanneer de gebruiker een map probeert op te ruimen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Waarschuw wanneer de gebruiker probeert om een bericht zonder onderwerp te "
 "versturen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Waarschuwen wanneer de gebruiker opruimt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Waarschuwen wanneer de gebruiker enkel het Bcc-veld invuld"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Waarschuwen wanneer de gebruiker 10 of meer berichten tegelijkertijd "
 "probeert te openen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -12754,94 +12617,91 @@ msgstr ""
 "Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
+msgstr "Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Waarschuw als de gebruiker ongewenste HTML probeert te versturen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Herkennen en vervangen van links in de text."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Herken smileys in de tekst en vervang deze met afbeeldingen."
 
 # arriverende/binnenkomende
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Binnenkomende berichten testen op troep"
 
 # standaard email als HTML versturen
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Standaard HTML e-mail verzenden"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Standaard HTML e-mail verzenden."
 
 # filmpjes weergeven
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Bewegende afbeeldingen tonen"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Bewegende afbeeldingen tonen als animaties"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Verwijderde berichten (doorgestreept) tonen in de berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Verwijderde berichten tonen in de berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Geluidsbestand afspelen bij binnenkomst van nieuwe e-mail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr ""
-"Geeft het type melding dat de gebruiker wenst te ontvangen bij nieuwe mail."
+msgstr "Geeft het type melding dat de gebruiker wenst te ontvangen bij nieuwe mail."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Spellingscontrole in bericht"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Standaardhoogte abonneren-dialoog"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Standaardbreedte abonneren-dialoog"
 
 # console ipv terminal?
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Terminal-lettertype"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr ""
-"De vorige keer dat de prullenbak werd geleegd, in dagen sinds de epoch."
+msgstr "De vorige keer dat de prullenbak werd geleegd, in dagen sinds de epoch."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Het terminal-lettertype voor de weergave van mail"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Het lettertype met variabele breedte voor weergave van berichten"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12853,106 +12713,100 @@ msgstr ""
 "XMLstructuur is &lt;kop enabled&gt;- stel enabled in als de kop weergeven "
 "moet worden in de mail weergave."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr ""
-
 # boomstructuur voor berichtenlijst
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Discussies tonen in berichtenlijst."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Discussies tonen in berichtenlijst"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Toon de berichtenlijst in draad vorm gebaseerd op onderwerp"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Timeout voor het markeren van berichten als gezien"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Timeout voor het markeren van berichten als gezien."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "UID tekenreeks van de standaard account."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Spamassassin daemon en cliënt gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Spamassassin daemon en cliënt gebruiken (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Aangepaste lettertypen gebruiken"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Aangepaste lettertypen gebruiken voor berichtweergave"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Gebruik alleen locale testen op spam."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Gebruik enkel de locale testen op spam (geen DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Lettertype met variabele breedte"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Beeld/Bcc menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "View/Bcc menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Beeld/Cc menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Beeld/Cc menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Beeld/From menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Beeld/From menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Beeld/PostNaar menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Beeld/PostNaar menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Beeld/AntwoordAan menu is aangevinkt"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Beeld/AntwoordAan menu is aangevinkt."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12991,7 +12845,7 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importprogramma voor Berkeley Mailbox-formaat"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren `%s'"
@@ -12999,7 +12853,7 @@ msgstr "Importeren `%s'"
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
 
@@ -13260,8 +13114,7 @@ msgstr "<b>_Talen</b>"
 
 #: ../mail/mail-config.glade.h:7
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr ""
-"<small>Dit zal het filter betrouwbaarder maken, maar ook trager</small>"
+msgstr "<small>Dit zal het filter betrouwbaarder maken, maar ook trager</small>"
 
 #: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -13639,8 +13492,7 @@ msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
 #: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr ""
-"Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
+msgstr "Waarschuwen wanneer berichten worden verstuurd met alleen _Bcc-ontvangers"
 
 #: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
@@ -13859,27 +13711,18 @@ msgid "_Show image animations"
 msgstr "_Bewegende afbeeldingen tonen"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "Beveiligde verbinding gebr_uiken:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Hetzelfde lettertype gebruiken als bij andere programma's"
 
-#: ../mail/mail-config.glade.h:177
-#, fuzzy
-msgid "addresses"
-msgstr "Adres"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "kleur"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "omschrijving"
 
@@ -13996,21 +13839,21 @@ msgstr "met alle lokale folders"
 msgid "Pinging %s"
 msgstr "Pingen van %s"
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Map wordt gefilterd"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fout bij het toepassen van uitgaande filters: %s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14019,114 +13862,124 @@ msgstr ""
 "Toevoegen aan %s mislukt: %s\n"
 "In plaats daarvan toevoegen aan lokale `Verzonden'-map."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fout bij toevoegen aan lokale `Verzonden'-map: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Het versturen van %d van de %d berichten is mislukt"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Geannuleerd."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Voltooid."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Opruimen en opslaan van account '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Bezig met opslaan account '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ophalen van bericht %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ophalen van %d bericht"
 msgstr[1] "Ophalen van %d berichten"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Opslaan van %d bericht"
 msgstr[1] "Opslaan van %d berichten"
 
-#: ../mail/mail-ops.c:2013
+# dit moet kort anders wordt het afgekort met ...
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14135,11 +13988,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14148,22 +14001,22 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Dienst wordt gecontroleerd"
 
@@ -14191,29 +14044,18 @@ msgstr "Aan het Wachten ..."
 msgid "Checking for new mail"
 msgstr "Controleren op nieuwe e-mail"
 
-#: ../mail/mail-session.c:205
-#, fuzzy, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Voer uw wachtwoord in voor %s"
-
-# wachtwoord invoeren
-#: ../mail/mail-session.c:207
-#, fuzzy
-msgid "Enter Passphrase"
-msgstr "Voer wachtwoord in"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
 
 # wachtwoord invoeren
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Gebruiker heeft actie afgebroken."
 
@@ -14281,8 +14123,7 @@ msgid "New Search Folder"
 msgstr "Nieuwe zoekmap"
 
 #: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Een map genaamd &quot;{1}&quot; bestaat al. Gebruik een andere naam."
 
 #: ../mail/mail.error.xml.h:2
@@ -14330,8 +14171,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Weet u zeker dat u dit account wilt verwijderen?"
 
 #: ../mail/mail.error.xml.h:10
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Weet u zeker dat u dit account en al haar proxies wilt verwijderen?"
 
 #: ../mail/mail.error.xml.h:11
@@ -14361,8 +14201,7 @@ msgstr "Weet u zeker dat een bericht in HTML-formaat wilt versturen?"
 
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Weet u zeker dat u een bericht met enkel BCC-geadresseerden wilt versturen?"
+msgstr "Weet u zeker dat u een bericht met enkel BCC-geadresseerden wilt versturen?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
@@ -14553,8 +14392,7 @@ msgstr ""
 # doorgaat/verdergaat/doorzet
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Indien u verdergaat, zullen alle proxy-accounts definitief worden verwijderd."
+msgstr "Indien u verdergaat, zullen alle proxy-accounts definitief worden verwijderd."
 
 # als
 #: ../mail/mail.error.xml.h:59
@@ -14568,8 +14406,7 @@ msgstr ""
 # als
 #: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Indien u verdergaat, zal de account-informatie definitief worden verwijderd."
+msgstr "Indien u verdergaat, zal de account-informatie definitief worden verwijderd."
 
 #: ../mail/mail.error.xml.h:62
 msgid ""
@@ -14777,10 +14614,8 @@ msgstr ""
 # maar het is duidelijker als er staat dat het adresveld leeg is.
 # verzendadres/adres
 #: ../mail/mail.error.xml.h:107
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"Dit bericht kan niet worden verzonden omdat u geen adres heeft ingevuld"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Dit bericht kan niet worden verzonden omdat u geen adres heeft ingevuld"
 
 #: ../mail/mail.error.xml.h:108
 msgid ""
@@ -14861,8 +14696,7 @@ msgstr ""
 # BUG? twee keer "{0}" in bericht?
 #: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Uw aanmelding bij uw server &quot;{0}&quot; als &quot;{0}&quot; is mislukt."
+msgstr "Uw aanmelding bij uw server &quot;{0}&quot; als &quot;{0}&quot; is mislukt."
 
 #: ../mail/mail.error.xml.h:124
 msgid "_Append"
@@ -14881,74 +14715,74 @@ msgstr "_Leegmaken"
 msgid "_Open Messages"
 msgstr "Berichten _openen"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Gelezen"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Laagste"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Laag"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Hoog"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Hoogste"
 
-#: ../mail/message-list.c:1359 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: ../mail/message-list.c:1375 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: ../mail/message-list.c:1387 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1397 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Berichten"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -14976,7 +14810,7 @@ msgstr "Oorspronkelijke locatie"
 msgid "Received"
 msgstr "Ontvangen"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Grootte"
@@ -15124,10 +14958,8 @@ msgstr "Automatische contacten"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
-msgstr ""
-"_Automatisch kaarten aanmaken in het adresboek bij het beantwoorden van mail"
+msgid "_Automatically create entries in the addressbook when responding to mail"
+msgstr "_Automatisch kaarten aanmaken in het adresboek bij het beantwoorden van mail"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
@@ -15135,8 +14967,7 @@ msgstr "Contacten voor expresberichten"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
+msgid "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
 "Periodiek de contactinformatie en afbeeldingen synchroniseren uit de "
 "buddylijst van gaim"
@@ -15251,6 +15082,10 @@ msgstr ""
 "Een test-plugin dat een popup-munu plugin toont waarmee u dingen naar het "
 "klembord kunt kopiëren."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "E-mail_adres kopiëren"
+
 # kopieren-tool/kopie-tool
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -15261,8 +15096,7 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Controleren of Evolution het standaard mailprogramma is"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Elke keer als Evolution wordt opgestart, controleren of het het standaard "
 "mailprogramma is."
@@ -15440,8 +15274,7 @@ msgstr ""
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
 msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr ""
-"De twee wachtwoorden zijn niet gelijk.  Voer de wachtwoorden nogmaals in."
+msgstr "De twee wachtwoorden zijn niet gelijk.  Voer de wachtwoorden nogmaals in."
 
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:3
 msgid "Confirm Password:"
@@ -15744,10 +15577,9 @@ msgid "Cannot display folders."
 msgstr "Kan mappen niet weergeven."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-#, fuzzy
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr ""
 "Wijzigingen in de configuratie van het Exchange-account zullen pas effect "
 "hebben nadat u Evolution afsluit en opnieuw opstart."
@@ -15915,8 +15747,7 @@ msgid "Password successfully changed."
 msgstr "Wachtwoord is gewijzigd."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-#, fuzzy
-msgid "Please restart Evolution for changes to take effect"
+msgid "Please restart Evolution"
 msgstr "Start Evolution opnieuw op"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
@@ -16002,8 +15833,7 @@ msgstr "U kunt niet van uzelf uw eigen gedelegeerde maken"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr ""
-"U heeft uw quotum overschreden voor het opslaan van berichten op deze server."
+msgstr "U heeft uw quotum overschreden voor het opslaan van berichten op deze server."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You may only configure a single Exchange account."
@@ -16261,8 +16091,7 @@ msgstr "Het tabblad proxy is alleen beschikbaar wanneer het account online is."
 # ingesteld/actief gemaakt/geactiveerd/aangezet
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
-msgstr ""
-"Het tabblad proxy is alleen beschikbaar wanneer het account is geactiveerd."
+msgstr "Het tabblad proxy is alleen beschikbaar wanneer het account is geactiveerd."
 
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
@@ -16313,12 +16142,12 @@ msgid "Select Calendar"
 msgstr "Agenda selecteren"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importeren"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar formaat (.ics)"
 
@@ -16360,8 +16189,7 @@ msgstr "Kon adresboek niet openen!"
 
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
-msgstr ""
-"Kon het Evolution adresboek niet openen voor het exporteren van gegevens."
+msgstr "Kon het Evolution adresboek niet openen voor het exporteren van gegevens."
 
 # todo/te doen/actielijst
 #: ../plugins/ipod-sync/sync.c:291
@@ -16370,8 +16198,7 @@ msgstr "Kon agenda/actielijst niet openen!"
 
 #: ../plugins/ipod-sync/sync.c:292
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr ""
-"Kon de Evolution agenda/actielijst niet openen om gegevens te exporteren."
+msgstr "Kon de Evolution agenda/actielijst niet openen om gegevens te exporteren."
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
@@ -16456,8 +16283,7 @@ msgstr "Kon het annuleringsbericht voor de gedelegeerde niet verzenden"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Aanwezigheidsstatus kon niet ververst worden omdat de status ongeldig is"
+msgstr "Aanwezigheidsstatus kon niet ververst worden omdat de status ongeldig is"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
@@ -16522,8 +16348,7 @@ msgstr "Dubbele afspraken zoeken"
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
-msgstr ""
-"Selecteer de agenda's waarbinnen naar dubbele afspraken moet worden gezocht"
+msgstr "Selecteer de agenda's waarbinnen naar dubbele afspraken moet worden gezocht"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
@@ -16671,8 +16496,7 @@ msgstr "%A, %B %e, %Y %l:%M:%S %p"
 #: ../plugins/itip-formatter/itip-view.c:344
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
-msgstr ""
-"<b>%s</b> heeft via %s de volgende bijeenkomstgegevens beschikbaar gesteld:"
+msgstr "<b>%s</b> heeft via %s de volgende bijeenkomstgegevens beschikbaar gesteld:"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
@@ -16711,8 +16535,7 @@ msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr ""
 "<b>%s</b> wil graag de laatste informatie ontvangen voor de volgende "
 "bijeenkomst:"
@@ -16918,10 +16741,9 @@ msgid "Itip Formatter"
 msgstr "Itip-formattering"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, fuzzy
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; heeft de bijeenkomst gedelegeerd. Wilt u de gedelegeerde "
 "&quot;{1}&quot; toevoegen?"
@@ -16931,8 +16753,7 @@ msgid "This meeting has been delegated"
 msgstr "Deze bijeenkomst is gedelegeerd"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een van de huidige aanwezigen. De afzender "
 "toevoegen als aanwezige?"
@@ -16969,8 +16790,7 @@ msgid "No store available"
 msgstr "Geen opslag beschikbaar"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Een plugin dat een CORBA-interface biedt voor het toegankelijk maken van e-"
 "mail op afstand."
@@ -17140,8 +16960,7 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
-"Dit bericht bevat de header-informatie niet die vereist is voor deze actie."
+msgstr "Dit bericht bevat de header-informatie niet die vereist is voor deze actie."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -17153,8 +16972,7 @@ msgstr "Bericht v_ersturen"
 
 #: ../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 ""
-"Contact opnemen met de eigenaar van de mailinglijst waar dit bericht bijhoort"
+msgstr "Contact opnemen met de eigenaar van de mailinglijst waar dit bericht bijhoort"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get an archive of the list this message belongs to"
@@ -17162,8 +16980,7 @@ msgstr "Een archief ophalen van de lijst waar dit bericht bijhoort"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
 msgid "Get information about the usage of the list this message belongs to"
-msgstr ""
-"Informatie ophalen over het gebruik van de lijst waar dit bericht bijhoort"
+msgstr "Informatie ophalen over het gebruik van de lijst waar dit bericht bijhoort"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
@@ -17228,8 +17045,7 @@ msgstr "Nieuwe mail melden"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr ""
-"Een plugin waarmee u kunt beheren welke plugins wel of niet worden gebruikt."
+msgstr "Een plugin waarmee u kunt beheren welke plugins wel of niet worden gebruikt."
 
 # beheerder
 #. Setup the ui
@@ -17464,12 +17280,12 @@ msgstr "Alle bijlagen opslaan"
 msgid "Select save base name"
 msgstr "Selecteer opslaan basisnaam"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "MIME-type"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Opslaan"
 
@@ -17584,7 +17400,7 @@ msgid "RDF format (.rdf)"
 msgstr "RDF-formaat (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Doelbestand selecteren"
 
@@ -17635,18 +17451,18 @@ msgstr ""
 "Klik op \"Volgende\" om te beginnen."
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Kies de informatie die u zou willen importeren:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Gegevens importeren."
 
@@ -17713,16 +17529,14 @@ msgstr "Standaard vensterbreedte"
 
 #: ../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 ""
-"ID of alias van het component dat bij het opstarten moet worden weergegeven."
+msgstr "ID of alias van het component dat bij het opstarten moet worden weergegeven."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Laatst bijgewerkte configuratieversie"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:9
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Lijst met paden voor de mappen die gesynchroniseerd dienen te worden voor "
 "offline gebruik"
@@ -17739,16 +17553,11 @@ msgstr "Zijbalk is zichtbaar"
 msgid "Skip development warning dialog"
 msgstr "Waarschuwingsdialoog voor instabiele versie overslaan"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:470
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Statusbar is visible"
-msgstr "Zijbalk is zichtbaar"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -17756,19 +17565,19 @@ msgstr ""
 "De configuratieversie van Evolution, met major/minor/configuratieniveau "
 "(bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "De standaardhoogte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "De standaardbreedte van het hoofdvenster in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "De standaardbreedte van de zijbalk in pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17776,7 +17585,7 @@ msgstr ""
 "De laatst bijgewerkte configuratieversie van Evolution, met major/minor/"
 "configuratieniveau (bijvoorbeeld \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17786,47 +17595,41 @@ msgstr ""
 "\"toolbar\". Indien \"toolbar\" wordt gebruikt, wordt de stijl bepaald door "
 "de instelling van GNOME voor werkbalken."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Werkbalk is zichtbaar"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Of Evolution opstart in offline-modus in plaats van online-modus."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Of het venster gemaximaliseerd moet zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Of de zijbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-#, fuzzy
-msgid "Whether the status bar should be visible."
-msgstr "Of de werkbalk zichtbaar is."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Of de werkbalk zichtbaar is."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Of het waarschuwingsdialoog voor de ontwikkelingsversies van Evolution wordt "
 "overgeslagen."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Of de vensterknoppen zichtbaar zijn."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Vensterknoppenstijl"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Vensterknoppen zijn zichtbaar"
 
@@ -17847,11 +17650,11 @@ msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 msgid "(Untitled)"
 msgstr "(Naamloos)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Kies welk type importeerfilter u wilt gebruiken:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17865,12 +17668,12 @@ msgstr ""
 "U kunt \"Automatisch\" kiezen als u het niet weet; Evolution probeert het "
 "dan voor u uit te zoeken."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Kies de doel map voor deze import"
 
 # vrij vertaald
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17882,23 +17685,23 @@ msgstr ""
 "Er zijn echter niets gevonden dat geïmporteerd konden worden.\n"
 "Indien u het nogmaals wilt proberen klikt u op \"Terug\".\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "B_estandsnaam:"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "Bestands_type:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Informatie en instellingen importeren van _oudere programma's"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Een enkel bestand i_mporteren"
 
@@ -18086,7 +17889,7 @@ msgstr ""
 "van externe bestanden in Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18123,7 +17926,7 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18131,42 +17934,37 @@ msgstr ""
 "Bedankt!\n"
 "Het Evolution team\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution met activatie van het gespecificeerde component"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
 # geforceerd laten stoppen/doen stoppen
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Alle componenten van Evolution geforceerd laten stoppen"
 
 # Geforceerd migreren van Evolution 1.4
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Geforceerd opnieuw migreren vanuit Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Verzend de debug-uitvoer van alle componenten naar een bestand."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Het laden van plugins deactiveren."
 
-#: ../shell/main.c:515
-#, fuzzy
-msgid "- The Evolution PIM and Email Client"
-msgstr "Het Evolution PIM en e-mailprogramma"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18585,8 +18383,7 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "U hebt certificaten van deze organisaties die u indentificeren:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "U hebt certificaten in uw bestand die deze certificaat authoriteiten "
 "identificeren:"
@@ -18944,7 +18741,7 @@ msgid "Select All"
 msgstr "Alles selecteren"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "_Alles selecteren"
@@ -19080,7 +18877,6 @@ msgid "Month"
 msgstr "Maand"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Volgende"
 
@@ -19089,7 +18885,7 @@ msgid "Previews the calendar to be printed"
 msgstr "Geeft een afdrukvoorbeeld van de agenda"
 
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Vorige"
 
@@ -19177,11 +18973,11 @@ msgstr "De selectie naar het klembord knippen"
 msgid "Paste from clipboard"
 msgstr "Plakken vanuit klembord"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "De tekst vanaf het klembord plakken"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Alle tekst selecteren"
 
@@ -19217,31 +19013,30 @@ msgstr "Klik hier om de hulp weer te geven"
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "I_nvoegen"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Bijlage..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "Sl_uiten"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hulp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Invoegen"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Opties"
@@ -19348,11 +19143,6 @@ msgstr "Schakelt de weergave van tijd die bezet is aan/uit"
 msgid "_Alarms"
 msgstr "_Alarmeringen"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Categorieën"
-
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
@@ -19519,8 +19309,7 @@ msgid "Hide _Read Messages"
 msgstr "Ge_lezen berichten verbergen"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Weggegooide berichten verbergen in plaats van ze te laten zien met een "
 "streep erdoor"
@@ -19557,8 +19346,7 @@ msgstr "Selecteer alle en alleen de berichten die nu niet zijn geselecteerd"
 
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
-msgstr ""
-"Selecteer alle berichten in dezelfde discussie als het geselecteerde bericht"
+msgstr "Selecteer alle berichten in dezelfde discussie als het geselecteerde bericht"
 
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
@@ -19753,8 +19541,7 @@ msgstr "Afbeeldingen in HTML-berichten altijd laden"
 
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr ""
-"Het geselecteerde bericht doorsturen in de inhoud van een nieuw bericht"
+msgstr "Het geselecteerde bericht doorsturen in de inhoud van een nieuw bericht"
 
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
@@ -20124,6 +19911,11 @@ msgstr "Ontvang een leesbevestiging wanneer uw bericht wordt gelezen"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "I_nvoegen"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Bestand openen"
@@ -20773,19 +20565,14 @@ msgstr "Soort weergave"
 msgid "Type of view:"
 msgstr "Soort weergave:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Probeer bijlage automatisch weer te geven"
-
 #. 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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20855,7 +20642,7 @@ msgstr "Minimumbreedte"
 
 # saptiering
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Ruimtes"
 
@@ -20998,23 +20785,23 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Uitvouwen"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Of de uitvouwer uitgevouwd moet zijn"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Labeltekst van de uitvouwer"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Gebruik onderstrepen"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
@@ -21022,32 +20809,31 @@ msgstr ""
 "Indien ingesteld, geeft een onderstreping in de tekst aan dat het opvolgende "
 "teken gebruikt moet worden voor de sneltoets"
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "De ruimte tussen het label en de dochter"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Labelwidget"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
-msgstr ""
-"Een widget dat wordt weergegeven in plaats van het gebruikelijke uitvouwlabel"
+msgstr "Een widget dat wordt weergegeven in plaats van het gebruikelijke uitvouwlabel"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Uitvouwer-grootte"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Grootte van de uitvouwpijl"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Indicator ruimtes"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Spatiëring rondom uitvouwpijl"
 
@@ -21134,39 +20920,38 @@ msgstr "Kolombreedte"
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Nu _zoeken"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Wissen"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Zoektype"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "Item ID"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "Subitem ID"
 
-#: ../widgets/misc/e-search-bar.c:911 ../widgets/text/e-entry.c:1249
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
 #: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Tekst"
 
-#: ../widgets/misc/e-search-bar.c:992
-#, fuzzy
-msgid "Find No_w"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
 msgstr "_Nu zoeken"
 
 #: ../widgets/misc/e-selection-model-array.c:547
@@ -21885,22 +21670,3 @@ msgstr "IM Omgeving"
 msgid "Handle Popup"
 msgstr "Sleepbalkpopup"
 
-#~ msgid "Video Conferencing"
-#~ msgstr "Video conferentie"
-
-#~ msgid "WWW"
-#~ msgstr "WWW"
-
-#~ msgid "Locat_ion:"
-#~ msgstr "_Locatie: "
-
-# dit moet kort anders wordt het afgekort met ...
-#~ msgid ""
-#~ "Unable to create output file: %s\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Kon uitvoerbestand niet maken: %s\n"
-#~ " %s"
-
-#~ msgid "_Insert"
-#~ msgstr "_Invoegen"
diff --git a/po/nn.po b/po/nn.po
index f3288a3e68..d30a8e48cc 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-14 12:52+0200\n"
-"PO-Revision-Date: 2006-04-14 13:06+0200\n"
+"POT-Creation-Date: 2006-04-14 17:38+0200\n"
+"PO-Revision-Date: 2006-04-14 12:50+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
@@ -38,12 +38,12 @@ msgstr "Ny kontakt"
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "noverande adressebokmappe %s har %d kort"
-msgstr[1] "noverande adressebokmappe %s har %d kort"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "noverande adressebokmappe har %d kort"
+msgstr[1] "noverande adressebokmappe har %d kort"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -406,8 +406,10 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution-adresseboka har avslutta uventa."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Biletet du har valt er stort. Vil du endra biletets storleik og lagra det?"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid ""
@@ -486,7 +488,8 @@ msgid ""
 msgstr "Du har endra denne kontakten. Vil du lagra endringane?"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr ""
 "Kontaktane dine for {0} vil ikkje vera tilgjengelege før Evolution vert "
 "starta på nytt."
@@ -647,7 +650,8 @@ msgstr "Lag ei ny adressebok"
 
 #: ../addressbook/gui/component/addressbook-component.c:406
 msgid "Failed upgrading Address Book settings or folders."
-msgstr "Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
+msgstr ""
+"Klarte ikkje å oppgradera innstillingane eller mappene til adresseboka."
 
 #: ../addressbook/gui/component/addressbook-config.c:329
 #, fuzzy
@@ -798,10 +802,10 @@ msgstr "_Ny adressebok"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../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"
@@ -827,7 +831,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
@@ -957,7 +961,8 @@ msgid "Email address"
 msgstr "E-postadresse"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kjem til å bruka denne e-postaddressa til å autentisera deg mot "
 "tenaren."
@@ -1068,7 +1073,7 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "Søkjebasen er det eintydige namnet (DN) på oppføringa der søka dine vil "
-"starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
+"starta. Dersom du let denne stå blank, vil søka byrja ved rota av "
 "katalogtreet."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
@@ -1208,6 +1213,7 @@ msgstr "minutt"
 #: ../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
@@ -2533,15 +2539,15 @@ msgstr "Endra"
 msgid "Contact Editor - %s"
 msgstr "Kontaktredigering - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Vel eit bilete til denne kontakten"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Ikkje noko bilete"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2549,7 +2555,7 @@ msgstr ""
 "Kontaktdata er ugyldig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ugyldig kontakt."
 
@@ -2577,7 +2583,7 @@ msgstr "_Vel adressebok"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontaktlista (%s)?"
@@ -2594,7 +2600,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Er du sikker på at du vil\n"
 "sletta kontakten (%s)?"
@@ -2891,8 +2897,8 @@ msgstr "Lagra som VCard ..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Opna"
@@ -2949,13 +2955,13 @@ msgstr "Klipp u_t"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Kopier"
@@ -3964,7 +3970,8 @@ msgid "Export in asynchronous mode"
 msgstr "Eksporter i asynkron modus"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr "Talet på kort i ei utfil i asynkron modus, vanleg er 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -3972,7 +3979,8 @@ msgid "NUMBER"
 msgstr "TAL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "Feil i kommandolinjeargumenta. Bruk --help for å sjå ein hjelpetekst."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4015,7 +4023,8 @@ msgstr ""
 msgid ""
 "Adding a meaningful summary to your task will give your recipients an idea "
 "of what your task is about."
-msgstr "Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
+msgstr ""
+"Eit meiningsfullt samandrag vil fortelja mottakarane kva oppgåva handlar om."
 
 #: ../calendar/calendar.error.xml.h:3
 msgid ""
@@ -4026,7 +4035,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr ""
 "All informasjonen i denne journalen vil verta sletta, og kan ikkje "
 "gjenopprettast."
@@ -4046,7 +4056,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om denne avtalen vil verta sletta og kan ikkje "
 "gjenopprettast."
@@ -4060,7 +4071,8 @@ msgstr ""
 "gjenopprettast."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "All informasjonen om dette møtet vil verta sletta, og kan ikkje "
 "gjenopprettast."
@@ -4100,17 +4112,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Er du sikker på at du vil sletta denne avtalen?"
 
 #: ../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 "Er du sikker på at du vil sletta denne journaloppføringa?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Er du sikker på at du vil sletta dette møtet?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil sletta denne oppgåva?"
 
@@ -4163,7 +4172,8 @@ msgstr ""
 "høve til å godta denne oppgåva."
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "E-post-invitasjonar vil verta sendt til alle deltakarane, som óg vil verta "
 "bedne om å svara."
@@ -4200,7 +4210,9 @@ msgstr ""
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
-msgstr "Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre deltakarane veit at oppgåva er sletta."
+msgstr ""
+"Viss du ikkje sender eit avlysingsvarsel er det ikkje sikkert at dei andre "
+"deltakarane veit at oppgåva er sletta."
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4544,7 +4556,7 @@ msgstr "Tid alarmen skal utsetjast:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4670,7 +4682,8 @@ msgstr "Be om stadfesting når oppføringar vert sletta"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
-msgstr "Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
+msgstr ""
+"Bakgrunnsfarge på oppgåver som skal vera ferdige i dag, i «#rrggbb»-format."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
@@ -4681,7 +4694,8 @@ msgid "Calendars to run alarms for"
 msgstr "Kalender å køyra alarmar for"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "Farge å teikna Marcus Bains-linja i tidslinja (tom for standard)"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -4933,7 +4947,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Einingar for standard påminnar, «minutt», «timar» eller «dagar»."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr ""
 "Einingar for å avgjera når oppgåver skal gøymast, «minutt», «timar» eller "
 "«dagar»"
@@ -4975,8 +4990,10 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "Om sluttidspunkt for avtalar i veke- og månadsframsyning skal visast."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
-msgstr "Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+msgstr ""
+"Om Marcus Bains-linja (linje som markerer «no») skal teiknast i kalenderen."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
@@ -4988,7 +5005,8 @@ msgstr "Om avtalar skal ha ei standardpåminning."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
+msgstr ""
+"Om svar etterlyst-feltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
@@ -5003,7 +5021,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Om statusfeltet skal visast i hending/oppgåve/møte-redigeringa"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timarsformat."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
@@ -5350,18 +5369,19 @@ msgstr "Alarmar"
 #: ../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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
-msgstr "_Foreslå automatisk framsyning av vedlegget"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
+msgstr "Foreslå automatisk framsyning av vedlegget"
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Legg ved filer"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Vedleggseigenskapar"
@@ -5370,19 +5390,19 @@ msgstr "Vedleggseigenskapar"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Skildring:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Filnamn:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "MIME-type:"
@@ -5407,7 +5427,8 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u og %d vil bytast ut med brukar og domene frå e-post-adressa.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
@@ -5748,7 +5769,8 @@ msgstr "Journalopføringa er endra."
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
+msgstr ""
+"%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
@@ -5797,7 +5819,7 @@ msgstr[1] "%d vedlagte meldingar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Flytt"
 
@@ -5930,10 +5952,6 @@ msgstr "Klarte ikkje opna mål"
 msgid "Destination is read only"
 msgstr "Målet er skrivebeskytta"
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Sletta dette elementet frå alle dei andre mottakarane sine postkassar?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
@@ -6344,8 +6362,10 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Du endrar ei oppgåve som skal gjerast fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
+msgstr ""
+"Du endrar ei journaloppføring som står fleire gongar. Kva vil du endra?"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
@@ -6365,7 +6385,8 @@ msgstr "Alle instansane"
 
 #: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
+msgstr ""
+"Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
 #: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
@@ -6538,7 +6559,7 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Ferdig"
@@ -6763,7 +6784,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjend utløysartype"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
@@ -6846,7 +6867,7 @@ msgstr "Ledig"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Oppteke"
 
@@ -6862,15 +6883,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nei"
@@ -6881,8 +6902,8 @@ msgstr "Nei"
 #: ../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:1309
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6912,9 +6933,9 @@ msgstr "Vel mappe å lagra utvalde vedlegg i..."
 msgid "untitled_image.%s"
 msgstr "bilete_utan_namn.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
@@ -6981,25 +7002,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -7007,44 +7028,44 @@ msgstr "_Opna nettside"
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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 "Kl_ipp ut"
 
-#: ../calendar/gui/e-calendar-table.c:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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 "_Lim inn"
 
-#: ../calendar/gui/e-calendar-table.c:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
@@ -7079,105 +7100,105 @@ msgstr "Startdato"
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Flyttar meldingar"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Kopierer element"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nytt _møte"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Ny _oppgåve"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Aktiv framsyning"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Vel _i dag"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Vel dato ..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_er til kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _kalender ..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Deleger møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: ../calendar/gui/e-calendar-view.c:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Gjer denne førekomsten _flyttbar"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7344,7 +7365,7 @@ msgstr ""
 
 #: ../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/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7357,7 +7378,7 @@ msgstr "Mellombels godteke"
 
 #: ../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/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7370,7 +7391,8 @@ msgid ""
 msgstr "Møtet er avlyst, men det var ikkje ført opp i kalenderane dine"
 
 #: ../calendar/gui/e-itip-control.c:1226
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "Oppgåva er avlyst, men ho var ikkje ført opp i oppgåvelistene dine"
 
 #: ../calendar/gui/e-itip-control.c:1305
@@ -7528,7 +7550,8 @@ msgstr "Ledig/oppteken-førespurnad"
 #: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
+msgstr ""
+"<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
 #: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
@@ -7570,7 +7593,8 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
+msgstr ""
+"Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
 #: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
@@ -7579,7 +7603,8 @@ msgstr "Deltakarstatus oppdatert\n"
 #: ../calendar/gui/e-itip-control.c:1974
 #: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
+msgstr ""
+"Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
 #: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
@@ -7684,63 +7709,63 @@ msgid "Resources"
 msgstr "Ressursar"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Ressurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Rom"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Møteleiar"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Deltakar som må vera med"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Krev handling"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Mellombels"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7751,14 +7776,14 @@ msgstr "Delegert"
 msgid "Attendee                          "
 msgstr "Deltakar                          "
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Under prossering"
 
 #. 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d. %B, %Y"
 
@@ -7766,78 +7791,78 @@ msgstr "%A, %d. %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute av kontoret"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "_Deltakarar ..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_Val"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Vis berre _arbeidstid"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "_Påkravde deltakarar"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Påkravde folk _og ein ressurs"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "_Slutt-tid:"
 
@@ -10190,7 +10215,8 @@ msgid "Insert Attachment"
 msgstr "Sett inn vedlegg"
 
 #: ../composer/e-msg-composer.c:828
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Kan ikkje signera utgåande melding. Ingen signeringssertifikat til denne "
 "kontoen"
@@ -10396,11 +10422,11 @@ msgstr "_Lagra melding"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Gruppevarepakke"
 
@@ -10517,7 +10543,8 @@ msgstr "Bortsett frå viss meldinga er til e postliste og ikkje berre til meg"
 msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
-msgstr "Kva skal Evolution gjera når du får ei melding som ber om lesekvittering?"
+msgstr ""
+"Kva skal Evolution gjera når du får ei melding som ber om lesekvittering?"
 
 #: ../e-util/e-dialog-utils.c:281
 msgid ""
@@ -10842,7 +10869,8 @@ msgid "Composer Preferences"
 msgstr "Redigeringsinstillingar"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsframsyning"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -10877,7 +10905,7 @@ msgstr "Evolution oppsettkontroll for e-postredigering"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution e-postinnstillingskontroll"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11449,13 +11477,13 @@ msgstr "_Tøm papirkorga"
 msgid "Copying `%s' to `%s'"
 msgstr "Kopierer «%s» til «%s»"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "K_opier"
 
@@ -11477,143 +11505,143 @@ msgstr "Lag ei ny mappe"
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Merk som _ulesen"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Marker som _skrot"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Marker som _ikkje skrot"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Marker for _oppfølging..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Merkelapp"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "I_ngen"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Søkjemappe på _emne"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Søkjemapppe frå av_sendar"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Søkjemappe på _mottakar"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Søkjemappe på på e-post_liste"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "Forvald"
 
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2111
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: ../mail/em-folder-view.c:2272
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "Kunne ikkje henta melding"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
 msgstr "_Kopier lenkjeadresse"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "Lag ny _søkjemappe"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_Frå denne adressa"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "_Til denne adressa"
 
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å senda e-post til %s"
@@ -12239,7 +12267,8 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
-msgstr "Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
+msgstr ""
+"Liste over MIME-typar som skal bruka bonobo-komponent-framsynarar om mogleg"
 
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
@@ -12305,11 +12334,13 @@ msgstr "Korleis meldingar vert viste («normal», «full headers», «source»)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
-msgstr "Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
+msgstr ""
+"Minste tal på dagar mellom kvar gong papirkorga vert tømt når du avsluttar"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
+msgstr ""
+"Minste tid mellom kvar gong papirkorga vert tømt når du avsluttar, i dagar."
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
@@ -12328,7 +12359,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Sei ifrå når brukaren tømmer ei av mappe."
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Spør brukaren når han prøver å senda ei melding utan emne."
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -12347,7 +12379,8 @@ msgstr "Spør når brukaren prøver å opne ti eller fleire meldingar på ein go
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
+msgstr ""
+"Spør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slikt."
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -13316,7 +13349,8 @@ msgstr "T_ype:"
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "Denne lista av språk inneheld berre språk du har installert ordliste til."
+msgstr ""
+"Denne lista av språk inneheld berre språk du har installert ordliste til."
 
 #: ../mail/mail-config.glade.h:143
 msgid ""
@@ -13368,7 +13402,8 @@ msgstr "Ikkje varsla når det kjem _ny e-post"
 
 #: ../mail/mail-config.glade.h:158
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
+msgstr ""
+"Ikkje signer førespurnader om _møter (for å vera kompatibel med Outlook)"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Forward style:"
@@ -13396,7 +13431,8 @@ msgstr "_Sti:"
 
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
+msgstr ""
+"S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
@@ -13817,7 +13853,8 @@ msgid "New Search Folder"
 msgstr "Ny søkjemappe"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "Ei mappe som har namnet «{1}» finst frå før. Bruk eit anna namn."
 
 #: ../mail/mail.error.xml.h:2
@@ -13836,7 +13873,8 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for &quot;{1}&quot;. Send the "
 "receipt notification to {0}?"
-msgstr "«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
+msgstr ""
+"«{1}» har bede om kvittering på mottak/lesing. Senda kvittering til {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -13848,7 +13886,8 @@ msgstr "Ein signatur som heiter «{0}» finst frå før. Bruk eit anna namn."
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
+msgstr ""
+"Eit meiningsfullt emne vil fortelja mottakarane kva e-posten din er om."
 
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account and all its proxies?"
@@ -13859,7 +13898,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil sletta denne kontoen?"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr ""
 "Er du sikker på at du vil kopla ut denne kontoen og sletta alle dei "
 "tilhøyrande mellomtenarane?"
@@ -13890,7 +13930,8 @@ msgstr "Er du sikker på at du vil senda ei melding i HTML-format?"
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
+msgstr ""
+"Er du sikker på at du vil senda ein e-post med berre blindkopi-mottakarar?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -14288,17 +14329,21 @@ msgstr ""
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
+msgstr ""
+"Denne meldinga kan ikkje sendast fordi kontoen du sender frå er slått av"
 
 #: ../mail/mail.error.xml.h:110
-msgid "This message cannot be sent because you have not specified any recipients"
-msgstr "Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
+msgstr ""
+"Denne meldinga kan du ikkje senda. Du har ikkje oppgjeve nokon mottakarar"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
+msgstr ""
+"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
 #: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
@@ -14632,22 +14677,25 @@ msgstr "Automatiske kontaktar"
 
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:454
-msgid "_Automatically create entries in the addressbook when responding to mail"
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr "Legg _automatisk kontaktar til i adresseboka når du svarar på e-post"
 
 #: ../plugins/bbdb/bbdb.c:475
 msgid "Instant Messaging Contacts"
-msgstr "Lynmelding-kontaktar"
+msgstr "Lynmeldingar"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:490
-msgid "Periodically synchronize contact information and images from gaim buddy list"
-msgstr "Jamnleg synkronisera kontaktinformasjon og bilete frå kameratlista i Gaim"
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr ""
+"Jamnleg synkronisera kontaktinformasjon og bilete frå kameratlista i Gaim"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
-msgstr "Synkronisér med kontaktliste no"
+msgstr "Synkronisér med _kameratlista no"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid ""
@@ -14656,7 +14704,8 @@ msgid ""
 "lists."
 msgstr ""
 "Fyller automatisk ut adresseboka di med namn og e-post-adresser når du "
-"svarar på e-post. Fyller også i lynmeldingsinformasjon frå kameratlistene dine."
+"svarar på e-post. Fyller også i lynmeldingsinformasjon frå kameratlistene "
+"dine."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14765,7 +14814,8 @@ msgid "Check whether Evolution is the default mailer"
 msgstr "Kontroller om Evolution er standard e-post-program"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid "Every time Evolution starts, check whether or not it is the default mailer."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Kvar gong Evolution startar kontrollerer han om han er standard e-post-"
 "program."
@@ -15357,7 +15407,8 @@ msgstr "Generell feil"
 msgid ""
 "If OWA is running on a different path, you must specify that in the account "
 "configuration dialog."
-msgstr "Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
+msgstr ""
+"Dersom OWA køyrer langs ein annan sti må du oppgje det i oppsettdialogen."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
 msgid "Mailbox for {0} is not on this server."
@@ -15493,13 +15544,16 @@ msgstr ""
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
+msgstr ""
+"Noverande bruk er: {0} kiB. Du kan ikkje senda eller motta meir e-post no."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
-msgstr "Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda meir plass."
+msgstr ""
+"Noverande bruk er: {0} kiB. Du kan ikkje senda mer e-post før du har rydda "
+"meir plass."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15952,7 +16006,8 @@ msgstr "Kalenderen som er lagt ved inneheld fleire oppføringar"
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
-msgstr "For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
+msgstr ""
+"For å handsama alle desse elementa bør fila lagrast og kalenderen importerast"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
@@ -16150,7 +16205,8 @@ msgstr "<b>%s</b> ber om å leggje til eit eksisterande møte:"
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen om:"
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -16344,7 +16400,7 @@ msgstr "Itip-formaterar"
 #: ../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 "«{0}» har delegert møtet. Vil du leggje til delegaten «{1}»?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -16352,7 +16408,8 @@ msgid "This meeting has been delegated"
 msgstr "Dette møtet har verte delegert"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
@@ -16388,7 +16445,8 @@ msgid "No store available"
 msgstr "Inga lagringsplass tilgjengeleg"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr ""
 "Eit tillegg som inneheld eit CORBA-grensesnitt for å aksessera e-post-data "
 "eksternt."
@@ -16415,7 +16473,8 @@ msgstr "E-post til møte"
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
+msgstr ""
+"Eit tillegg som tillet oppretting av oppgåver frå innhaldet i ein e-post."
 
 #: ../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
@@ -16544,7 +16603,8 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
+msgstr ""
+"Denne meldinga inneheld ikkje hovudinformasjonen som denne handlinga krev."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -16628,7 +16688,8 @@ msgstr "Varsling om ny e-post"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
+msgstr ""
+"Eit tillegg for å handsama kva for nokre tillegg som er slått av og på."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -16670,7 +16731,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"Eit testtillegg som viser eit formateringstillegg som let deg slå av HTML-e-post.\n"
+"Eit testtillegg som viser eit formateringstillegg som let deg slå av HTML-e-"
+"post.\n"
 "\n"
 "Dette tillegget er berre meint som demonstrasjon og er ikkje støtta.\n"
 
@@ -16852,7 +16914,7 @@ msgid "MIME Type"
 msgstr "MIME-type"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lagra"
 
@@ -17081,14 +17143,16 @@ msgstr "Standard breidde på vindauget"
 
 #: ../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 "ID eller alias til komponenten som vert vist som standard ved oppstart."
+msgstr ""
+"ID eller alias til komponenten som vert vist som standard ved oppstart."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "Last upgraded configuration version"
 msgstr "Sist oppgraderte versjon av oppsettet"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Liste over stiar til mapper som skal synkroniserast til disk for fråkopla "
 "bruk"
@@ -17105,7 +17169,7 @@ msgstr "Sidestolpen er synleg"
 msgid "Skip development warning dialog"
 msgstr "Om utviklarversjonsvindauget skal hoppast over"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Start i fråkopla modus"
 
@@ -17113,7 +17177,8 @@ msgstr "Start i fråkopla modus"
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
+msgstr ""
+"Oppsettsversjonen av Evolution, med stor/liten/oppsettnivå (t.d. «2.6.0»)."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
@@ -17150,7 +17215,8 @@ msgstr "Verktøylinja er synleg"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr "Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
+msgstr ""
+"Om Evolution vil starte opp i fråkopla modus i staden for tilkopla modus."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether the sidebar should be visible."
@@ -17161,7 +17227,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "Om verktøylinja skal vera synleg."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Om åtvaringsvindauget utviklarversjonane av Evolution skal droppast."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:24
@@ -17273,7 +17340,8 @@ msgstr "«.» og «..» er resverte mappenamn."
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
+msgstr ""
+"GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
@@ -17291,7 +17359,7 @@ msgstr "Bug Buddy kan ikkje køyrast."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Åsmund Skjæveland <aasmunds@fys.uio.no> 2003-2006\n"
@@ -17300,15 +17368,15 @@ msgstr ""
 "\n"
 "Send feilmeldingar og kommentarar til <i18n-nn@lister.ping.uio.no>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
@@ -17409,7 +17477,7 @@ msgstr ""
 "med å importera filer frå andre program til Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17446,7 +17514,7 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17454,35 +17522,35 @@ msgstr ""
 "Takk frå\n"
 "Evolution-laget\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution, og start opp den oppgjevne delen"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tving ny migrering frå Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Kopla frå lasting av tillegg."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17570,8 +17638,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Å oppgradera dataane og innstillingane dine vil krevja opp til {0} diskplass, "
-"men du har berre {1} tilgjengeleg.\n"
+"Å oppgradera dataane og innstillingane dine vil krevja opp til {0} "
+"diskplass, men du har berre {1} tilgjengeleg.\n"
 "\n"
 "Du må gjera meir plass tilgjengeleg i heimekatalogen din før du kan halda "
 "fram."
@@ -17876,11 +17944,13 @@ msgstr "Stol på at sertifikatet er autentisk"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
+msgstr ""
+"Stol på denne sertifiseringsinstansen ved identifisering av e-postbrukarar."
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
+msgstr ""
+"Stol på denne sertifiserinsinstansen ved identifisering av programutviklarar."
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
@@ -17895,7 +17965,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikat som identifiserer deg frå desse organisasjonane:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Du har sertifikat som identifiserer desse sertifiseringsinstansane:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -18244,7 +18315,7 @@ msgid "Select All"
 msgstr "Vel alle"
 
 #: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vel _alt"
@@ -18471,11 +18542,11 @@ msgstr "Klipp ut merka tekst og legg på utklippstavla"
 msgid "Paste from clipboard"
 msgstr "Lim inn frå utklippstavla"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Lim inn tekst frå utklippstavla"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Merk all tekst"
 
@@ -18510,31 +18581,30 @@ msgstr "Klikk her for å sjå den tilgjengelege hjelpeteksten"
 msgid "Close"
 msgstr "Lukk"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "Set _inn"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "_Vedlegg ..."
 
-#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "L_ukk"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "_Fil"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_Hjelp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "Set _inn"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_Val"
@@ -18794,7 +18864,8 @@ msgid "Hide _Read Messages"
 msgstr "Gøym _lesne meldingar"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Gøym dei sletta meldingane i staden for å visa dei gjennomstreka"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -19382,6 +19453,11 @@ msgstr "Få leveringskvittering når meldinga vert lesen"
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "Set _inn"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Opna ei fil"
@@ -19672,7 +19748,8 @@ msgstr "Lag eit nytt vindauge som viser denne mappa"
 
 #: ../ui/evolution.xml.h:6
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
+msgstr ""
+"Vis vindaugeknappane i tråd med skrivebordet si verktøylinjeinnstilling"
 
 #: ../ui/evolution.xml.h:7
 msgid "Display window buttons with icons and text"
@@ -20016,10 +20093,6 @@ msgstr "Type framsyning"
 msgid "Type of view:"
 msgstr "Type framsyning:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Foreslå automatisk framsyning av vedlegget"
-
 #. 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:416
@@ -21096,4 +21169,3 @@ msgstr "Inndatametode-kontekst"
 #: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Oppsprett med handtak"
-
diff --git a/po/pa.po b/po/pa.po
index 9ca508ccf8..f7f3dc138f 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,30 +1,27 @@
-# translation of evolution.HEAD.po to Punjabi
-# translation of pa2.po to Punjabi
-# translation of evolution.po to Punjabi
-# translation of evolution.HEAD.pa.po to Punjabi
-# translation of pa.po to Punjabi
+# translation of evolution.gnome-2-14.po to Punjabi
 # Copyright (C) 2004 THE evolution'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the evolution package.
+#
 # Punjab Linux Technology <punjablinux@netscape.net>, 2004.
 # Amanpreet Singh Alam <aalam@redhat.com>, 2004.
 # Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005, 2006.
 # Amanpreet Singh Brar <amanpreetsinghalam@redhat.com>, 2005.
 # Amanpreet Singh Brar <amanpreetalam@yahoo.com>, 2005.
 # Amanpreet Singh Brar Alamwalia <apbrar@gmail.com>, 2006.
-#
+# A S Alam <apbrar@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD\n"
+"Project-Id-Version: evolution.gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-24 06:07+0100\n"
-"PO-Revision-Date: 2006-02-25 12:41+0530\n"
-"Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
+"POT-Creation-Date: 2006-05-20 04:37+0200\n"
+"PO-Revision-Date: 2006-05-20 13:34+0530\n"
+"Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "\n"
 "\n"
 "\n"
@@ -69,32 +66,32 @@ msgstr "ਸੰਪਰਕ:  "
 msgid "evolution minicard"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਛੋਟਾ-ਕਾਰਡ"
 
-#: ../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
 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 "ਕੈਲੰਡਰ ਘਟਨਾਵਾਂ: %s ਸੰਖੇਪ ਹੈ।"
 
-#: ../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:299
 msgid "calendar view event"
 msgstr "ਕੈਲੰਡਰ ਵੇਖਣ ਘਟਨਾ"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "ਕੇਂਦਰਿਤ ਹੋਵੇ"
 
@@ -123,32 +120,32 @@ 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
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "ਇਸ ਵਿੱਚ %d ਘਟਨਾ ਹੈ"
 msgstr[1] "ਇਸ ਵਿੱਚ %d ਘਟਨਾਵਾਂ ਹਨ।"
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "ਇਸ ਵਿੱਚ ਕੋਈ ਘਟਨਾ ਨਹੀਂ ਹੈ।"
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "ਕੰਮ ਹਫਤਾ ਦਰਿਸ਼: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "ਦਿਨ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "ਕੰਮ ਹਫਤੇ ਲਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਦਿਨਾਂ ਲ਼ਈ ਕੈਲੰਡਰ ਦਿੱਖ"
 
@@ -224,21 +221,21 @@ msgstr "ਜੰਪ ਬਟਨ"
 msgid "Click here, you can find more events."
 msgstr "ਹੋਰ ਘਟਨਾਵਾਂ ਵੇਖਣ ਲ਼ਈ ਇਸ ਨੂੰ ਦਬਾਓ।"
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "ਮਹੀਨਾ ਝਲਕ: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 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 "ਇੱਕ ਜਾਂ ਵਧੇਰੇ ਹਫਤਿਆਂ ਲ਼ਈ ਕੈਲੰਡਰ ਦਰਿਸ਼"
 
@@ -554,9 +551,9 @@ msgstr "ਸਵੈ-ਪੂਰਤੀ ਦੀ ਸੰਰਚਨਾ ਇਥੇ ਦਿਓ"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "ਸੰਪਰਕ"
 
@@ -827,7 +824,7 @@ msgstr "Vcard ਇੰਝ ਸੰਭਾਲੋ..."
 msgid "_Properties..."
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "ਸੰਪਰਕ ਸਰੋਤ ਚੋਣਕਾਰੀ"
 
@@ -836,12 +833,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP ਸਰਵਰ ਨੂੰ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "ਪ੍ਰਮਾਣਿਤ ਹੋਣ ਵਿੱਚ ਅਸਫਲ ।\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "%s (ਉਪਭੋਗਤਾ %s) ਲਈ ਗੁਪਤ ਕੋਡ ਭਰੋ"
@@ -1029,8 +1026,8 @@ msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
 msgstr ""
-"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP "
-"ਸਰਵਰ SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
+"ਇਹ ਚੋਣ ਕਰਨ ਦਾ ਅਰਥ ਹੈ ਕਿ ਈਵੇਲੂਸ਼ਨ ਤੁਹਾਡੇ LDAP ਸਰਵਰ ਨਾਲ ਤਾਂ ਜੁੜੇਗਾ, ਜੇਕਰ ਤੁਹਾਡਾ LDAP ਸਰਵਰ "
+"SSL ਲਈ ਸਹਾਇਕ ਹੋਇਆ।"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
@@ -1189,13 +1186,10 @@ msgstr "ਕਾਰਡ"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2020
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1453,7 +1447,7 @@ msgstr "ਸਿਰਨਾਵਾਂ"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
 #: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
 #: ../widgets/text/e-text.c:3608
 msgid "Editable"
@@ -2462,7 +2456,7 @@ msgstr "ਸੇਵਾ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
@@ -2526,15 +2520,15 @@ msgstr "ਤਬਦੀਲ"
 msgid "Contact Editor - %s"
 msgstr "ਸਬੰਧ ਸੰਪਾਦਕ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2759
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "ਇਸ ਸੰਪਰਕ ਲਈ ਚਿੱਤਰ ਚੁਣੋ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2760
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3044
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2542,7 +2536,23 @@ msgstr ""
 "ਸੰਪਰਕ ਡਾਟਾ ਗਲਤ ਹੈ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3096
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "'%s' ਦਾ ਗਲਤ ਫਾਰਮੈਟ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s'%s' ਦਾ ਫਾਰਮੈਟ ਗਲਤ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s'%s' ਖਾਲੀ ਹੈ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "ਗਲਤ ਸੰਬੰਧ"
 
@@ -2699,8 +2709,8 @@ msgstr "_IM ਸੇਵਾ:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:222
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "ਟਿਕਾਣਾ(_L):"
 
@@ -2870,7 +2880,7 @@ msgstr "ਸਰੋਤ"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2883,7 +2893,7 @@ msgid "Save as VCard..."
 msgstr "VCard ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -2944,7 +2954,7 @@ msgstr "ਕੱਟੋ(_t)"
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1182
 #: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
@@ -3103,7 +3113,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:491
+#: ../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"
@@ -3142,7 +3152,7 @@ msgstr "ਵੈਬ ਸਾਇਟ"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../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:656
@@ -3150,7 +3160,7 @@ msgstr "ਵੈਬ ਸਾਇਟ"
 #: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "ਚੌਡ਼ਾਈ"
@@ -3158,14 +3168,14 @@ msgstr "ਚੌਡ਼ਾਈ"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../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:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "ਉਚਾਈ"
@@ -3680,19 +3690,19 @@ msgstr "ਈਵੇਲੂਸ਼ਨ CSV ਅਤੇ ਟੈਬ ਆਯਾਤਕਾਰ"
 msgid "Importing ..."
 msgstr "ਅਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP ਡਾਟਾ ਅੰਤਰ ਤਬਦੀਲੀ ਫਾਰਮੈਟ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ LDIF ਆਯਾਤਕਾਰ"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "ਈਵੇਲੂਸ਼ਨ VCard ਆਯਾਤਕਾਰ"
 
@@ -3755,7 +3765,7 @@ msgstr "ਫਾਰਮੈਟ"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "ਸਿਰਲੇਖ"
@@ -3859,9 +3869,9 @@ msgstr "ਛਾਂ"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:205
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "ਅਕਾਰ:"
 
@@ -4154,8 +4164,8 @@ msgid ""
 "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 ""
@@ -4170,8 +4180,8 @@ msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ "
-"ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।"
+"ਜੇਕਰ ਤੁਸੀਂ ਰੱਦ ਕਰਨ ਦਾ ਨੋਟਿਸ ਨਾ ਭੇਜਿਆ ਤਾਂ ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਪਤਾ ਨਹੀਂ ਲੱਗੇਗਾ ਕਿ ਕੰਮ ਨੂੰ ਹਟਾ "
+"ਦਿੱਤਾ ਗਿਆ ਹੈ।"
 
 #: ../calendar/calendar.error.xml.h:39
 msgid ""
@@ -4321,7 +4331,7 @@ msgid "_Save Changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ(_S)"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
@@ -4434,14 +4444,14 @@ msgid "Memos"
 msgstr "ਮੀਮੋ"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "ਕੰਮ"
@@ -4460,9 +4470,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਕੈਲੰਡਰ ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "ਮਿੰਟ"
@@ -4594,70 +4601,34 @@ msgstr "ਚੇਤਾਵਨੀ ਟਿੱਪਣੀ ਸੇਵਾ ਫੈਕਟਰੀ
 msgid "invalid time"
 msgstr "ਗਲਤ ਸਮਾਂ"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld ਸਕਿੰਟ)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "ਦੂਜਾ"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-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/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u ਸਕਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u ਸਕਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u ਮਿੰਟ"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u ਮਿੰਟ"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ਘੰਟਾ"
+msgstr[1] "%d ਘੰਟੇ"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr " %u ਘੰਟਾ"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ਮਿੰਟ"
+msgstr[1] "%d ਮਿੰਟ"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr " %u ਘੰਟੇ"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ਸਕਿੰਟ"
+msgstr[1] "%d ਸਕਿੰਟ"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -4897,8 +4868,8 @@ msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr ""
-"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗੀ ਖੇਤਰ ਅਤੇ %d ਨੂੰ "
-"ਡੋਮੇਨ ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
+"ਵੇਹਲਾ/ਰੁਝਿਆ ਵਾਂਗ ਵਰਤਣ ਲ਼ਈ URL ਨਮੂਨਾ ਡਾਟਾ, %u ਨੂੰ ਪੱਤਰ ਸਿਰਨਾਵੇਂ ਦੇ ਉਪਭੋਗੀ ਖੇਤਰ ਅਤੇ %d ਨੂੰ ਡੋਮੇਨ "
+"ਨਾਲ ਤਬਦੀਲ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
@@ -5059,10 +5030,10 @@ msgstr "ਛਾਪੋ"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5320,7 +5291,7 @@ msgstr "ਮਿੰਟ"
 msgid "start of appointment"
 msgstr "ਰੁਝੇਵੇਂ ਨਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "ਕਾਰਵਾਈ/ਤਬਦੀਲ"
 
@@ -5435,7 +5406,7 @@ msgid "Display"
 msgstr "ਦਰਿਸ਼"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "ਵੇਹਲਾ/ਰੁਝਿਆ"
@@ -5775,131 +5746,131 @@ msgstr "ਨੱਥੀ ਸੁਨੇਹਾ - %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:2855
-#: ../composer/e-msg-composer.c:3034
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "ਸ਼ਾਮਿਲ ਸੁਨੇਹਾ"
 msgstr[1] "%d ਨੱਥੀ ਸੁਨੇਹੇ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "ਭੇਜੋ(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "ਚੁੱਕਣਾ ਰੱਦ(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "ਇਕਾਈ ਅੱਪਡੇਟ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, 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:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3597
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "ਹਟਾਓ(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "ਵਿਸ਼ੇਸਤਾ(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3600
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "ਨੱਥੀ ਸ਼ਾਮਿਲ(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
-#: ../mail/em-format-html-display.c:2063
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "ਨੱਥੀ ਵੇਖਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਨੂੰ ਬਦਲਣ ਲਈ ਸਪੇਸ ਸਵਿੱਚ ਦਬਾਓ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "ਰੁਝੇਵਾਂ ਸੋਧ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "ਮੀਟਿੰਗ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "ਰੁਝੇਵਾਂ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "ਮਿਲੇ ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "ਕੰਮ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ਜਰਨਲ ਇੰਦਰਾਜ਼ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "ਸੰਖੇਪ ਨਹੀਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "ਜੇਕਰ ਅੱਪਡੇਟ ਕੀਤਾ ਇਸ ਇਕਾਈ ਵਿੱਚ ਕੀਤੀਆਂ ਤਬਦੀਲੀਆਂ ਰੱਦ ਕਰ ਦਿੱਤੀਆਂ ਜਾਣਗੀਆਂ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਵਰਤਣ ਵਿੱਚ ਅਸਫਲ!"
 
@@ -5986,106 +5957,106 @@ msgid "Recurrence"
 msgstr "ਦੁਹਰਾਓ"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "ਇਹ ਘਟਨਾ ਲਈ ਅਲਾਰਮ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "ਕੈਲੰਡਰ(_n):"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "ਪ੍ਰਬੰਧਕ(_O):"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "ਪ੍ਰਤੀਨਿਧ(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "ਦਰਸ਼ਕ(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "ਬਿਨਾਂ ਸ਼ੁਰੂਆਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "ਬਿਨਾਂ ਅੰਤ ਮਿਤੀ ਨਾਲ ਘਟਨਾ"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "ਸਮਾਪਤੀ ਮਿਤੀ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "ਸਮਾਪਤੀ ਸਮਾਂ ਗਲਤ ਹੈ"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "ਚੁਣੇ ਪ੍ਰਬੰਧਕ ਦਾ ਖਾਤਾ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "ਇੱਕ ਪ੍ਰਬੰਧਕ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "ਇੱਕ ਦਰਸ਼ਕ ਤਾਂ ਲੋੜੀਦਾ ਹੈ।"
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "ਸ਼ਾਮਿਲ(_A) "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' ਕੈਲੰਡਰ ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 msgstr[1] "ਰੁਝੇਵੇਂ ਤੋਂ ਪਹਿਲਾਂ %d ਦਿਨ"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, 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:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, 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:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "ਪਸੰਦ"
 
@@ -6094,7 +6065,7 @@ msgstr "ਪਸੰਦ"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6224,14 +6195,14 @@ msgstr "ਮੈਂਬਰ"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6268,7 +6239,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "'%s' ਵਿੱਚ ਮੀਮੋ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "ਸਮੂਹ(_G):"
@@ -6367,6 +6338,15 @@ msgstr "ਚਾਲੂ"
 msgid "first"
 msgstr "ਪਹਿਲਾਂ"
 
+#. 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:998
+msgid "second"
+msgstr "ਦੂਜਾ"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
@@ -6511,7 +6491,7 @@ msgstr "<span weight=\"bold\">ਸਥਿਤੀ</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "ਸਮਾਪਤ"
@@ -6587,11 +6567,11 @@ msgstr "ਕੰਮ(_T)"
 msgid "Task Details"
 msgstr "ਕੰਮ ਵੇਰਵਾ"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "ਮਿਆਦ ਮਿਤੀ ਗਲਤ"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' ਵਿੱਚ ਕਾਰਜ ਖੋਲਣ ਤੋਂ ਅਸਮਰੱਥ"
@@ -6675,30 +6655,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d ਹਫਤਾ"
 msgstr[1] "%d ਹਫਤਾ"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, 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/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d ਮਿੰਟ"
-msgstr[1] "%d ਮਿੰਟ"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ਸਕਿੰਟ"
-msgstr[1] "%d ਸਕਿੰਟ"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "ਅਣਪਛਾਤੀ ਕਾਰਵਾਈ ਕਰਨ ਲਈ ਹੈ"
@@ -6760,7 +6716,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:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ਖੋਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ"
@@ -6859,27 +6815,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ਹਾਂ"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../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-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6896,35 +6852,35 @@ msgstr "ਆਵਿਰਤੀ"
 msgid "Assigned"
 msgstr "ਜਾਰੀ ਕੀਤੇ"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "ਇਸਤਰਾਂ ਸੰਭਾਲੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1911
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "ਨੱਥੀ ਸੰਭਾਲਣ ਲਈ ਫੋਲਡਰ ਚੁਣੋ..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ ਚਿੱਤਰ %s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "ਇਸ ਤਰਾਂ ਸੰਭਾਲੋ(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "ਪਿੱਠਭੂਮੀ ਬਣਾਉ(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ਨਾਲ ਖੋਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
@@ -7156,25 +7112,25 @@ msgid "Delete _All Occurrences"
 msgstr "ਸਾਰੀਆਂ ਮੌਜੂਦਗੀਆਂ ਹਟਾਓ(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ਪ੍ਰਬੰਧਕ: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "ਪ੍ਰਬੰਧਕ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2053 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "ਟਿਕਾਣਾ: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "ਸਮਾਂ: %s %s"
@@ -7338,7 +7294,7 @@ msgstr "<br> ਕਿਰਪਾ ਕਰਕੇ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕ
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7351,7 +7307,7 @@ msgstr "ਆਰਜ਼ੀ ਸਵੀਕਾਰ"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7676,81 +7632,81 @@ msgid "Resources"
 msgstr "ਸਰੋਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "ਇੱਕਲਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "ਸਰੋਤ"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "ਕਮਰਾ"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "ਕੁਰਸੀ"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "ਲੋਡ਼ੀਦੇ ਭਾਗ ਲੈਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "ਚੋਣਵੇਂ ਭਾਗ ਲੈਂਣ ਵਾਲੇ"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "ਕੋਈ ਭਾਗ ਲੈਣ ਵਾਲਾ ਨਹੀਂ ਹੈ"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "ਕਾਰਵਾਈ ਲੋੜੀਦੀ ਹੈ"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ਆਰਜ਼ੀ"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "ਪ੍ਰਤੀਨਿਧੀ"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "ਦਰਸ਼ਕ                          "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7759,7 +7715,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7845,7 +7801,7 @@ msgstr "ਇੱਕ ਮੀਮੋ ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਦਬਾਓ"
 msgid "Memo sort"
 msgstr "ਮੀਮੋ ਕ੍ਰਮਬੱਧ"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7864,7 +7820,7 @@ msgstr "ਮੀਮੋ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 msgid "Opening memos at %s"
 msgstr "%s ਉੱਤੇ ਮੀਮੋ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
 
@@ -7873,20 +7829,20 @@ msgstr "ਚੁਣੀਆਂ ਇਕਾਈਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹ�
 msgid "Enter the password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "ਕੰਮ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s ਤੇ ਕੰਮ ਖੋਲ ਰਿਹਾ ਹੈ"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "ਕੰਮ ਪੂਰੇ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "ਨਿਕਾਲਾ"
 
@@ -8168,12 +8124,6 @@ msgstr "ਕੈਲੰਡਰ `%s' ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ
 msgid "Unable to migrate tasks `%s'"
 msgstr "ਕੰਮ `%s' ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d ਸਕਿੰਟ)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1ਹਿਲਾਂ"
@@ -10086,7 +10036,7 @@ msgid "%.0fG"
 msgstr "%.0f ਗੈਗਾ"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ"
 
@@ -10211,7 +10161,7 @@ msgid "Hide _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਓਹਲੇ(_A)"
 
 #: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
-#: ../composer/e-msg-composer.c:3843
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "ਨੱਥੀ ਪੱਟੀ ਵੇਖਾਓ(_A)"
 
@@ -10246,12 +10196,12 @@ msgstr "ਸਵੈ-ਨਿਰਮਤ"
 msgid "Si_gnature:"
 msgstr "ਦਸਤਖਤ(_g):"
 
-#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
-#: ../composer/e-msg-composer.c:3728
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "ਸੁਨੇਹਾ ਲਿਖੋ"
 
-#: ../composer/e-msg-composer.c:4952
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10286,7 +10236,7 @@ msgstr "ਕਿਉਕਿ &quot;{0}&quot;, ਤੁਹਾਨੂੰ ਵੱਖਰੀ�
 #  system:no-save-file secondary
 #  system:no-load-file secondary
 #: ../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 "ਕਿਉਕਿ &quot; {1}&quot;।"
 
@@ -10404,11 +10354,11 @@ msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "ਈਵੇਲੂਸ਼ਨ"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "ਸਮੂਹਿਕ ਸਰੂਪ"
 
@@ -10577,7 +10527,7 @@ msgstr "ਕੀ ਤੁਸੀਂ ਉੱਪਰ ਲਿਖਣਾ ਚਾਹੁੰਦ�
 msgid "File exists &quot;{0}&quot;."
 msgstr "ਫਾਇਲ ਬੰਦ &quot;{0}&quot;।"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "ਉੱਪਰ ਲਿਖੋ(_O)"
 
@@ -10749,7 +10699,7 @@ msgstr "ਫਾਇਲ਼ ਨਾਂ ਗੁੰਮ ਹੈ।"
 
 #  filter:no-name primary
 #  mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "ਨਾਂ ਗੁੰਮ ਹੈ।"
 
@@ -10822,6 +10772,10 @@ msgstr "ਪਹਿਲਾਂ"
 msgid "months"
 msgstr "ਮਹੀਨੇ"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "ਸਕਿੰਟ"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "ਮੌਜੂਦਾ ਸਮਾਂ"
@@ -10936,46 +10890,46 @@ msgstr "ਫੋਲਡਰ ਚੁਣੋ"
 msgid "Ask for each message"
 msgstr "ਹਰ ਸੁਨੇਹੇ ਲਈ ਪੁੱਛੋ"
 
-#: ../mail/em-account-editor.c:1779 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "ਪਛਾਣ"
 
-#: ../mail/em-account-editor.c:1828 ../mail/mail-config.glade.h:118
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "ਈ-ਪੱਤਰ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2012
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "ਇੰਨੇ ਅੰਤਰਾਲ ਬਾਅਦ ਪੱਤਰ ਦੀ ਜਾਂਚ ਕਰੋ(_n)"
 
-#: ../mail/em-account-editor.c:2193 ../mail/mail-config.glade.h:130
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "ਈ-ਪੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../mail/em-account-editor.c:2252 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "ਮੂਲ"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2318 ../mail/mail-config.glade.h:123
+#: ../mail/em-account-editor.c:2319 ../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:2355 ../mail/em-account-editor.c:2446
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣ"
 
-#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "ਖਾਤਾ ਸੰਪਾਦਕ"
 
-#: ../mail/em-account-editor.c:2786 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਖਾਤਾ ਸਹਾਇਕ"
 
@@ -10997,7 +10951,7 @@ msgstr "[ਮੂਲ]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
 
@@ -11026,7 +10980,7 @@ msgstr "ਇੱਕ ਦਸਤਖਤੀ ਸਕਰਿਪਟ ਸ਼ਾਮਿਲ"
 msgid "Signature(s)"
 msgstr "ਦਸਤਖਤ"
 
-#: ../mail/em-composer-utils.c:873 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ਅੱਗੇ ਭੇਜੇ ਸੁਨੇਹੇ --------"
 
@@ -11363,7 +11317,7 @@ msgstr "ਡਰਾਫਟ"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "ਆਉਣ-ਬਕਸਾ"
 
@@ -11449,7 +11403,7 @@ msgstr "ਨਵਾਂ ਫੋਲਡਰ(_N)..."
 msgid "_Rename..."
 msgstr "ਨਾਂ ਤਬਦੀਲ(_R)..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ(_E)"
 
@@ -11593,37 +11547,37 @@ msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਤੇ ਫਿਲਟਰ ਲਗਾਓ(_M)"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967 ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "ਮੂਲ"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../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:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "ਸਬੰਧ ਟਿਕਾਣੇ ਦੀ ਨਕਲ(_C)"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "ਖੋਜ ਫੋਲਡਰ ਬਣਾਓ(_S)"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਤੋਂ(_F)"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "ਇਸ ਸਿਰਨਾਵੇਂ ਲਈ(_T)"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "ਪੱਤਰ %s ਲਈ ਦਬਾਓ"
@@ -11695,8 +11649,8 @@ msgid ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ "
-"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
+"ਇਹ ਸੁਨੇਹੇ ਇਕ੍ਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਹਲਕਾ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ "
+"ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਖੋਲਣ ਔਖਾ ਤਾਂ ਹੈ, ਪਰ ਅਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
 #: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
@@ -11718,8 +11672,8 @@ msgid ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 msgstr ""
-"ਇਹ ਸੁਨੇਹੇ ਇਕਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ "
-"ਇੱਕ ਸੰਭਵ ਸਮੇਂ ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
+"ਇਹ ਸੁਨੇਹੇ ਇਕਰਿਪਟਡ ਹੈ ਅਤੇ ਇਸ ਲਈ ਸਖਤ ਐਲੋਗ੍ਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ। ਇਸ ਸੁਨੇਹੇ ਦੇ ਭਾਗਾਂ ਨੂੰ ਇੱਕ ਸੰਭਵ ਸਮੇਂ "
+"ਵਿੱਚ ਕਿਸੇ ਵੀ ਬਾਹਰੀ ਵਿਅਕਤੀ ਵਲੋਂ ਵੇਖਣਾ ਔਖਾ ਹੈ।"
 
 #: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -11729,64 +11683,64 @@ msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਖੋ(_V)"
 msgid "This certificate is not viewable"
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਵੇਖਣਯੋਗ ਨਹੀਂ ਹੈ"
 
-#: ../mail/em-format-html-display.c:1172
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p ਤੇ ਸਮਾਪਤ"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "ਮਿਆਦ ਪੁੱਗੇ:"
 
-#: ../mail/em-format-html-display.c:1183
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "ਵੱਲੋਂ %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "ਕਤਾਰ ਵਿੱਚ ਦਰਿਸ਼(_V)"
 
-#: ../mail/em-format-html-display.c:1244
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "ਓਹਲੇ(_H)"
 
-#: ../mail/em-format-html-display.c:1245
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "ਚੌੜਾਈ ਦੇ ਫਿੱਟ(_F)"
 
-#: ../mail/em-format-html-display.c:1246
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "ਅਸਲੀ ਅਕਾਰ ਵੇਖਾਓ(_O)"
 
-#: ../mail/em-format-html-display.c:1665 ../mail/mail-config.glade.h:45
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1872
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "ਸਭ ਨੱਥੀਆਂ ਨੂੰ ਫੋਲਡਰ 'ਚ ਸੰਭਾਲੋ"
 
-#: ../mail/em-format-html-display.c:1919
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "ਚੁਣੇ ਸੰਭਾਲੋ(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1986
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d ਨੱਥੀ"
 msgstr[1] "%d ਨੱਥੀ"
 
-#: ../mail/em-format-html-display.c:1993 ../mail/em-format-html-display.c:2069
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2004
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "ਸਭ ਸੰਭਾਲੋ(_a)"
 
-#: ../mail/em-format-html-display.c:2065
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "ਕੋਈ ਨੱਥੀ ਨਹੀਂ"
 
@@ -11899,7 +11853,7 @@ msgstr "ਖਬਰਸਾਰ ਸਮੂਹ"
 msgid "%s attachment"
 msgstr "%s ਨੱਥੀ"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -11915,11 +11869,11 @@ msgstr "ਬਹੁਭਾਗ/ਇਕ੍ਰਿਪਸ਼ਨ ਲਈ ਨਾ-ਸਹਾਇ�
 msgid "Unsupported signature format"
 msgstr "ਨਾ-ਸਹਾਇਕ ਦਸਤਖਤ ਫਾਰਮੈਟ"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "ਦਸਤਖਤ ਜਾਂਚ ਦੌਰਾਨ ਅਣਜਾਣੀ ਗਲਤੀ"
 
@@ -11995,8 +11949,8 @@ msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਥਾਪਨ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ "
-"ਨਿਕਾਰਾ ਹੋ ਗਈ ਹੈ।"
+"ਪੁਰਾਣੀ ਈਵੇਲੂਸ਼ਨ ਦੇ ਸਥਾਪਨ ਪੜਨ ਤੋਂ ਅਸਫਲ, `evolution/config.xmldb' ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਨਿਕਾਰਾ "
+"ਹੋ ਗਈ ਹੈ।"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -12049,20 +12003,20 @@ msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ।"
 msgid "Message Filters"
 msgstr "ਸੁਨੇਹਾ ਫਿਲਟਰ"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "ਸੁਨੇਹਾ ਸੰਭਾਲੋ..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "ਸਿਰਨਾਵਾਂ ਜੋੜ੍ਹੋ"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ਤੋਂ ਸੁਨੇਹਾ"
@@ -13735,7 +13689,7 @@ msgid "Checking for new mail"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਲਈ ਜਾਂਚ ਜਾਰੀ"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:681
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ"
@@ -13820,30 +13774,28 @@ 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 ""
 "&quot;{1}&quot; 'ਤੇ ਇੱਕ ਨਾ-ਖਾਲੀ ਫੋਲਡਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।\n"
 "\n"
 "ਤੁਸੀਂ ਇਸ ਫੋਲਡਰ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰ ਸਕਦੇ ਹੋ, ਉੱਪਰ ਲਿਖ ਸਕਦੇ ਹੋ ਜਾਂ ਭਾਗ ਸ਼ਾਮਿਲ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਬੰਦ ਕਰ "
-"ਸਕਦੇ ਹੋ।\n"
+"ਸਕਦੇ ਹੋ।"
 
-#: ../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}?"
-msgstr ""
-"&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ "
-"ਭੇਜਣੀ ਹੈ?"
+msgstr "&quot;{1}&quot; ਲਈ ਪੜਨ ਰਸੀਦ ਸੂਚਨਾ ਦੀ ਮੰਗ ਕੀਤੀ ਗਈ ਹੈ। ਕੀ {0} ਨੂੰ ਰਸੀਦ ਸੂਚਨਾ ਭੇਜਣੀ ਹੈ?"
 
 #  mail:no-rename-folder-exists secondary
 #  mail:vfolder-notunique secondary
-#: ../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 "ਨਾਂ &quot;{1}&quot; ਨਾਲ ਇੱਕ ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ। ਕਿਰਪਾ ਕਰਕੇ ਵੱਖਰਾ ਨਾਂ ਵਰਤੋਂ।"
 
-#: ../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."
@@ -13851,141 +13803,141 @@ 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?"
 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;?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਵਿੱਚੋਂ ਸਾਰੇ ਹਟਾਏ ਸੁਨੇਹੇ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾਉਣ ਲ਼ਈ ਸਹਿਮਤ ਹੋ?"
 
-#: ../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 "ਕੀ ਤੁਸੀਂ ਇਹ ਸੁਨੇਹਾ ਸਿਰਫ BCC ਪ੍ਰਾਪਤ ਕਰਨ ਵਾਲਿਆਂ ਨੂੰ ਹੀ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #  mail:ask-send-no-subject primary
-#: ../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 "ਕਿਉਕਿ &quot;{0}&quot;।"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "ਕਿਉਕਿ &quot;{2}&quot;।"
 
-#: ../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 "ਖੋਜ ਫੋਲਡਰ &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 "&quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਨਕਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨਹੀਂ ਬਣ ਸਕਿਆ।"
 
-#: ../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 "ਆਰਜ਼ੀ ਸੰਭਾਲ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../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 "ਖੋਜ ਫੋਲਡਰ &quot;{0}&quot; ਫੋਲਡਰ ਨੂੰ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇਹ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ &quot;{1}&quot; ਵਿੱਚ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "ਸਰੋਤ &quot;{1}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "ਸਰੋਤ &quot;{2}&quot; ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "ਨਿਯਤ &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 "
 "license."
 msgstr ""
-"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। "
-"ਤੁਸੀਂ ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
+"ਲਾਈਸੈਂਸ ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਪੜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਇੰਸਟਾਲੇਸ਼ਨ ਸਮੱਸਿਆ ਹੈ। ਤੁਸੀਂ "
+"ਇਹ ਉਪਲੱਬਧ ਕਰਤਾ ਨੂੰ ਵਰਤਣ ਦੇ ਤੱਦ ਤੱਕ ਯੋਗ ਨਹੀਂ ਹੋ ਸਕਦੇ, ਜਦ ਤੱਕ ਲਾਈਸੈਂਸ ਨਾਲ ਸਹਿਮਤ ਨਹੀਂ ਹੁੰਦੇ।"
 
-#: ../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; ਦਾ ਨਾਂ &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 "ਸਿਸਟਮ ਫੋਲਡਰ &quot;{0}&quot; ਦਾ ਨਾਂ ਤਬਦੀਲ ਜਾਂ ਭੇਜਿਆ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../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 "ਡਾਇਰੈਕਟਰੀ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "ਫਾਇਲ &quot;{0}&quot; ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "ਦਸਤਖਤ ਸਕ੍ਰਿਪਟ&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."
@@ -13993,85 +13945,85 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਸਹੀਂ ਤਰਾਂ ਭਰਿਆ ਹੈ। ਇਹ ਯਾਦ ਰੱਖੋ ਕਿ ਗੁਪਤ-ਕੋਡ ਅੱਖਰ ਪ੍ਰਤੀ "
 "ਸੰਵੇਦਨਸ਼ੀਲ ਹੈ, ਤੁਸੀਂ ਸ਼ਾਇਦ ਆਪਣਾ ਕੈਪਸ ਲਾੱਕ ਚਾਲੂ ਕੀਤਾ ਹੈ।"
 
-#: ../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 "ਕੀ &quot;{0}&quot; ਹਟਾਓਣਾ ਹੈ?"
 
-#: ../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:async-error-nodescribe primary
-#: ../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:no-write-path-notfile secondary
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "ਫਾਇਲ ਮੌਜੂਦ ਤਾਂ ਹੈ, ਪਰ ਇਹ ਨਿਯਮਿਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
 #  mail:ask-expunge secondary
 #  mail:ask-empty-trash secondary
-#: ../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."
 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."
@@ -14079,11 +14031,11 @@ 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."
@@ -14091,19 +14043,19 @@ msgstr ""
 "ਜੇਕਰ ਤੁਸੀਂ ਬੰਦ ਕਰ ਦਿੱਤਾ, ਤਾਂ ਇਹ ਸੁਨੇਹੇ ਉਦੋਂ ਤੱਕ ਭੇਜੇ ਨਹੀਂ ਜਾਣਗੇ, ਜਦੋਂ ਤੱਕ ਕੇ ਈਵੇਲੂਸ਼ਨ ਨੂੰ ਮੁੜ ਚਾਲੂ ਨਹੀਂ "
 "ਕੀਤਾ ਜਾਦਾ ਹੈ।"
 
-#: ../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 "
@@ -14114,35 +14066,35 @@ msgstr ""
 "ਸਿਰਲੇਖ, ਜੇਕਰ ਸ਼ਾਮਿਲ ਕੀਤਾ ਹੈ, ਤਾਂ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕਰਤਾ ਜ਼ਾਹਿਰ ਹੋ ਜਾਣਗੇ। ਇਸ ਤੋਂ ਬੱਚਣ ਲਈ ਤੁਹਾਨੂੰ ਘੱਟੋ-"
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
-#: ../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 as read in the selected folder"
 msgstr "ਚੁਣੇ ਫੋਲਡਰ 'ਚ ਸਭ ਸੁਨੇਹੇ ਪੜੇ ਬਣਾਓ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "ਫੋਲਡਰ ਗੁੰਮ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "ਕੋਈ ਸਰੋਤ ਨਹੀਂ ਚੁਣਿਆ।"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "ਇੱਕੋ ਸਮੇਂ ਇੰਨੇ ਸੁਨੇਹੇ ਖੋਲਣ ਲ਼ਈ ਲੰਮਾ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਖਾਤਾ ਸਥਾਪਨ ਵੇਖੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ।"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14150,7 +14102,7 @@ msgstr ""
 "ਕਿਰਪਾ ਕਰਕੇ ਵੱਲ ਲਈ ਜਾਇਜ ਈ-ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਦਿਓ। ਤੁਸੀਂ ਵੱਲ ਤੇ ਕਲਿੱਕ ਕਰਕੇ ਈਪੱਤਰ ਸਿਰਨਾਵਾਂ ਖੋਜ "
 "ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14162,48 +14114,48 @@ msgstr ""
 "{0}\n"
 "ਕਿਸੇ ਤਰਾਂ ਭੇਜੋ?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦਸਤਖਤ ਲਈ ਵਿਲੱਖਣ ਨਾਂ ਦਿਓ।"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ।"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "ਪੁਰਾਣੇ ਪੱਤਰ ਫੋਲਡਰ &quot;{0}&quot; ਨੂੰ ਤਬਦੀਲ ਕਰਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "ਕਿਊਰਿੰਗ ਸਰਵਰ"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "ਲੋੜੀਦੇ ਪ੍ਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਦੀ ਸੂਚੀ ਲਈ ਸਰਵਰ ਨੂੰ ਬੇਨਤੀ ਕੀਤੀ ਗਈ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "ਪੜਨ ਰਸੀਦ ਲਈ ਬੇਨਤੀ ਕੀਤੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "ਕੀ ਤੁਸੀਂ ਫੋਲਡਰ &quot;{0}&quot; ਅਤੇ ਇਸ ਦੇ ਸਬ-ਫੋਲਡਰ ਨੂੰ ਹਟਾਉਣ ਦੀ ਪੁਸ਼ਟੀ ਕਰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "ਖੋਜ ਫੋਲਡਰਾਂ ਨੂੰ ਸਵੈ-ਚਾਲਤ ਹੀ ਅੱਪਡੇਟ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "ਰਸੀਦ ਭੇਜੋ"
 
 #  XXX we shouldn't be popping up dialogs in this code.
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹਨ"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14211,7 +14163,7 @@ msgstr ""
 "ਸਿਸਟਮ ਫੋਲਡਰ Ximian ਈਵੇਲੂਸ਼ਨ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਲਾਜ਼ਮੀ ਹਨ ਅਤੇ ਇਹਨਾਂ ਨੂੰ ਤਬਦੀਲ, ਨਾਂ-ਤਬਦੀਲ ਜਾਂ "
 "ਹਟਾਉਣਾ ਸੰਭਵ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14227,7 +14179,7 @@ msgstr ""
 "ਘੱਟ ਇੱਕ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ To: ਜਾਂ CC: ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
 #  mail:vfolder-updated secondary
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14241,7 +14193,7 @@ msgstr ""
 "     &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14255,23 +14207,12 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "ਅਤੇ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ ਕਾਰਜ &quot;sendmail &quot; ਕਾਰਜ ਰਾਹੀ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਸੀ। Sendmail "
-"ਨੇ ਹੇਠ ਲਿਖੀ ਗਲਤੀ ਦਿੱਤੀ ਹੈ: ਹਾਲਤ 67: ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"ਇਹ ਸੁਨੇਹਾ ਬਾਹਰੀ-ਬਕਸਾ (Outbox) ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ। ਸੁਨੇਹੇ ਵਿੱਚ ਗਲਤੀਆਂ ਦੀ ਜਾਂਚ ਕਰੋ ਅਤੇ ਮੁੜ ਭੇਜੋ।"
-
 #  mail:signature-notscript secondary
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "ਸਕ੍ਰਿਪਟ ਫਾਇਲ ਮੌਜੂਦ ਅਤੇ ਚੱਲਣਯੋਗ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14279,7 +14220,7 @@ msgstr ""
 "ਇਹ ਫੋਲਡਰ ਲੁਪਤ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਖੋਜ\n"
 "ਫੋਲਡਰ ਸੰਪਾਦਕ ਵਿੱਚ ਜਾ ਕੇ ਇਸ ਨੂੰ ਪਰਤੱਖ ਸ਼ਾਮਿਲ ਕਰੋ, ਜੇ ਲੋੜ ਹੈ ਤਾਂ।"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14287,74 +14228,72 @@ msgstr ""
 "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਜਿਸ ਖਾਤੇ ਨਾਲ ਤੁਸੀਂ ਭੇਜਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ, ਉਹ ਤਾਂ "
 "ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ, ਕਿਉਕਿ ਤੁਸੀਂ ਕੋਈ ਸੁਨੇਹੀ ਨਹੀਂ ਦਿੱਤਾ ਹੈ"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "ਸਰਵਰ ਇਸ ਤਰਾਂ ਦੀ ਪ੍ਰਮਾਣਿਤ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਅਤੇ ਸਭ ਪ੍ਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਈ ਵੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "ਇਹ ਦਸਤਖਤ ਤਬਦੀਲ ਹੋ ਗਏ ਹਨ, ਪਰ ਸੰਭਾਲੇ ਨਹੀਂ ਗਏ ਹਨ।"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr ""
-"ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ "
-"ਜਾਣਗੇ।"
+msgstr "ਇਸ ਨਾਲ ਚੁਣੇ ਫੋਲਡਰ ਅਤੇ ਉਸ ਦੇ ਅਧੀਨ-ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾ ਦਿੱਤੇ ਜਾਣਗੇ।"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "ਗਰੁੱਪਵਾਇਸ ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਵਿੱਚ ਅਸਫਲ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ "
-"ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
+"ਇਸ ਖਾਤੇ ਲਈ ਡਰਾਫਟ ਫੋਲਡਰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ। ਕੀ ਇਸ ਦੀ ਬਜਾਏ ਸਿਸਟਮ ਡਰਾਫਟ ਫੋਲਡਰ "
+"ਵਰਤਿਆ ਜਾਵੇ?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "ਲਾਇਸੈਂਸ ਫਾਇਲ ਪੜਨ ਵਿੱਚ ਆਯੋਗ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "ਮੂਲ ਵਰਤੋਂ(_D)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "ਮੂਲ ਡਰਾਫਟ ਫੋਲਡਰ ਵਰਤਿਆ ਜਾਵੇ?"
 
 #  mail:account-incomplete secondary
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "ਤੁਸੀਂ ਸਾਰੀ ਲਾਜ਼ਮੀ ਜਾਣਕਾਰੀ ਭਰੀ ਨਹੀਂ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਈ ਨਾ-ਭੇਜੇ ਸੁਨੇਹੇ ਹਨ, ਕੀ ਤੁਸੀਂ ਕਿਸੇ ਤਰਾਂ ਵੀ ਬਾਹਰ ਆਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "ਤੁਸੀਂ ਇੱਕ ਸਮੇਂ ਦੋ ਖਾਤੇ ਨਹੀਂ ਬਣਾ ਸਕਦੇ ਹੋ।"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "ਤੁਹਾਨੂੰ ਇਸ ਖੋਜ ਫੋਲਡਰ ਦਾ ਨਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "ਤੁਹਾਨੂੰ ਫੋਲਡਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14363,27 +14302,23 @@ msgstr ""
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸਰੋਤ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।\n"
 "ਜਾਂ ਇੱਕਲਾ-ਇੱਕਲਾ ਫੋਲਡਰ ਚੁਣ ਕੇ ਅਤੇ/ਜਾਂ ਸਾਰੇ ਸਥਾਨਿਕ, ਸਾਰੇ ਰਿਮੋਟ ਫੋਲਡਰ ਜਾਂ ਦੋਵੇਂ ਚੁਣ ਕੇ।"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "ਤੁਹਾਡਾ ਸਰਵਰ &quot;{0}&quot; 'ਤੇ &quot;{0}&quot; ਦੇ ਤੌਰ ਤੇ ਲਾਗਿੰਨ ਅਸਫਲ"
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "ਤੁਹਾਡਾ ਸੁਨੇਹਾ &quot;{0}&quot; ਵਿਸ਼ੇ ਨਾਲ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "ਖੋਲ੍ਹੋ(_A)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "ਤਬਦੀਲੀਆਂ ਰੱਦ(_D)"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "ਨਿਕਾਰਾ(_E)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਲੋ(_O)"
 
@@ -14454,7 +14389,7 @@ msgstr "%b %d %Y"
 msgid "Messages"
 msgstr "ਸੁਨੇਹੇ"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "ਸੁਨੇਹਾ ਸੂਚੀ ਬਣਾਈ ਜਾ ਰਹੀ ਹੈ"
 
@@ -14888,24 +14823,24 @@ msgstr "ਫੋਲਡਰ ਅਕਾਰ"
 msgid "Exchange Settings"
 msgstr "ਐਕਸ਼ਚੇਜ਼ ਸਥਾਪਨ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ(_u)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "ਪ੍ਰਮਾਣਕਿਤਾ ਕਿਸਮ"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "ਸਹਾਇਕ ਕਿਸਮ ਲਈ ਜਾਂਚ(_e)"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:165
+#: ../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."
@@ -14944,7 +14879,7 @@ msgstr "ਨਵਾਂ ਗੁਪਤ-ਕੋਡ:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਖਤਮ ਹੋ ਗਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਗੁਪਤ-ਕੋਡ ਹੁਣੇ ਬਦਲੋ।"
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "ਤੁਹਾਡੇ ਗੁਪਤ-ਕੋਡ ਦੀ ਮਿਆਦ ਅਗਲੇ %d ਦਿਨਾਂ 'ਚ ਖਤਮ ਹੋਵੇਗੀ"
@@ -15085,14 +15020,14 @@ msgstr "ਐਕਸ਼ਚੇਜ਼ ਫੋਲਡਰ ਲੜੀ"
 msgid "Unsubscribe Folder..."
 msgstr "ਫੋਲਡਰ ਲਈ ਮੈਂਬਰ ਹਟਾਓ..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "ਕੀ ਫੋਲਡਰ \"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਉਣੀ ਹੈ?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "\"%s\" ਲਈ ਮੈਂਬਰੀ ਹਟਾਓ"
@@ -15526,7 +15461,7 @@ msgstr "ਫੋਲਡਰ ਲੜੀ ਪਰਸੰਗ ਮੇਨੂ ਵਿੱਚ ਪ�
 msgid "Unsubscribe Folders"
 msgstr "ਫੋਲਡਰਾਂ ਲਈ ਨਾ-ਮੈਂਬਰੀ"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "ਜਾਂਚ ਸੂਚੀ"
 
@@ -16653,8 +16588,8 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"ਇੱਕ ਜਾਂਚ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML ਪੱਤਰਾਂ "
-"ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
+"ਇੱਕ ਜਾਂਚ ਪਲੱਗ-ਇਨ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ ਇੱਕ ਫਾਰਮੈਟ ਪਲੱਗ-ਇਨ ਦਾ ਕੰਮ ਵਿਖਾਉਦੀ ਹੈ, ਜੋ ਕਿ ਤੁਹਾਨੂੰ HTML "
+"ਪੱਤਰਾਂ ਨੂੰ ਅਯੋਗ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 "\n"
 "ਇਹ ਪਲੱਗ-ਇਨ ਸਿਰਫ਼ ਨਾ-ਸਹਾਇਕ ਝਲਕ ਕੋਡ ਹੀ ਹੈ।\n"
 
@@ -16722,7 +16657,7 @@ msgstr "ਟਿਕਾਣੇ"
 msgid "_Publish Calendar Information"
 msgstr "ਕੈਲੰਡਰ ਜਾਣਕਾਰੀ ਪਰਕਾਸ਼ਤ(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "ਕੀ ਤੁਸੀਂ URL ਨੂੰ ਹਟਾਉਣ ਲਈ ਸਹਿਮਤ ਹੋ?"
 
@@ -17060,64 +16995,68 @@ msgid "Default window height"
 msgstr "ਮੂਲ ਝਰੋਖਾ ਉਚਾਈ"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+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 "ਭਾਗ ਦਾ ID ਜਾਂ ਉਪਨਾਂ ਨੂੰ ਸ਼ੁਰੂਆਤ ਤੇ ਵੇਖਿਆ ਜਾਇਆ ਕਰੇਗਾ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "ਆਖਰੀ ਨਵੀਨ ਸੰਰਚਨਾ ਵਰਜਨ"
 
-#: ../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
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 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:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "ਵਿਕਾਸ ਚੇਤਾਵਨੀ ਪੁੱਛਗਿੱਛ ਵਾਰਤਾਲਾਪ ਛੱਡੋ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "ਈਵੂਲੇਸ਼ਨ ਦਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖਾ ਦੀ ਮੂਲ ਉਚਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "ਸੁਨੇਹਾ ਝਰੋਖੇ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "ਬਾਹੀ ਦੀ ਮੂਲ ਚੌੜਾਈ, ਪਿਕਸਲ ਵਿੱਚ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ "
-"(ਉਦਾਹਰਨ ਲਈ \"2.6.0\")"
+"ਈਵੂਲੇਸ਼ਨ ਦਾ ਆਖਰੀ ਅੱਪਗਰੇਡ ਕੀਤਾ ਸੰਰਚਨਾ ਵਰਜਨ, ਵੱਧ/ਘੱਟ/ਸੰਰਚਨਾ ਪੱਧਰ ਨਾਲ (ਉਦਾਹਰਨ ਲਈ \"2.6.0"
+"\")"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17126,35 +17065,39 @@ msgstr ""
 "ਝਰੋਖਾ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਹੈ। \"ਪਾਠ\", \"ਆਈਕਾਨ\", \"ਦੋਵੇਂ\", \"ਸੰਦ-ਪੱਟੀ\" ਸੰਭਵ ਹੈ। ਜੇ \"ਸੰਦ-ਪੱਟੀ"
 "\" ਨੂੰ ਚੁਣਿਆ ਗਿਆ ਤਾਂ, ਗਨੋਮ ਸੰਦ-ਪੱਟੀ ਸਥਾਪਨ ਰਾਹੀਂ ਹੀ ਬਟਨਾਂ ਦੀ ਸ਼ੈਲੀ ਨਿਰਧਾਰਿਤ ਕੀਤੀ ਜਾਵੇਗੀ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "ਸੰਦਪੱਟੀ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਢੰਗ ਨਾਲ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਵੇਗਾ, ਨਾਕਿ ਆਨਲਾਇਨ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "ਕੀ ਝਰੋਖਾ ਅਧਿਕਤਮ ਹੋਵੇ ਜਾਂ ਨਾ।"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "ਕੀ ਬਾਹੀ ਵੇਖਾਈ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "ਕੀ ਸੰਦ ਪੱਟੀ ਉਪਲੱਬਧ ਹੋਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "ਕੀ ਈਵੇਲੂਸ਼ਨ ਦੀ ਵਿਕਾਸ ਵਰਜਨ ਵਾਰਤਾਲਾਪ ਨੂੰ ਵੇਖਾਇਆ ਨਾ ਜਾਵੇ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "ਕੀ ਝਰੋਖਾ ਬਟਨ ਵੇਖਾਈ ਦੇਣ।"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਸ਼ੈਲੀ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "ਝਰੋਖਾ ਬਟਨ ਦਿੱਖ ਹਨ।"
 
@@ -17271,44 +17214,44 @@ 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
-"ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ (amanpreetalam@yahoo.com)\n"
-"ਪੰਜਾਬ ਲੀਨਕਸ ਤਕਨਾਲੋਜੀ (http://punlinux.sf.net)"
+"ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n"
+"(aalam@redhat.com)"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "ਆਨਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
-msgstr "ਆਫਲਾਇਨ(_W)"
+msgstr "ਆਫ਼ਲਾਇਨ(_W)"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਨਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਫਲਾਇਨ ਹੋਣ ਲਈ ਦਬਾਓ।"
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਆਫਲਾਇਨ ਹੋਣ ਦੀ ਕਾਰਵਾਈ ਅਧੀਨ ਹੈ।"
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਇਸ ਬਟਨ ਨੂੰ ਆਨਲਾਇਨ ਜਾਣ ਲਈ ਵਰਤੋਂ।"
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "%s ਲਈ ਤਬਦੀਲ"
 
 #: ../shell/e-shell.c:633
 msgid "Uknown system error."
-msgstr "ਅਣਪਛਾਤੀ ਸਿਸਟਮ ਗਲਤੀ।"
+msgstr "ਅਣਜਾਣੀ ਸਿਸਟਮ ਗਲਤੀ।"
 
 #: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
@@ -17386,7 +17329,7 @@ msgstr ""
 "ਕਰ ਸਕਦੇ ਹੋ।"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17406,7 +17349,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "ਮਿੱਤਰ, ਈਵੇਲੂਸ਼ਨ ਸਮੂਹ ਉਤਾਪਦ ਦੇ ਇਸ ਪਹਿਲਾਂ ਜਾਰੀ ਵਰਜਨ ਨੂੰ ਡਾਊਨ ਲੋਡ ਕਰਨ\n"
-"ਧੰਨਵਾਦ।\n"
+"ਧੰਨਵਾਦ ਹੈ।\n"
 "\n"
 "ਈਵੇਲੂਸ਼ਨ ਦਾ ਇਹ ਵਰਜਨ ਸੰਪੂਰਨ ਨਹੀਂ ਹੈ, ਇਸ ਨੂੰ ਬਣਾ ਤਾਂ ਦਿੱਤਾ ਗਿਆ ਹੈ, ਪਰ\n"
 "ਇਸ ਦੇ ਕਈ ਫੀਚਰ ਤਾਂ ਸਮਾਪਤ ਨਹੀਂ ਹੋਏ ਜਾਂ ਠੀਕ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰਦੇ ਹਨ।\n"
@@ -17415,13 +17358,13 @@ msgstr ""
 "ਵਰਜਨ ਹਟਾਉਣਾ ਪਵੇਗਾ ਅਤੇ ਇਸ ਦੀ ਬਜਾਏ %s ਵਰਜਨ ਇੰਸਟਾਲ ਕਰੋ।\n"
 "\n"
 "ਜੇਕਰ ਤੁਸੀਂ ਬੱਗ ਲੱਭ ਲਿਆ, ਤਾਂ ਕਿਰਪਾ ਕਰਕੇ ਇਸ ਦੀ ਸੂਚਨਾ bugzilla.gnome.com\n"
-"ਤੇ ਦਿਓ। ਇਹ ਉਤਾਪਦ ਬਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ ਦੇ ਹੈ ਅਤੇ ਕਿਸੇ ਦੇ ਗੁੱਸੇ ਲਈ ਜਿੰਮਵਾਰ\n"
+"ਤੇ ਦਿਓ। ਇਹ ਉਤਾਪਦ ਬਿਨਾਂ ਕਿਸੇ ਵਾਰੰਟੀ ਦੇ ਹੈ ਅਤੇ ਕਿਸੇ ਦੇ ਗੁੱਸੇ ਲਈ ਜਿੰਮੇਵਾਰ\n"
 "ਨਹੀਂ ਹੈ।\n"
 "\n"
 "ਸਾਨੂੰ ਉਮੀਦ ਹੈ ਮਿੱਤਰ ਤੂੰ ਸਾਡੀ ਮੇਹਨਤ ਦਾ ਆਨੰਦ ਮਾਣੇਗਾ ਅਤੇ ਅਸੀਂ ਤੇਰੇ ਇਸ ਸਹਿਯੋਗ ਦਾ\n"
-"ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ\n"
+"ਤਹਿ ਦਿਲੋਂ ਧੰਨਵਾਦ ਕਰਦੇ ਹਾਂ।\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17429,35 +17372,35 @@ msgstr ""
 "ਧੰਨਵਾਦ\n"
 "ਈਵੇਲੂਸ਼ਨ ਟੀਮ\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "ਮੈਨੂੰ ਮੁੜ ਨਾ ਦੱਸੋ"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "ਈਵੇਲੂਸ਼ਨ ਇੱਕ ਖਾਸ ਭਾਗ ਦੀ ਸਰਗਰਮੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "ਆਨਲਾਇਨ ਮੋਡ ਵਿੱਚ ਸ਼ੁਰੂ"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "ਸਭ ਈਵੇਲੂਸ਼ਨ ਭਾਗ ਮਜਬੂਰ ਕਰਕੇ ਬੰਦ ਕਰੋ"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "ਈਵੇਲੂਸ਼ਨ ੧.੪ ਤੋਂ ਮਜਬੂਰ ਕਰਕੇ ਵਾਪਿਸ"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ਸਾਰੇ ਭਾਗਾਂ ਦੀ ਡੀਬੱਗ ਆਉਟਪੁੱਟ ਇੱਕ ਫਾਇਲ ਵਿੱਚ ਭੇਜੋ।"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "ਕੋਈ ਪਲੱਗ-ਇਨ ਲੋਡ ਤੋਂ ਰੋਕ ਹੈ।"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17472,11 +17415,11 @@ msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਯਾਦ ਰੱਖੇ ਹੋਏ ਗੁਪ
 
 #: ../shell/shell.error.xml.h:2
 msgid "Continue"
-msgstr "ਜਾਰੀ"
+msgstr "ਜਾਰੀ ਰੱਖੋ"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
-msgstr "ਵਰਜਨ {0} ਦਾ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਓ?"
+msgstr "ਕੀ ਵਰਜਨ {0} ਦਾ ਪੁਰਾਣਾ ਡਾਟਾ ਹਟਾਓਣਾ ਹੈ?"
 
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
@@ -17517,8 +17460,8 @@ msgstr ""
 "ਇਹ ਸਲਾਹ ਦਿੱਤੀ ਜਾਦੀ ਹੈ ਕਿ ਤੁਸੀਂ ਆਪਣੇ ਪੱਤਰ, ਸੰਪਰਕ ਤੇ ਕੈਲੰਡਰ ਡਾਟਾ, ਜੋ ਵੀ ਮੌਜੂਦ ਹੈ, ਦੀ ਖੁਦ ਜਾਂਚ "
 "ਕਰ ਲਵੋ ਅਤੇ ਇਹ ਵੀ ਕੇ ਈਵੇਲੂਸ਼ਨ ਇਸ ਪੁਰਾਣੇ ਡਾਟਾ ਨਾਲ ਪਹਿਲਾਂ ਠੀਕ ਕੰਮ ਕਰਦਾ ਸੀ।\n"
 "\n"
-"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, "
-"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ ਨਾ ਵਰਤੋਂ।\n"
+"ਇੱਕ ਵਾਰ ਹਟਾਉਣ ਬਾਅਦ ਤੁਸੀਂ ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੂੰ ਵਾਪਿਸ ਨਹੀਂ ਲਿਆ ਸਕਦੇ ਹੋ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਖੁਦ "
+"ਨਾ ਵਰਤੋਂ।\n"
 
 #: ../shell/shell.error.xml.h:15
 msgid ""
@@ -17531,9 +17474,9 @@ msgid ""
 msgstr ""
 "ਈਵੇਲੂਸ਼ਨ ਦੇ ਪੁਰਾਣੇ ਵਰਜਨ ਨੇ ਡਾਟਾ ਕਿਸੇ ਵੱਖਰੇ ਟਿਕਾਣੇ ਉੱਤੇ ਸੰਭਾਲਿਆ ਸੀ।\n"
 "\n"
-"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ "
-"ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ "
-"ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਇਹ ਡਾਟਾ ਹਟਾਉਣ ਲਈ ਚੁਣਿਆ ਤਾਂ &quot;evolution&quot; ਡਾਇਰੈਕਟਰੀ ਨੂੰ ਹਮੇਸ਼ਾ ਲਈ "
+"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਡਾਟਾ ਨੂੰ ਰੱਖਣ ਲਈ ਚੁਣਿਆ, ਤਾਂ ਤੁਸੀਂ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ &quot;"
+"evolution&quot;ਦੇ ਭਾਗ ਹਟਾ ਸਕਦੇ ਹੋ।\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -17547,8 +17490,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ "
-"{1} ਉਪਲੱਬਧ ਹੈ।\n"
+"ਤੁਹਾਡੇ ਡਾਟਾ ਅਤੇ ਸਥਾਪਨ ਦੇ ਅੱਪਡੇਟ ਨੂੰ {0} ਡਿਸਕ ਥਾਂ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਤੁਹਾਡੇ ਕੋਲ ਸਿਰਫ਼ {1} ਉਪਲੱਬਧ "
+"ਹੈ।\n"
 "\n"
 "ਤੁਹਾਨੂੰ ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੀ ਘਰ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਹੋਰ ਥਾਂ ਬਣਾਉਣ ਦੀ ਲੋੜ ਹੈ।"
 
@@ -19929,7 +19872,7 @@ msgid "_Edit..."
 msgstr "ਸੋਧ(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20054,17 +19997,17 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../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:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../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:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "ਨਿਊਨਤਮ ਚੌੜਾਈ"
 
@@ -20319,15 +20262,15 @@ msgstr "ਨਿੱਜੀ ਰਿਕਾਰਡ ਸਮਕਾਲੀ:"
 msgid "Sync Categories:"
 msgstr "ਵਰਗ ਸਮਕਾਲੀ:"
 
-#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "ਖਾਲੀ ਸੁਨੇਹਾ"
 
-#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
+#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
 msgstr "ਮੁੜ-ਵਹਾ ਮਾਡਲ"
 
-#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "ਕਾਲਮ ਚੌੜਾਈ"
 
@@ -20371,12 +20314,12 @@ msgstr "ਪਾਠ"
 msgid "Find _Now"
 msgstr "ਹੁਣ ਖੋਜ(_N)"
 
-#: ../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 "ਕਰਸਰ ਕਾਲਮ"
@@ -20569,23 +20512,23 @@ msgstr "ਕੇਂਦਰਿਤ ਕਾਲਮ"
 msgid "Unselected Column"
 msgstr "ਨਾ-ਚੁਣਿਆ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1744
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "ਕਾਲਮ ਵਿੰਨੋ"
 
-#: ../widgets/table/e-cell-text.c:1751
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "ਕਾਲਮ ਹੇਠ ਰੇਖਾ"
 
-#: ../widgets/table/e-cell-text.c:1758
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "ਗੂੜਾ ਕਾਲਮ"
 
-#: ../widgets/table/e-cell-text.c:1765
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "ਕਾਲਮ ਰੰਗ"
 
-#: ../widgets/table/e-cell-text.c:1779
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "BG ਰੰਗ ਕਾਲਮ"
 
@@ -20633,6 +20576,7 @@ msgid "Sh_ow these fields in order:"
 msgstr "ਇਹ ਫੋਲਡਰ ਕਰਮ ਵਿੱਚ ਵੇਖਾਓ(_o):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
+#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "ਖੇਤਰ ਵੇਖਾਓ"
@@ -20691,6 +20635,10 @@ msgstr "ਨਾ ਕ੍ਰਮਬੱਧ"
 msgid "No grouping"
 msgstr "ਨਾ ਵਰਗੀਕ੍ਰਿਤ"
 
+#: ../widgets/table/e-table-config.c:584
+msgid "Available Fields"
+msgstr "ਉਪਲੱਬਧ ਖੇਤਰ"
+
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "ਇੰਞ ਗਰੁੱਪ(_G)..."
@@ -20702,14 +20650,14 @@ msgstr "ਇਹ ਫੋਲਡਰ ਲੜੀਬੱਧ ਵੇਖਾਓ(_S):"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "DnD ਕੋਡ"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "ਪੂਰਾ ਸਿਰਲੇਖ"
 
@@ -20753,7 +20701,7 @@ msgstr "%s (%d ਇਕਾਈਆਂ)"
 #: ../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:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 
@@ -20761,7 +20709,7 @@ msgstr "ਬਦਲਵਾਂ ਕਤਾਰ ਰੰਗ"
 #: ../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:2979 ../widgets/table/e-table-item.c:2980
+#: ../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 "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
@@ -20770,7 +20718,7 @@ msgstr "ਖਿਤਿਜੀ ਗਰਿੱਡ ਬਣਾਓ"
 #: ../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:2986 ../widgets/table/e-table-item.c:2987
+#: ../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 "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
@@ -20779,7 +20727,7 @@ msgstr "ਲੰਬਕਾਰੀ ਗਰਿੱਡ ਬਣਾਓ"
 #: ../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:2993 ../widgets/table/e-table-item.c:2994
+#: ../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 "ਕੇਂਦਰ ਬਣਾਓ"
@@ -20788,7 +20736,7 @@ msgstr "ਕੇਂਦਰ ਬਣਾਓ"
 #: ../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:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "ਕਰਸਰ ਢੰਗ"
 
@@ -20796,7 +20744,7 @@ msgstr "ਕਰਸਰ ਢੰਗ"
 #: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "ਚੋਣ ਨਮੂਨਾ"
 
@@ -20804,7 +20752,7 @@ msgstr "ਚੋਣ ਨਮੂਨਾ"
 #: ../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:3007 ../widgets/table/e-table-item.c:3008
+#: ../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"
@@ -20814,7 +20762,7 @@ msgstr "ਮੁੱਢਲੀ ਲੰਬਾਈ"
 #: ../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:3041 ../widgets/table/e-table-item.c:3042
+#: ../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"
@@ -20875,31 +20823,31 @@ msgstr "ਕਾਲਮ ਫਾਰਮੈਟ..."
 msgid "Customize Current View..."
 msgstr "ਮੌਜੂਦਾ ਦਰਿਸ਼ ਪਸੰਦ..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "ਫੋਂਟ-ਸਮੂਹ"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "ਕਰਮਬੱਧ ਜਾਣਕਾਰੀ"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "ਲੜੀ"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "ਸਾਰਣੀ ਸਿਰਲੇਖ"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "ਸਾਰਣੀ ਮਾਡਲ"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "ਕਰਸਰ ਕਤਾਰ"
 
diff --git a/po/pt.po b/po/pt.po
index b45c5cb65c..3116140a28 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-10 23:24+0000\n"
-"PO-Revision-Date: 2006-03-10 23:30+0000\n"
+"POT-Creation-Date: 2006-03-10 23:36+0000\n"
+"PO-Revision-Date: 2006-03-10 23:40+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -2526,15 +2526,15 @@ msgstr "Alterado"
 msgid "Contact Editor - %s"
 msgstr "Editor de Contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Seleccione uma imagem para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2542,7 +2542,7 @@ msgstr ""
 "Os dados do contacto são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -2570,7 +2570,7 @@ msgstr "_Seleccione o Livro de Endereços"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar a lista de contactos (%s)?"
@@ -2587,7 +2587,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar este contacto (%s)?"
@@ -16472,7 +16472,7 @@ msgstr "Formatador Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; delegou a reunião. Deseja adicionar o delegado &quot;{1}"
 "&quot;?"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 14d14097cb..f195ac584e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-26 06:32+0100\n"
-"PO-Revision-Date: 2005-08-24 23:21-0300\n"
-"Last-Translator: Afonso Celso Medina <afmedina@uol.com.br>\n"
+"POT-Creation-Date: 2006-03-10 23:54-0300\n"
+"PO-Revision-Date: 2006-03-10 21:12-0300\n"
+"Last-Translator: Leandro A. F. Pereira <leandro@linuxmag.com.br>\n"
 "Language-Team: Português/Brasil <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,23 +87,23 @@ msgstr "visão de evento da agenda"
 msgid "Grab Focus"
 msgstr "Capturar foco"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "Novo Compromisso"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "Novo Evento de Dia Inteiro"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "Ir para Hoje"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "Ir para Data"
 
@@ -112,32 +112,32 @@ msgstr "Ir para Data"
 msgid "a table to view and select the current time range"
 msgstr "uma tabela para ver e selecionar o intervalo de tempo corrente"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Tem %d evento."
 msgstr[1] "Tem %d eventos."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Não tem eventos."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Visão de Semana Útil: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Visão de Dia: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "visão de agenda para uma semana útil"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "visão de agenda para um ou mais dias"
 
@@ -154,8 +154,8 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:322
+#: ../calendar/gui/e-day-view-top-item.c:711 ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -186,8 +186,8 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:336
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -213,21 +213,21 @@ msgstr "Botão de salto"
 msgid "Click here, you can find more events."
 msgstr "Clique aqui, você pode encontrar mais eventos."
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Visão de Mês: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Visão de Semana: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "visão de agenda para um mês"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "visão de agenda para uma ou mais semanas"
 
@@ -279,7 +279,7 @@ msgstr "Célula de Tabela"
 
 #: ../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
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "clique para adicionar"
 
@@ -546,30 +546,30 @@ msgstr "Configure aqui o autocompletar"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1344
+#: ../addressbook/gui/component/addressbook-view.c:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:629
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "Contatos"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
 msgstr "Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
+msgid "Evolution Address Book address pop-up"
 msgstr "Pop-up de endereços do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
+msgid "Evolution Address Book address viewer"
 msgstr "Visualizador de endereços do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
 msgstr "Visualizador de cartões do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
+msgid "Evolution Address Book component"
 msgstr "Componente do Catálogo de Endereços do Evolution"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
@@ -587,7 +587,7 @@ msgstr "Gerencie aqui os seus certificados 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:141
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
@@ -603,20 +603,19 @@ msgstr "Neste Computador"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../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:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:104
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:525
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
@@ -637,7 +636,7 @@ msgid "Create a new contact list"
 msgstr "Criar uma nova lista de contatos"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "Novo Catálogo de Endereços"
 
@@ -649,8 +648,8 @@ msgstr "Catálogo de _Endereços"
 msgid "Create a new address book"
 msgstr "Criar um novo catálogo de endereços"
 
-#: ../addressbook/gui/component/addressbook-component.c:386
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:406
+msgid "Failed upgrading Address Book settings or folders."
 msgstr ""
 "Falha ao atualizar as pastas ou configurações do Catálogo de Endereços."
 
@@ -664,50 +663,52 @@ msgstr "Base"
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr ""
 "Copiar o conteúdo do catálogo localmente para funcionamento desconectado"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../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:217 ../mail/mail-config.glade.h:85
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:86
+#: ../plugins/itip-formatter/itip-formatter.c:1978
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Geral"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 #: ../mail/importers/pine-importer.c:392
-msgid "Addressbook"
+msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "Informação do Servidor"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "Autenticação"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Detalhes"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "Procurando"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "Baixando"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "Propriedades do Catálogo de Endereços"
@@ -723,15 +724,15 @@ msgstr "Migrando..."
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:768
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "Configurações do Autocompletar"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1143
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -743,7 +744,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -753,7 +754,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1166
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -763,7 +764,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1176
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -775,54 +776,54 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra os dados de sincronização com "
 "pilot..."
 
-#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../addressbook/gui/component/addressbook-view.c:434
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../addressbook/gui/component/addressbook-view.c:437
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "Renomear Pasta"
 
-#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../addressbook/gui/component/addressbook-view.c:442
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "O nome da pasta não pode conter o caractere '/'"
 
-#: ../addressbook/gui/component/addressbook-view.c:455
+#: ../addressbook/gui/component/addressbook-view.c:445
 msgid "A Folder with this name already exists"
 msgstr "Uma pasta com este nome já existe"
 
-#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "_Novo Catálogo de Endereços"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:964
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
 #: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
-#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
+#: ../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 "E_xcluir"
 
-#: ../addressbook/gui/component/addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Salvar como Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:968
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1355
+#: ../addressbook/gui/component/addressbook-view.c:1345
 msgid "Contact Source Selector"
 msgstr "Seletor de Fonte de Contatos"
 
@@ -940,7 +941,7 @@ msgid "Add Address Book"
 msgstr "Adicionar Catálogo de Endereços"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:777
 msgid "Always"
 msgstr "Sempre"
 
@@ -975,31 +976,46 @@ msgid "Lo_gin:"
 msgstr "Lo_gin:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "Nunca"
 
+#. 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
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "Um"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#. 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 "Criptografado (SSL)"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "Filtro de Pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:27
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search _base:"
 msgstr "_Base de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:28
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "_Filtro de pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "Filtro de pesquisa"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../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 "
@@ -1009,47 +1025,51 @@ msgstr ""
 "pesquisa é feita. Se não for modificado, o padrão é procurar no objectclass "
 "do tipo \"pessoa\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../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 ""
 "A seleção desta opção significa que o Evolution apenas se conectará ao seu "
-"servidor LDAP se este suportar SSL ou TLS."
+"servidor LDAP se este suportar SSL."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../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 ""
-"A seleção desta opção significa que o Evolution apenas tentará usar SSL/TLS "
-"se você estiver em um ambiente inseguro. Por exemplo, se você e seu servidor "
-"LDAP estiverem atrás de uma firewall no trabalho, então o Evolution não "
-"precisa usar SSL/TLS, pois a sua conexão já é segura."
+"A seleção desta opção significa que o Evolution apenas se conectará ao seu "
+"servidor LDAP se este suportar TLS."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../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 ""
 "A seleção desta opção significa que o seu servidor não suporta nem SSL nem "
 "TLS.  Isto significa que a sua conexão será insegura e que você estará "
 "vulnerável a falhas de segurança. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "Sub"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "Supported Search Bases"
 msgstr "Bases de Pesquisa Suportadas"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#. 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 "Criptografado (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 ""
@@ -1057,7 +1077,7 @@ msgstr ""
 "suas pesquisas começarão. Se você deixar este campo vazio as pesquisas "
 "começarão na raiz da árvore do diretório."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../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 "
@@ -1070,7 +1090,7 @@ msgstr ""
 "pesquisa de \"um\" incluirá apenas as entradas que estão um nível abaixo da "
 "sua base."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -1078,7 +1098,7 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../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."
@@ -1086,7 +1106,7 @@ msgstr ""
 "Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
 "grande a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../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 "
@@ -1095,7 +1115,7 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de Email\" requer acesso anônimo ao seu servidor LDAP."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../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. "
@@ -1103,7 +1123,7 @@ msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution. "
 "Ele é usado apenas para exibição. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../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 "
@@ -1113,79 +1133,74 @@ msgstr ""
 "lista de portas padrão foi fornecida. Pergunte ao seu administrador de "
 "sistemas qual porta você deve escolher."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "Usando endereço de email"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-#: ../mail/em-account-editor.c:303
+#: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "Quando Possível"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "_Adicionar Catálogo de Endereços"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Find Possible Search Bases"
 msgstr "Localizar Bases de Pesquisa _Possíveis"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
 msgid "_Login method:"
 msgstr "Método de _login:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-#: ../calendar/gui/dialogs/calendar-setup.c:244
+#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../calendar/gui/dialogs/calendar-setup.c:245
 #: ../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
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
 msgid "_Search scope:"
 msgstr "_Escopo da pesquisa:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
 #: ../mail/mail-config.glade.h:171
 #: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:57
 msgid "_Timeout:"
 msgstr "_Tempo limite:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar conexão segura:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
+#: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartões"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:1987
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
 msgid "minutes"
@@ -1198,7 +1213,6 @@ msgstr "minutos"
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/memo-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
@@ -1265,9 +1279,9 @@ msgid "Contact"
 msgstr "Contato"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:568
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2406
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "Editor de Contatos"
 
@@ -1310,7 +1324,7 @@ msgstr "Telefone"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Trabalho"
 
@@ -1332,12 +1346,13 @@ msgid "_Birthday:"
 msgstr "Aniver_sário:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "Agen_da:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "_Categorias"
 
@@ -1443,9 +1458,9 @@ msgstr "Endereço"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
-#: ../widgets/text/e-text.c:3613
+#: ../widgets/table/e-cell-text.c:1777 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "Editável"
 
@@ -2418,9 +2433,9 @@ msgid "Zimbabwe"
 msgstr "Zimbábue"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
+#: ../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:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
@@ -2452,7 +2467,7 @@ msgstr "Serviço"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Local"
@@ -2510,21 +2525,21 @@ msgstr "Campos Necessários"
 msgid "Changed"
 msgstr "Alterado"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de Contatos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione uma imagem para este contato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Sem imagem"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2532,7 +2547,7 @@ msgstr ""
 "Os dados do contato são inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Contato inválido."
 
@@ -2689,8 +2704,8 @@ msgstr "Serviço de M_I:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:216
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "_Local:"
 
@@ -2739,7 +2754,7 @@ msgstr ""
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2794,11 +2809,28 @@ msgstr ""
 "O nome ou email deste contato já existe nesta pasta.\n"
 "Você deseja adicioná-lo mesmo assim?"
 
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:162
-msgid "Advanced Search"
-msgstr "Pesquisa Avançada"
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "Qualquer campo contém"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Categoria é"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "Email começa com"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "Nome começa com"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
@@ -2813,7 +2845,7 @@ msgstr[1] "%d contatos"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2824,12 +2856,12 @@ msgid "Error getting book view"
 msgstr "Erro ao obter visão do catálogo"
 
 #: ../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:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "Modelo"
 
@@ -2837,139 +2869,108 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar o cartão"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "Nome começa com"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Email begins with"
-msgstr "Email começa com"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "Categoria é"
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Any field contains"
-msgstr "Qualquer campo contém"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-msgid "Advanced..."
-msgstr "Avançado..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
-msgid "_Advanced..."
-msgstr "_Avançado..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "Fonte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:479
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "Tipo"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
-msgid "Address Book"
-msgstr "Catálogo de Endereços"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2067
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "Salvar como VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-#: ../calendar/gui/dialogs/comp-editor.c:1093
-#: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "A_brir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "_Novo Contato..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "Nova _Lista de Contatos..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "_Salvar como VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "_Encaminhar Contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "_Encaminhar Contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "Enviar _Mensagem ao Contato"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "Enviar _Mensagem à Lista"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "Enviar _Mensagem aos Contatos"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "_Copiar para o Catálogo de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "Mo_ver para o Catálogo de Endereços..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
-#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../mail/message-list.c:1724 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:13
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "C_olar"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
-#: ../calendar/gui/cal-search-bar.c:346
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
+#: ../calendar/gui/cal-search-bar.c:343
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1802
 msgid "Print cards"
 msgstr "Imprimir cartões"
 
@@ -3002,7 +3003,7 @@ msgid "Car Phone"
 msgstr "Telefone do Carro"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3108,9 +3109,9 @@ msgstr "Rádio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:490
+#: ../calendar/gui/e-meeting-list-view.c:497
 #: ../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 "Papel"
 
@@ -3147,31 +3148,31 @@ msgstr "Sítio da Web"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../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:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Largura"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../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:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Altura"
 
@@ -3376,8 +3377,8 @@ msgstr "Protocolo não suportado"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
+#: ../calendar/gui/e-cal-model-tasks.c:657
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2372
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3388,7 +3389,7 @@ msgstr "Não foi possível cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:438
+#: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "A autenticação falhou"
 
@@ -3691,19 +3692,19 @@ msgstr "Importador CSV e Tab do Evolution"
 msgid "Importing ..."
 msgstr "Importando..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Formato de Troca de Dados LDAP (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importador LDIF do Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importador VCard do Evolution"
 
@@ -3712,12 +3713,12 @@ msgstr "Importador VCard do Evolution"
 msgid "Print envelope"
 msgstr "Imprimir envelope"
 
-#: ../addressbook/printing/e-contact-print.c:1033
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "Imprimir contatos"
 
-#: ../addressbook/printing/e-contact-print.c:1124
-#: ../addressbook/printing/e-contact-print.c:1152
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "Imprimir contato"
 
@@ -3762,11 +3763,11 @@ msgid "Format"
 msgstr "Formato"
 
 #: ../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:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Cabeçalho"
@@ -3870,9 +3871,9 @@ msgstr "Sombreamento"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:965
-#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:199
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -4144,8 +4145,8 @@ msgid "Delete task list '{0}'?"
 msgstr "Excluir a lista de tarefas '{0}'?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Do not Send"
-msgstr "Não Enviar"
+msgid "Do _not Send"
+msgstr "_Não Enviar"
 
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
@@ -4212,15 +4213,6 @@ msgstr ""
 "não saber que a tarefa foi excluída."
 
 #: ../calendar/calendar.error.xml.h:39
-#: ../ui/evolution-message-composer.xml.h:29
-msgid "Send"
-msgstr "Enviar"
-
-#: ../calendar/calendar.error.xml.h:40
-msgid "Send Notice"
-msgstr "Enviar Notificação"
-
-#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
@@ -4228,7 +4220,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas agendas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
@@ -4236,7 +4228,7 @@ msgstr ""
 "Enviar informação atualizada permite que os outros participantes mantenham "
 "as suas listas de tarefas atualizadas."
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
@@ -4244,7 +4236,7 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar o compromisso agora causará a "
 "perda destes anexos."
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -4252,81 +4244,85 @@ msgstr ""
 "Existem alguns anexos sendo baixados. Salvar a tarefa agora causará a perda "
 "destes anexos."
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:43
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Alguns recursos podem não funcionar corretamente com a versão do seu "
 "servidor atual"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "A agenda do Evolution terminou de forma inesperada."
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "As tarefas do Evolution terminaram de forma inesperada."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
 msgid "The calendar is not marked for offline usage."
 msgstr "A agenda não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar you have selected is read-only"
 msgstr "A agenda que você selecionou é apenas para leitura"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "A lista de memorandos não está configurada para uso desconectado"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage."
 msgstr "A lista de tarefas não está configurada para uso desconectado."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "Esta agenda será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:51
 msgid "This memo list will be removed permanently."
 msgstr "Esta lista de memorandos será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "Esta lista de tarefas será removida permanentemente."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Você deseja salvar as alterações realizadas neste compromisso?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to save your changes to this memo?"
+msgstr "Você deseja salvar as alterações realizadas nesta tarefa?"
+
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
 msgstr "Você deseja salvar as alterações realizadas nesta tarefa?"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "Você deseja enviar um aviso de cancelamento deste item de diário?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Você deseja enviar um aviso de cancelamento a todos os participantes?"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Você deseja enviar convites de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr "Você deseja enviar esta tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Você deseja enviar informação atualizada de reunião aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr "Você deseja enviar informação atualizada de tarefa aos participantes?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../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 "
@@ -4336,12 +4332,16 @@ msgstr ""
 "problemas utilizando o Evolution. Para os melhores resultados o servidor "
 "deve ser atualizado para uma versão suportada"
 
+#: ../calendar/calendar.error.xml.h:63
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "Você fez alterações neste compromisso, mas ainda não as salvou."
+
 #: ../calendar/calendar.error.xml.h:64
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "Você fez alterações a este compromisso, mas ainda não as salvou."
+msgid "You have changed this task, but not yet saved it."
+msgstr "Você fez alterações nesta tarefa, mas ainda não as salvou."
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "You have made changes to this task, but not yet saved them."
+msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Você fez alterações nesta tarefa, mas ainda não as salvou."
 
 #: ../calendar/calendar.error.xml.h:66
@@ -4369,16 +4369,20 @@ msgid "_Save Changes"
 msgstr "_Salvar Alterações"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
 msgid "_Send"
 msgstr "_Enviar"
 
 #: ../calendar/calendar.error.xml.h:72
+msgid "_Send Notice"
+msgstr "_Enviar Notificação"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "{0}."
 msgstr "{0}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:48
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "Digite a senha"
 
@@ -4425,7 +4429,7 @@ msgid "Could not write pilot's ToDo application block"
 msgstr "Não foi possível escrever os dados do aplicativo de tarefas do pilot"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:1968
+#: ../plugins/itip-formatter/itip-formatter.c:1969
 msgid "Calendar and Tasks"
 msgstr "Agenda e Tarefas"
 
@@ -4472,18 +4476,19 @@ msgid "Memo_s"
 msgstr "Memorando_s"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:1000 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
+#: ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "Memorandos"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
-#: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
+#: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:635
+#: ../plugins/exchange-operations/exchange-folder.c:591
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4504,9 +4509,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de notificação de alarme da Agenda do Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -4535,10 +4537,10 @@ msgstr "Compromissos"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
-#: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
+#: ../calendar/gui/e-itip-control.c:1113
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "Local:"
 
@@ -4547,17 +4549,17 @@ msgid "Snooze _time:"
 msgstr "_Tempo de adiamento:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../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:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
+#: ../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:17
 #: ../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:37
+#: ../ui/evolution.xml.h:40
 msgid "_Edit"
 msgstr "E_ditar"
 
@@ -4569,32 +4571,32 @@ msgstr "_Adiar"
 msgid "location of appointment"
 msgstr "localização do compromisso"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Sem resumo disponível."
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1118
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Sem informação de local disponível."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Você tem %d alarmes"
 
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Alerta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4606,7 +4608,7 @@ msgstr ""
 "com notificações por e-mail. Em lugar disso, o Evolution\n"
 "exibirá uma caixa de diálogo de lembrete normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4623,7 +4625,7 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
@@ -4639,61 +4641,34 @@ msgstr "Não foi possível criar a fábrica de serviço de notificação de alar
 msgid "invalid time"
 msgstr "hora inválida"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d segundos)"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
-msgid "second"
-msgstr "segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
-#, c-format
-msgid " %u second"
-msgstr " %u segundo"
-
-#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
-#, c-format
-msgid " %u seconds"
-msgstr " %u segundos"
-
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
-#, c-format
-msgid " %u minute"
-msgstr " %u minuto"
-
-#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#. 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 " %u minutes"
-msgstr " %u minutos"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#. 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 "%u hour"
-msgstr "%u hora"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
 
-#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#. 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 "%u hours"
-msgstr "%u horas"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5105,12 +5080,12 @@ msgstr "Comentário contém"
 msgid "Location contains"
 msgstr "Local contém"
 
-#: ../calendar/gui/cal-search-bar.c:350
+#: ../calendar/gui/cal-search-bar.c:347
 msgid "Unmatched"
 msgstr "Não combinadas"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2509
+#: ../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"
@@ -5118,14 +5093,14 @@ msgstr "Imprimir"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2123
-#: ../plugins/exchange-operations/exchange-folder.c:623
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2111
+#: ../plugins/exchange-operations/exchange-folder.c:579
 #: ../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:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../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 "Agenda"
@@ -5236,7 +5211,6 @@ msgid "New calendar"
 msgstr "Nova agenda"
 
 #: ../calendar/gui/calendar-component.c:1482
-#: ../calendar/gui/dialogs/event-page.c:872
 msgid "Cale_ndar"
 msgstr "Age_nda"
 
@@ -5260,22 +5234,26 @@ msgstr "Visão de Semana"
 msgid "Month View"
 msgstr "Visão de Mês"
 
-#: ../calendar/gui/comp-editor-factory.c:420
+#: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:426
+#: ../calendar/gui/comp-editor-factory.c:421
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:432
+#: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "Permissão negada para abrir a agenda"
 
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Editar Alarme"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Alarme</b>\t"
@@ -5305,17 +5283,17 @@ msgid "Mes_sage:"
 msgstr "Men_sagem:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:449
+#: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
 msgstr "Tocar um som"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:450
 msgid "Pop up an alert"
 msgstr "Exibir um alerta"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:461
+#: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "Executar um programa"
 
@@ -5324,7 +5302,7 @@ msgid "Send To:"
 msgstr "Enviar Para:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:457
+#: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "Enviar um email"
 
@@ -5352,8 +5330,10 @@ msgstr "após"
 msgid "before"
 msgstr "antes"
 
+#. 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 "dia(s)"
 
@@ -5377,7 +5357,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Ação/Gatilho"
 
@@ -5388,7 +5368,7 @@ msgstr "A_dicionar"
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:1
 msgid "Alarms"
 msgstr "Alarmes"
 
@@ -5414,7 +5394,7 @@ msgstr "Propriedades do Anexo"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1165
+#: ../calendar/gui/e-itip-control.c:1159
 #: ../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
@@ -5433,7 +5413,7 @@ msgstr "Nome do arquivo:"
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "Agendas que devem ter alarmes"
 
@@ -5469,7 +5449,6 @@ msgstr "<span weight=\"bold\">Servidor Livre/Ocupado Padrão</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
@@ -5495,14 +5474,14 @@ msgid "Display"
 msgstr "Exibição"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:566
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Livre/Ocupado"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/recurrence-page.c:1084
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -5517,8 +5496,8 @@ msgstr ""
 "Dias"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -5542,7 +5521,7 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
@@ -5551,8 +5530,8 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/recurrence-page.c:1085
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -5569,8 +5548,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Exibir _números da semana no navegador de datas"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1053
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/e-itip-control.c:725
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -5587,13 +5566,13 @@ msgid "Template:"
 msgstr "Modelo:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Thursday"
 msgstr "Quinta-feira"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "F_uso horário:"
 
@@ -5602,127 +5581,128 @@ msgid "Time format:"
 msgstr "Formato de hora:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Tuesday"
 msgstr "Terça-feira"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "W_eek starts:"
-msgstr "A sema_na começa na:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
+#. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "A sema_na começa na:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "Dias úteis:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pedir confirm_ação ao apagar itens"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "_Comprimir finais de semana na visão de mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "_O dia começa às:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "Se_x"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "E_sconder tarefas concluídas após"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "_Seg"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "Ta_refas atrasadas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "Sá_b"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "Exibir _hora de término de compromissos nas visões de semana e mês"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "_Frações de tempo:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "_Ter"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "_Qua"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:287
+#: ../calendar/gui/dialogs/calendar-setup.c:288
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Copiar o conteúdo da agenda localmente para funcionamento desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo da lista de tarefas localmente para funcionamento "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Copy memo list contents locally for offline operation"
 msgstr ""
 "Copiar o conteúdo da lista de memorandos localmente para funcionamento "
 "desconectado"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Lista de Memorandos"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Propriedades da Agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Nova Agenda"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Propriedades da Lista de Tarefas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
 #: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Nova Lista de Memorandos"
@@ -5811,158 +5791,161 @@ msgstr "%s  Você não fez alterações, atualizar o editor?"
 msgid "Validation error: %s"
 msgstr "Erro de validação: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2267
 msgid " to "
 msgstr " para "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2271
 msgid " (Completed "
 msgstr " (Concluída "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2273
 msgid "Completed "
 msgstr "Concluída "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2278
 msgid " (Due "
 msgstr " (Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2280
 msgid "Due "
 msgstr "Prazo "
 
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Mensagem anexa - %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:2859
-#: ../composer/e-msg-composer.c:3038
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "Mensagem anexa"
 msgstr[1] "%d mensagens anexas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Cancelar _Arraste"
 
-#: ../calendar/gui/dialogs/comp-editor.c:806
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> Anexo"
 msgstr[1] "<b>%d</b> Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:982
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Esconder _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:985
-#: ../calendar/gui/dialogs/comp-editor.c:1457
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Exibir _Barra de Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1094
-#: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1206
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
+#: ../calendar/gui/dialogs/meeting-page.c:899
+#: ../calendar/gui/dialogs/task-page.c:1202
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3601
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "_Remover"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3604
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Adicionar anexo..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1481
-msgid "Attachment Button: Press space key to toggle attachment bar"
-msgstr ""
-"Botão de Anexo: Pressione a tecla de espaço para alternar a barra de anexos"
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
+msgid "Show Attachments"
+msgstr "Exibir Anexos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:1469
+msgid "Press space key to toggle attachment bar"
+msgstr "Pressione a barra de espaço para exibir ou esconder a barra de anexos"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../calendar/gui/dialogs/comp-editor.c:2137
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Reunião - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2096
-#: ../calendar/gui/dialogs/comp-editor.c:2139
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2100
-#: ../calendar/gui/dialogs/comp-editor.c:2143
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tarefa Atribuída - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2145
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2116
-#: ../calendar/gui/dialogs/comp-editor.c:2158
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
-#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
-#: ../widgets/misc/e-attachment-bar.c:342
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
+#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2761
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alterações feitas a este item poderão ser descartadas se houver uma "
 "atualização"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Impossível usar a versão atual!"
 
@@ -6039,19 +6022,31 @@ msgstr "Delegar Para:"
 msgid "Enter Delegate"
 msgstr "Especificar Representante"
 
-#: ../calendar/gui/dialogs/event-editor.c:541
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Compro_misso"
 
-#: ../calendar/gui/dialogs/event-editor.c:545
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Recorrência"
 
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2714
+msgid "This event has alarms"
+msgstr "Este evento possui alarmes"
+
+#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Age_nda:"
+
 #: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
-msgid "Or_ganizer"
-msgstr "Or_ganizador"
+msgid "Or_ganizer:"
+msgstr "Or_ganizador:"
 
 #: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
@@ -6061,148 +6056,171 @@ msgstr "_Delegados"
 msgid "Atte_ndees"
 msgstr "Participa_ntes"
 
-#: ../calendar/gui/dialogs/event-page.c:1085
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: ../calendar/gui/dialogs/event-page.c:1088
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Evento sem data de término"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
-#: ../calendar/gui/dialogs/task-page.c:851
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:852
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:908
+#: ../calendar/gui/dialogs/task-page.c:909
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionado não possui mais uma conta."
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:915
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:929
+#: ../calendar/gui/dialogs/task-page.c:930
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/meeting-page.c:915
-#: ../calendar/gui/dialogs/task-page.c:1207
+#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/meeting-page.c:900
+#: ../calendar/gui/dialogs/task-page.c:1203
 msgid "_Add "
 msgstr "_Adicionar "
 
-#: ../calendar/gui/dialogs/event-page.c:2625
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dia para o compromisso"
 msgstr[1] "%d dias para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2901
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d hora para o compromisso"
 msgstr[1] "%d horas para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.c:2909
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minuto para o compromisso"
 msgstr[1] "%d minutos para o compromisso"
 
+#: ../calendar/gui/dialogs/event-page.c:2956
+msgid "Customize"
+msgstr "Personalizar"
+
+#. 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/event-page.c:2961
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:649
+#: ../calendar/gui/e-itip-control.c:1099 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:701
+#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Nenhum"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+msgid "1 day before appointment"
+msgstr "1 dia para o compromisso"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "1 hora para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "15 minutos para o compromisso"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "1 dia para o compromisso"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "Participa_ntes..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "_Personalizar..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ca_tegorias..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "Cale_ndar:"
-msgstr "Age_nda:"
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "Alarme Personalizado:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "D_escrição:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "Descrição do Evento"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "_Local:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Or_ganizador:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "_Descrição:"
-
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "_Configurar alarme\t"
+msgid "_Alarm"
+msgstr "_Alarme"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
 msgstr "_Hora:"
 
+#. 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:8
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
 msgstr "para"
 
+#. 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:11
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
 msgid "until"
 msgstr "até"
 
@@ -6214,28 +6232,6 @@ msgstr "Dele_gados"
 msgid "From:"
 msgstr "De:"
 
-#. 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:321
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
-#: ../mail/em-folder-view.c:1106 ../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:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
-msgid "None"
-msgstr "Nenhum"
-
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6273,14 +6269,14 @@ msgstr "Membro"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:502
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:513
+#: ../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:12
 msgid "Status"
@@ -6307,47 +6303,22 @@ msgstr "Organizador"
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2308
 msgid "Memo"
 msgstr "Memorando"
 
-#: ../calendar/gui/dialogs/memo-page.c:490
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Não é possível abrir memorandos em '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">Fundamentos</span>"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-msgid "Classi_fication:"
-msgstr "Classi_ficação:"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
-msgid "Confidential"
-msgstr "Confidencial"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Private"
-msgstr "Particular"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../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:366
-msgid "Public"
-msgstr "Público"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.c:439
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "_Memo Content:"
 msgstr "Conteúdo do _Memorando:"
 
@@ -6424,51 +6395,107 @@ msgstr "Esta e Instâncias Futuras"
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:499
+#: ../calendar/gui/dialogs/recurrence-page.c:494
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui recorrências que o Evolution não pode editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:820
+#: ../calendar/gui/dialogs/recurrence-page.c:815
 msgid "Recurrence date is invalid"
 msgstr "A data da recorrência é inválida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:931
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
+#: ../calendar/gui/dialogs/recurrence-page.c:928
 msgid "on"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#. 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:992
 msgid "first"
 msgstr "primeiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#. 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:998
+msgid "second"
+msgstr "segundo"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "third"
 msgstr "terceiro"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#. 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:1008
 msgid "fourth"
 msgstr "quarto"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:995
+#. 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:1013
 msgid "last"
 msgstr "último"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
+#. * (dropdown menu options are in [square brackets]).
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "Other Date"
 msgstr "Outra Data"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#. 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:1047
+msgid "1st to 10th"
+msgstr "Primeiro ao décimo"
+
+#. 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:1053
+msgid "11th to 20th"
+msgstr "Décimo-primeiro ao vigésimo"
+
+#. 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:1059
+msgid "21st to 31st"
+msgstr "Vigésimo-primeiro ao trigésimo-primeiro"
+
+#: ../calendar/gui/dialogs/recurrence-page.c:1079
 msgid "day"
 msgstr "dia"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1183
+#. 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:1219
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1372
+#: ../calendar/gui/dialogs/recurrence-page.c:1408
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2343
+#: ../calendar/gui/dialogs/recurrence-page.c:2377
 msgid "Date/Time"
 msgstr "Data/Hora"
 
@@ -6485,27 +6512,37 @@ msgstr "<b>Visualizar</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Recorrência</b>"
 
-#: ../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 "A cada"
 
-#: ../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 "Este com_promisso se repete"
 
-#: ../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 "para sempre"
 
-#: ../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 "mês(es)"
 
-#: ../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 "semana(s)"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "ano(s)"
 
@@ -6514,7 +6551,7 @@ msgstr "ano(s)"
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
-#: ../calendar/gui/dialogs/task-details-page.c:523
+#: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "Página da Web"
 
@@ -6531,46 +6568,46 @@ msgstr "<span weight=\"bold\">Estado</span>"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "Concluída"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:386 ../mail/message-list.c:1012
 msgid "High"
 msgstr "Alta"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
 #: ../calendar/gui/e-cal-component-preview.c:228
 #: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
+#: ../calendar/gui/e-cal-model-tasks.c:653
+#: ../calendar/gui/e-cal-model-tasks.c:728
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2366
 msgid "In Progress"
 msgstr "Em Progresso"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Baixa"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
-#: ../mail/message-list.c:1015
+#: ../calendar/gui/e-cal-model.c:918 ../calendar/gui/e-calendar-table.c:387
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Normal"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
+#: ../calendar/gui/e-cal-model-tasks.c:651
+#: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/print.c:2363
 msgid "Not Started"
 msgstr "Não Iniciada"
 
@@ -6583,7 +6620,7 @@ msgid "Stat_us:"
 msgstr "_Estado:"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:389
 msgid "Undefined"
 msgstr "Indefinida"
 
@@ -6600,24 +6637,20 @@ msgstr "_Prioridade:"
 msgid "_Web Page:"
 msgstr "Página da _Web:"
 
-#: ../calendar/gui/dialogs/task-editor.c:419
-#: ../calendar/gui/tasks-component.c:1174
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1171
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "Detalhes de Tarefa"
 
-#: ../calendar/gui/dialogs/task-page.c:439
-msgid "_Group"
-msgstr "_Grupo"
-
-#: ../calendar/gui/dialogs/task-page.c:824
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: ../calendar/gui/dialogs/task-page.c:1659
+#: ../calendar/gui/dialogs/task-page.c:1653
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em '%s'."
@@ -6626,10 +6659,6 @@ msgstr "Não é possível abrir tarefas em '%s'."
 msgid "Categor_ies..."
 msgstr "Ca_tegorias..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "D_escrição:"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "Or_ganizador:"
@@ -6671,7 +6700,7 @@ msgid "_Manual"
 msgstr "_Manual"
 
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_Password:"
 msgstr "S_enha:"
 
@@ -6705,86 +6734,62 @@ msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: ../calendar/gui/e-alarm-list.c:467
+#: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Ação desconhecida a ser executada"
 
 #. 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:478
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s antes do início do compromisso"
 
 #. 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:486
+#: ../calendar/gui/e-alarm-list.c:483
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s após o início do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:493
+#: ../calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s no início do compromisso"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:504
+#: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s antes do término do compromisso"
 
 #. 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:509
+#: ../calendar/gui/e-alarm-list.c:506
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s após o término do compromisso"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:516
+#: ../calendar/gui/e-alarm-list.c:513
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s no término do compromisso"
 
 #. 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:540
+#: ../calendar/gui/e-alarm-list.c:537
 #, c-format
 msgid "%s at %s"
 msgstr "%s em %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:548
+#: ../calendar/gui/e-alarm-list.c:545
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
@@ -6795,11 +6800,11 @@ msgstr "%s para um tipo de gatilho desconhecido"
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:201
+#: ../calendar/gui/e-cal-component-memo-preview.c:166
 msgid "Memo:"
 msgstr "Memorando:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "Página da Web:"
@@ -6809,7 +6814,7 @@ msgid "Untitled"
 msgstr "Sem título"
 
 #: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1109
+#: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
@@ -6826,9 +6831,9 @@ msgstr "Data de Conclusão:"
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-itip-control.c:1127
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "Estado:"
 
@@ -6836,6 +6841,21 @@ msgstr "Estado:"
 msgid "Priority:"
 msgstr "Prioridade:"
 
+#: ../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:364
+msgid "Public"
+msgstr "Público"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:365
+msgid "Private"
+msgstr "Particular"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:366
+msgid "Confidential"
+msgstr "Confidencial"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data de Término"
@@ -6852,17 +6872,17 @@ msgid "Summary"
 msgstr "Resumo"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:438
 msgid "Free"
 msgstr "Livre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
-#: ../calendar/gui/e-meeting-time-sel.c:415
+#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../calendar/gui/e-cal-model-tasks.c:608
+#: ../calendar/gui/e-cal-model-tasks.c:603
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6872,196 +6892,191 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
-#: ../calendar/gui/e-meeting-store.c:809
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:193
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Sim"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
-#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:181
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Não"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:166 ../calendar/gui/e-itip-control.c:1150
-#: ../calendar/gui/e-itip-control.c:1291
-#: ../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: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:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
 #: ../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:691
-#: ../widgets/misc/e-charset-picker.c:62
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
+#: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../calendar/gui/e-cal-model.c:922
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Repetindo"
 
-#: ../calendar/gui/e-cal-model.c:924
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Atribuído"
 
-#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Salvar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Selecione a pasta para salvar os anexos selecionados..."
 
-#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_titulo.%s"
 
-#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Salvar Como..."
 
-#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Usar como Imagem de _Fundo"
 
-#: ../calendar/gui/e-cal-popup.c:273
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Salvar Selecionado"
 
-#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir com %s..."
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:408
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:409
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:410
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:411
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:412
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:413
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:414
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:415
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:416
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:418
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:527
-msgid "Task Table"
-msgstr "Tabela de Tarefas"
-
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-table.c:703
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-table.c:882
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
-#: ../composer/e-msg-composer.c:1354
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Salvar como..."
 
-#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Abrir Página da _Web"
 
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
+#: ../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 "Im_primir..."
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: ../calendar/gui/e-calendar-table.c:1185
-#: ../calendar/gui/e-calendar-view.c:1595
-#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
+#: ../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 "C_olar"
 
-#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Atribuir Tarefa"
 
-#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Encaminhar como iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1191
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_Marcar Como Concluída"
 
-#: ../calendar/gui/e-calendar-table.c:1192
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar Tarefas Selecionadas como Concluídas"
 
-#: ../calendar/gui/e-calendar-table.c:1197
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir Tarefas Selecionadas"
 
-#: ../calendar/gui/e-calendar-table.c:1430
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
@@ -7096,105 +7111,105 @@ msgstr "Data de início"
 msgid "Task sort"
 msgstr "Ordenar tarefas"
 
-#: ../calendar/gui/e-calendar-view.c:1267
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Movendo os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1269
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Copiando os itens"
 
-#: ../calendar/gui/e-calendar-view.c:1586
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: ../calendar/gui/e-calendar-view.c:1587
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Inteiro"
 
-#: ../calendar/gui/e-calendar-view.c:1588
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Nova _Reunião"
 
-#: ../calendar/gui/e-calendar-view.c:1589
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "Nova _Tarefa"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1599
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Visão Atual"
 
-#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Selecionar _Hoje"
 
-#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Selecionar Data..."
 
-#: ../calendar/gui/e-calendar-view.c:1618
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para a A_genda..."
 
-#: ../calendar/gui/e-calendar-view.c:1619
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para a Agenda..."
 
-#: ../calendar/gui/e-calendar-view.c:1620
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "_Delegar Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1621
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Agendar _Reunião..."
 
-#: ../calendar/gui/e-calendar-view.c:1622
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1623
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559 ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ../calendar/gui/e-calendar-view.c:1629
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Tor_nar esta Ocorrência Móvel"
 
-#: ../calendar/gui/e-calendar-view.c:1630
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta Ocorrência"
 
-#: ../calendar/gui/e-calendar-view.c:1631
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir Todas as Ocorrências"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2045
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizador: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Local: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2095
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "Data: %s %s de "
@@ -7224,7 +7239,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:557
+#: ../calendar/gui/e-day-view-time-item.c:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i frações de minuto"
@@ -7235,111 +7250,111 @@ msgstr "%02i frações de minuto"
 #. 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:313 ../calendar/gui/print.c:1528
+#: ../calendar/gui/e-day-view-top-item.c:707 ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1525
 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:843
+#: ../calendar/gui/e-day-view.c:744 ../calendar/gui/e-week-view.c:503
+#: ../calendar/gui/print.c:841
 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:845
+#: ../calendar/gui/e-day-view.c:747 ../calendar/gui/e-week-view.c:506
+#: ../calendar/gui/print.c:843
 msgid "pm"
 msgstr "pm"
 
-#: ../calendar/gui/e-itip-control.c:762
+#: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência Complexa)"
 
-#: ../calendar/gui/e-itip-control.c:773
+#: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todo dia"
 msgstr[1] "A cada %d dias"
 
-#: ../calendar/gui/e-itip-control.c:778
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toda semana"
 msgstr[1] "A cada %d semanas"
 
-#: ../calendar/gui/e-itip-control.c:780
+#: ../calendar/gui/e-itip-control.c:777
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Toda semana em "
 msgstr[1] "A cada %d semanas em "
 
-#: ../calendar/gui/e-itip-control.c:788
+#: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " e "
 
-#: ../calendar/gui/e-itip-control.c:795
+#: ../calendar/gui/e-itip-control.c:792
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:805
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: ../calendar/gui/e-itip-control.c:815
+#: ../calendar/gui/e-itip-control.c:812
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todo mês"
 msgstr[1] "a cada %d meses"
 
-#: ../calendar/gui/e-itip-control.c:819
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todo ano"
 msgstr[1] "A cada %d anos"
 
-#: ../calendar/gui/e-itip-control.c:830
+#: ../calendar/gui/e-itip-control.c:827
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
-#: ../calendar/gui/e-itip-control.c:839
+#: ../calendar/gui/e-itip-control.c:836
 msgid ", ending on "
 msgstr ", terminando em "
 
-#: ../calendar/gui/e-itip-control.c:863
+#: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "Começa"
 
-#: ../calendar/gui/e-itip-control.c:876
+#: ../calendar/gui/e-itip-control.c:870
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:910
+#: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "Prazo"
 
-#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
+#: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:967
+#: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
-#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
+#: ../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:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -7348,7 +7363,7 @@ msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1090
+#: ../calendar/gui/e-itip-control.c:1084
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7356,28 +7371,28 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informação e então selecione uma ação a "
 "partir do menu abaixo."
 
-#: ../calendar/gui/e-itip-control.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-meeting-list-view.c:205
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "Aceito"
 
-#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "Aceito Preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:1146
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-itip-control.c:1140
+#: ../calendar/gui/e-meeting-list-view.c:206
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "Recusado"
 
-#: ../calendar/gui/e-itip-control.c:1230
+#: ../calendar/gui/e-itip-control.c:1224
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -7385,269 +7400,265 @@ msgstr ""
 "A reunião foi cancelada, no entando ela não pôde ser encontrada nas suas "
 "agendas"
 
-#: ../calendar/gui/e-itip-control.c:1232
+#: ../calendar/gui/e-itip-control.c:1226
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "A tarefa foi cancelada, no entando ela não pôde ser encontrada nas suas "
 "listas de tarefas"
 
-#: ../calendar/gui/e-itip-control.c:1311
+#: ../calendar/gui/e-itip-control.c:1305
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informação de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1318
+#: ../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> requisita a presença de %s em uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1320
+#: ../calendar/gui/e-itip-control.c:1314
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requisita a sua presença em uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1321
+#: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1327
+#: ../calendar/gui/e-itip-control.c:1321
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicioná-lo a uma reunião existente."
 
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "Atualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1332
+#: ../calendar/gui/e-itip-control.c:1326
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1327
 msgid "Meeting Update Request"
 msgstr "_Pedido de Atualização de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1340
+#: ../calendar/gui/e-itip-control.c:1334
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "Resposta à Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1348
+#: ../calendar/gui/e-itip-control.c:1342
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1343
 msgid "Meeting Cancelation"
 msgstr "Cancelamento de Reunião"
 
-#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
-#: ../calendar/gui/e-itip-control.c:1476
+#: ../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> enviou uma mensagem incompreensível."
 
-#: ../calendar/gui/e-itip-control.c:1360
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1381
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "Informação de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1389
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requisita que %s execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1397
+#: ../calendar/gui/e-itip-control.c:1391
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requisita que você execute uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1404
+#: ../calendar/gui/e-itip-control.c:1398
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja acrescentá-lo a uma tarefa existente."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Task Update"
 msgstr "Atualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1409
+#: ../calendar/gui/e-itip-control.c:1403
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
 
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1404
 msgid "Task Update Request"
 msgstr "Pedido de Atualização de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1417
+#: ../calendar/gui/e-itip-control.c:1411
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "Resposta à Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1425
+#: ../calendar/gui/e-itip-control.c:1419
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1420
 msgid "Task Cancelation"
 msgstr "Cancelamento de Tarefa"
 
-#: ../calendar/gui/e-itip-control.c:1437
+#: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1461
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1466
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1465
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: ../calendar/gui/e-itip-control.c:1552
+#: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem não aparenta estar formada corretamente"
 
-#: ../calendar/gui/e-itip-control.c:1611
+#: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: ../calendar/gui/e-itip-control.c:1644
+#: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo não contém uma mensagem de agenda válida"
 
-#: ../calendar/gui/e-itip-control.c:1676
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de agenda visualizáveis"
 
-#: ../calendar/gui/e-itip-control.c:1910
+#: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: ../calendar/gui/e-itip-control.c:1938
+#: ../calendar/gui/e-itip-control.c:1932
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto é inválido e não pode ser atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1948
+#: ../calendar/gui/e-itip-control.c:1942
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:1960
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
 
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:1980
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: ../calendar/gui/e-itip-control.c:2010
-msgid "Removal Complete"
-msgstr "Remoção Concluída"
-
-#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:1998 ../calendar/gui/e-itip-control.c:2046
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2000 ../calendar/gui/e-itip-control.c:2050
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
-#: ../calendar/gui/e-itip-control.c:2165
+#: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: ../calendar/gui/e-itip-control.c:2237
+#: ../calendar/gui/e-itip-control.c:2202
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../calendar/gui/e-itip-control.c:2265
+#: ../calendar/gui/e-itip-control.c:2230
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../calendar/gui/e-itip-control.c:2266
+#: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: ../calendar/gui/e-itip-control.c:2267
+#: ../calendar/gui/e-itip-control.c:2232
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2289
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: ../calendar/gui/e-itip-control.c:2352
+#: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "Enviar Informação Mais Recente"
 
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:692
 #: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
@@ -7690,99 +7701,99 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: ../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 "Participantes Necessários"
 
-#: ../calendar/gui/e-meeting-list-view.c:71
+#: ../calendar/gui/e-meeting-list-view.c:72
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: ../calendar/gui/e-meeting-list-view.c:72
+#: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "Recursos"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
+#: ../calendar/gui/e-meeting-list-view.c:165
 #: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:803
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "Indivíduo"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupo"
 
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../calendar/gui/e-meeting-list-view.c:167
+#: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "Sala"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "Moderador"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
+#: ../calendar/gui/e-meeting-list-view.c:180
 #: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:806
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "Participante Necessário"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "Não Participante"
 
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
-#: ../calendar/gui/e-meeting-store.c:816
+#: ../calendar/gui/e-meeting-list-view.c:204
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "Necessita Ação"
 
-#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-list-view.c:207
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Delegado"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:463
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Participante                      "
 
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 msgid "In Process"
 msgstr "Em Andamento"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2105
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B, %Y"
 
@@ -7790,93 +7801,86 @@ msgstr "%A, %d de %B, %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2138
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. 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
-#: ../widgets/misc/e-dateedit.c:1737
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do Escritório"
 
-#: ../calendar/gui/e-meeting-time-sel.c:417
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Sem Informação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:431
-msgid "Con_tacts..."
-msgstr "Con_tatos..."
+#: ../calendar/gui/e-meeting-time-sel.c:427
+msgid "A_ttendees..."
+msgstr "Participa_ntes..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:448
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "O_pções"
 
-#: ../calendar/gui/e-meeting-time-sel.c:465
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Exibir apenas _horas de expediente"
 
-#: ../calendar/gui/e-meeting-time-sel.c:475
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Exibir com _menos ampliação"
 
-#: ../calendar/gui/e-meeting-time-sel.c:490
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: ../calendar/gui/e-meeting-time-sel.c:505
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:523
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "Auto_seleção"
 
-#: ../calendar/gui/e-meeting-time-sel.c:538
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:555
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "Todas as _pessoas e recursos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Todas as pessoas e um _recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:573
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
-#: ../calendar/gui/e-meeting-time-sel.c:582
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: ../calendar/gui/e-meeting-time-sel.c:618
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "_Hora de início:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:645
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
-#: ../calendar/gui/e-memo-table.c:276
-msgid "Memo Table"
-msgstr "Tabela de Memorandos"
-
-#: ../calendar/gui/e-memo-table.c:872
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "_Excluir Memorandos Selecionadas"
 
-#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:993 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Clique para adicionar um memorando"
 
@@ -7884,8 +7888,8 @@ msgstr "Clique para adicionar um memorando"
 msgid "Memo sort"
 msgstr "Ordenar memorandos"
 
-#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
-#: ../calendar/gui/gnome-cal.c:2571
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
+#: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7894,16 +7898,16 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:776
+#: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
 msgstr "Carregando memorandos"
 
-#: ../calendar/gui/e-memos.c:861
+#: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abrindo memorandos em %s"
 
-#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
@@ -7912,66 +7916,66 @@ msgstr "Excluindo objetos selecionados..."
 msgid "Enter the password for %s"
 msgstr "Digite a senha para %s"
 
-#: ../calendar/gui/e-tasks.c:871
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: ../calendar/gui/e-tasks.c:958
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: ../calendar/gui/e-tasks.c:1203
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: ../calendar/gui/e-tasks.c:1253
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
 #: ../calendar/gui/e-timezone-entry.c:133
-msgid "Timezone Button"
-msgstr "Botão de Fuso Horário "
+msgid "Select Timezone"
+msgstr "Selecionar um Fuso Horário"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
+#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:792
+#: ../calendar/gui/gnome-cal.c:786
 msgid "Updating query"
 msgstr "Atualizando consulta"
 
-#: ../calendar/gui/gnome-cal.c:2246
+#: ../calendar/gui/gnome-cal.c:2234
 msgid "_Custom View"
 msgstr "_Visão Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2247
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "_Save Custom View"
 msgstr "_Salvar Visão Personalizada"
 
-#: ../calendar/gui/gnome-cal.c:2252
+#: ../calendar/gui/gnome-cal.c:2240
 msgid "_Define Views..."
 msgstr "_Definir Visões..."
 
-#: ../calendar/gui/gnome-cal.c:2414
+#: ../calendar/gui/gnome-cal.c:2402
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: ../calendar/gui/gnome-cal.c:2433
+#: ../calendar/gui/gnome-cal.c:2421
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: ../calendar/gui/gnome-cal.c:2537
+#: ../calendar/gui/gnome-cal.c:2525
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: ../calendar/gui/gnome-cal.c:3458
+#: ../calendar/gui/gnome-cal.c:3430
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
@@ -8040,19 +8044,19 @@ msgstr "É necessário configurar um organizador."
 msgid "At least one attendee is necessary"
 msgstr "É necessário pelo menos um participante"
 
-#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:754
 msgid "Event information"
 msgstr "Informação de evento"
 
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:756
 msgid "Task information"
 msgstr "Informação de tarefa"
 
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:758
 msgid "Journal information"
 msgstr "Informação de diário"
 
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:776
 msgid "Free/Busy information"
 msgstr "Informação de Livre/Ocupado"
 
@@ -8072,16 +8076,16 @@ msgstr "Atualizar"
 msgid "Counter-proposal"
 msgstr "Contra-proposta"
 
-#: ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:772
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Informação de livre/ocupado (%s para %s)"
 
-#: ../calendar/gui/itip-utils.c:785
+#: ../calendar/gui/itip-utils.c:782
 msgid "iCalendar information"
 msgstr "Informação iCalendar"
 
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:937
 msgid "You must be an attendee of the event."
 msgstr "Você deve ser um participante do evento."
 
@@ -8131,31 +8135,31 @@ msgstr ""
 msgid "There is no calendar available for creating memos"
 msgstr "Não existe agenda disponível para a criação de memorandos"
 
-#: ../calendar/gui/memos-component.c:975
+#: ../calendar/gui/memos-component.c:972
 msgid "Memo Source Selector"
 msgstr "Seletor de Fonte de Memorando"
 
-#: ../calendar/gui/memos-component.c:1158
+#: ../calendar/gui/memos-component.c:1155
 msgid "New memo"
 msgstr "Novo memorando"
 
-#: ../calendar/gui/memos-component.c:1159
+#: ../calendar/gui/memos-component.c:1156
 msgid "_Memo"
 msgstr "_Memorando"
 
-#: ../calendar/gui/memos-component.c:1160
+#: ../calendar/gui/memos-component.c:1157
 msgid "Create a new memo"
 msgstr "Criar um novo memorando"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1163
 msgid "New memo list"
 msgstr "Nova lista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1164
 msgid "Memo l_ist"
 msgstr "L_ista de memorandos"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1165
 msgid "Create a new memo list"
 msgstr "Criar uma nova lista de memorandos"
 
@@ -8330,115 +8334,115 @@ msgid "31st"
 msgstr "31 de"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Su"
 msgstr "D"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Mo"
 msgstr "S"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "Tu"
 msgstr "T"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:574
 msgid "We"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Th"
 msgstr "Q"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Fr"
 msgstr "S"
 
-#: ../calendar/gui/print.c:576
+#: ../calendar/gui/print.c:575
 msgid "Sa"
 msgstr "S"
 
 #. Day
-#: ../calendar/gui/print.c:1928
+#: ../calendar/gui/print.c:1923
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Dia selecionado (%a %d %b %Y)"
 
-#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
+#: ../calendar/gui/print.c:1948 ../calendar/gui/print.c:1952
 msgid "%a %b %d"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1949
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
-#: ../calendar/gui/print.c:1961
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1955
+#: ../calendar/gui/print.c:1956
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
 
-#: ../calendar/gui/print.c:1965
+#: ../calendar/gui/print.c:1960
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Semana selecionada (%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1973
+#: ../calendar/gui/print.c:1968
 msgid "Selected month (%b %Y)"
 msgstr "Mês selecionado (%b %Y)"
 
 #. Year
-#: ../calendar/gui/print.c:1980
+#: ../calendar/gui/print.c:1975
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: ../calendar/gui/print.c:2309
+#: ../calendar/gui/print.c:2304
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: ../calendar/gui/print.c:2311
+#: ../calendar/gui/print.c:2306
 msgid "Task"
 msgstr "Tarefa"
 
-#: ../calendar/gui/print.c:2333
+#: ../calendar/gui/print.c:2328
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:2384
+#: ../calendar/gui/print.c:2379
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:2401
+#: ../calendar/gui/print.c:2396
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:2413
+#: ../calendar/gui/print.c:2408
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentagem Concluída: %i"
 
-#: ../calendar/gui/print.c:2425
+#: ../calendar/gui/print.c:2420
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2439
+#: ../calendar/gui/print.c:2434
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorias: %s"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2445
 msgid "Contacts: "
 msgstr "Contatos: "
 
-#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
-#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2585 ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2799 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Visualizar Impressão"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2620
 msgid "Print Item"
 msgstr "Imprimir Item"
 
@@ -8467,43 +8471,43 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
-#: ../calendar/gui/tasks-component.c:990
+#: ../calendar/gui/tasks-component.c:987
 msgid "Task Source Selector"
 msgstr "Seletor de Fonte de Tarefa"
 
-#: ../calendar/gui/tasks-component.c:1173
+#: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1175
+#: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: ../calendar/gui/tasks-component.c:1181
+#: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "Nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1182
+#: ../calendar/gui/tasks-component.c:1179
 msgid "Assigne_d Task"
 msgstr "Tarefa _Atribuída"
 
-#: ../calendar/gui/tasks-component.c:1183
+#: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "Criar uma nova tarefa atribuída"
 
-#: ../calendar/gui/tasks-component.c:1189
+#: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "Nova lista de tarefas"
 
-#: ../calendar/gui/tasks-component.c:1190
+#: ../calendar/gui/tasks-component.c:1187
 msgid "Task l_ist"
 msgstr "_Lista de Tarefas"
 
-#: ../calendar/gui/tasks-component.c:1191
+#: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "Criar uma nova lista de tarefas"
 
-#: ../calendar/gui/tasks-control.c:435
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8516,11 +8520,11 @@ msgstr ""
 "\n"
 "Apagar estas tarefas mesmo assim?"
 
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Não me pergunte novamente."
 
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "Imprimir Tarefas"
 
@@ -10115,7 +10119,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:995
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Barra de Anexos"
 
@@ -10124,27 +10128,27 @@ msgstr "Barra de Anexos"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Não é possível anexar o arquivo %s: %s"
 
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Não é possível anexar o arquivo %s: não é um arquivo comum"
 
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Publicando destino"
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Escolha as pastas onde publicar a mensagem."
 
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Clique aqui para abrir o catálogo de endereços"
 
@@ -10155,45 +10159,45 @@ msgstr "Clique aqui para abrir o catálogo de endereços"
 #. * 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:619
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_De:"
 
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "Ass_unto:"
 
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Digite os destinatários da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Digite os endereços que receberão uma cópia da mensagem"
 
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10204,15 +10208,15 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Publicar Em:"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Clique aqui para selecionar as pastas onde publicar"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Publicar Em:"
 
@@ -10224,14 +10228,14 @@ msgstr "Ane_xar"
 msgid "Insert Attachment"
 msgstr "Inserir Anexo"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Impossível assinar a mensagem a ser enviada: Não existe certificado de "
 "assinatura configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -10239,52 +10243,52 @@ msgstr ""
 "Impossível criptografar a mensagem a ser enviada: Não existe certificado de "
 "criptografia configurado para esta conta"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Esconder Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
-#: ../composer/e-msg-composer.c:3847
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Exibir Barra de _Anexos"
 
-#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "Razão desconhecida"
 
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "Não foi possível abrir o arquivo"
 
-#: ../composer/e-msg-composer.c:1415
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "Não foi possível obter mensagem do editor"
 
-#: ../composer/e-msg-composer.c:1693
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "Mensagem sem Título"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1728
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "Abrir Arquivo"
 
-#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:606
+#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
-#: ../composer/e-msg-composer.c:2258
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Assi_natura:"
 
-#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
-#: ../composer/e-msg-composer.c:3732
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Redigir Mensagem"
 
-#: ../composer/e-msg-composer.c:4956
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10425,7 +10429,7 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "Você deve configurar uma conta antes de poder redigir uma mensagem."
 
 #: ../composer/mail-composer.error.xml.h:28
-msgid "_Don't Recover"
+msgid "_Do not Recover"
 msgstr "_Não Recuperar"
 
 #: ../composer/mail-composer.error.xml.h:29
@@ -10442,9 +10446,13 @@ msgstr "_Salvar Mensagem"
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2
-msgid "The Evolution Groupware Suite"
-msgstr "O Conjunto de Aplicações para Grupos de Trabalho Evolution"
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+msgid "Groupware Suite"
+msgstr "Conjunto de Aplicativos de Groupware"
+
+#: ../data/evolution.desktop.in.in.h:3
+msgid "The Evolution PIM and Email Client"
+msgstr "Evolution: Cliente de Email e Gerenciador de Informações Pessoais"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10589,12 +10597,10 @@ msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:442
+#: ../e-util/e-error.c:443
 #, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr ""
-"<span weight=\"bold\">Erro interno, foi pedido erro desconhecido '%s'</span>"
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Erro interno, foi pedido erro desconhecido '%s'"
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
@@ -10612,7 +10618,7 @@ msgstr "Você deseja sobrescrevê-lo?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "Arquivo existe &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
@@ -10691,20 +10697,19 @@ msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
 #: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Mais tarde"
 
@@ -10753,11 +10758,11 @@ msgid "Include threads"
 msgstr "Incluir encadeamentos"
 
 #: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:349
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Recebidas"
 
-#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Enviadas"
 
@@ -10781,7 +10786,7 @@ msgstr "Data faltando."
 msgid "Missing file name."
 msgstr "Nome do arquivo faltando."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "Nome faltando."
 
@@ -10853,6 +10858,10 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "segundos"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "o instante atual"
@@ -10865,15 +10874,15 @@ msgstr "um instante especificado por você"
 msgid "years"
 msgstr "anos"
 
-#: ../filter/rule-editor.c:292
+#: ../filter/rule-editor.c:378
 msgid "Add Rule"
 msgstr "Adicionar Regra"
 
-#: ../filter/rule-editor.c:368
+#: ../filter/rule-editor.c:454
 msgid "Edit Rule"
 msgstr "Editar Regra"
 
-#: ../filter/rule-editor.c:735
+#: ../filter/rule-editor.c:732
 msgid "Rule name"
 msgstr "Nome da regra"
 
@@ -10932,11 +10941,12 @@ msgid "Mail"
 msgstr "Correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: ../mail/em-account-prefs.c:531
 msgid "Mail Accounts"
 msgstr "Contas de Correio"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferências de Correio"
 
@@ -10944,12 +10954,12 @@ msgstr "Preferências de Correio"
 msgid "_Mail"
 msgstr "_Correio"
 
-#: ../mail/em-account-editor.c:395
+#: ../mail/em-account-editor.c:403
 #, c-format
 msgid "%s License Agreement"
 msgstr "Acordo de Licença %s"
 
-#: ../mail/em-account-editor.c:402
+#: ../mail/em-account-editor.c:410
 #, c-format
 msgid ""
 "\n"
@@ -10962,92 +10972,88 @@ msgstr ""
 "licença para %s exibido\n"
 "abaixo e marque a caixa para aceitá-lo\n"
 
-#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "Selecionar Pasta"
 
-#: ../mail/em-account-editor.c:768
+#: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "Perguntar para cada mensagem"
 
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "Identidade"
 
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recebendo Mensagem"
 
-#: ../mail/em-account-editor.c:1979
+#: ../mail/em-account-editor.c:2013
 msgid "Automatically check for _new mail every"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2194 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviando Mensagem"
 
-#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2253 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "Padrões"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2319 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "Segurança"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2356 ../mail/em-account-editor.c:2447
 msgid "Receiving Options"
 msgstr "Opções de Recepção"
 
-#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Checking for New Mail"
 msgstr "Verificando Novas Mensagens"
 
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "Editor de Contas"
 
-#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2795 ../mail/mail-config.glade.h:80
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas do Evolution"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:407
+#: ../mail/em-account-prefs.c:409
 msgid "Disable"
 msgstr "Desativar"
 
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../mail/em-account-prefs.c:411
 msgid "Enable"
 msgstr "Ativar"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:459
+#: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[Padrão]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:524
 msgid "Account name"
 msgstr "Nome da conta"
 
-#: ../mail/em-account-prefs.c:520
+#: ../mail/em-account-prefs.c:526
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../mail/em-account-prefs.c:525
-msgid "Mail Accounts Table"
-msgstr "Tabela de Contas de Correio"
-
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:967
 msgid "Unnamed"
@@ -11065,18 +11071,18 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: ../mail/em-composer-utils.c:1658
+#: ../mail/em-composer-utils.c:1666
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1705
+#: ../mail/em-composer-utils.c:1713
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11213,7 +11219,7 @@ msgstr "não é"
 msgid "is not Flagged"
 msgstr "não está Marcada"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Indesejada"
@@ -11222,8 +11228,7 @@ msgstr "Indesejada"
 msgid "Junk Test"
 msgstr "Teste de Indesejada"
 
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Rótulo"
 
@@ -11331,7 +11336,7 @@ msgstr "começa com"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
@@ -11349,26 +11354,26 @@ msgstr "Desconfigurar Estado"
 msgid "<b>Then</b>"
 msgstr "<b>Então</b>"
 
-#: ../mail/em-folder-browser.c:143
+#: ../mail/em-folder-browser.c:144
 msgid "C_reate Search Folder From Search..."
 msgstr "C_riar Pasta de Pesquisa a Partir da Pesquisa..."
 
 #. 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:145
+#: ../mail/em-folder-properties.c:150
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Total de mensagem:"
 msgstr[1] "Total de mensagens:"
 
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:158
+#: ../mail/em-folder-properties.c:163
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Mensagem não lida:"
 msgstr[1] "Mensagens não lidas:"
 
-#: ../mail/em-folder-properties.c:289
+#: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:3
 msgid "Folder Properties"
 msgstr "Propriedades da Pasta"
@@ -11401,7 +11406,7 @@ msgstr "Rascunhos"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:641
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
@@ -11431,12 +11436,12 @@ msgstr "Movendo pasta %s"
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
@@ -11462,7 +11467,7 @@ msgstr "Varrendo pastas em \"%s\""
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:52
 msgid "_View"
 msgstr "_Ver"
 
@@ -11487,7 +11492,7 @@ msgstr "_Nova Pasta..."
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
 msgid "_Empty Trash"
 msgstr "Es_vaziar Lixeira"
 
@@ -11507,20 +11512,20 @@ msgid "C_opy"
 msgstr "C_opiar"
 
 #: ../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 "Criando pasta `%s'"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Create folder"
 msgstr "Criar pasta"
 
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:384
+#: ../plugins/groupwise-features/share-folder-common.c:388
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
@@ -11577,6 +11582,14 @@ msgstr "Marcar Como _Não Indesejada"
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar Como _Lembrete..."
 
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Rótulo"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "_Nenhum"
+
 #: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Marcar Como Concl_uída"
@@ -11658,16 +11671,16 @@ msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:493
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Ocorrências: %d"
 
-#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Não assinada"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -11675,11 +11688,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:757 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: ../mail/em-format-html-display.c:754
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11687,11 +11700,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:758 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -11699,11 +11712,11 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito."
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, não é possível verificar remetente"
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11711,11 +11724,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Não Criptografada"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11723,11 +11736,11 @@ msgstr ""
 "Esta mensagem não está criptografada. O seu conteúdo pode ser visto em "
 "trânsito através da Internet."
 
-#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Criptografada, fraca"
 
-#: ../mail/em-format-html-display.c:763
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11737,11 +11750,11 @@ msgstr ""
 "fraco. Seria difícil, mas não impossível, que um estranho conseguisse ver o "
 "conteúdo desta mensagem em uma quantidade de tempo razoável."
 
-#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:767 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Criptografada"
 
-#: ../mail/em-format-html-display.c:764
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -11749,11 +11762,11 @@ msgstr ""
 "Esta mensagem está criptografada. Seria difícil que um estranho conseguisse "
 "ver o conteúdo desta mensagem."
 
-#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:768 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Criptografada, forte"
 
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11763,75 +11776,72 @@ msgstr ""
 "Seria muito difícil para um estranho conseguir ver o conteúdo desta mensagem "
 "em uma quantidade de tempo razoável."
 
-#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:869 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ver Certificado"
 
-#: ../mail/em-format-html-display.c:881
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: ../mail/em-format-html-display.c:1169
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Concluída em %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Ver Embutido"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "A_justar para Largura"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Mostrar o Tamanho _Original"
 
-#: ../mail/em-format-html-display.c:1620
-msgid "Attachment Button"
-msgstr "Botão de Anexo"
+#: ../mail/em-format-html-display.c:1667 ../mail/mail-config.glade.h:45
+#: ../mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Anexo"
 
-#: ../mail/em-format-html-display.c:1827
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Selecionar a pasta para salvar todos os anexos..."
 
-#: ../mail/em-format-html-display.c:1874
-msgid "Save Selected..."
-msgstr "Salvar Selecionado..."
+#: ../mail/em-format-html-display.c:1921
+msgid "_Save Selected..."
+msgstr "_Salvar Selecionado..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1941
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d a_nexo"
 msgstr[1] "%d a_nexos"
 
-#: ../mail/em-format-html-display.c:1948 ../mail/em-format-html-display.c:2024
+#: ../mail/em-format-html-display.c:1995 ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Salvar"
 
-#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "Salvar _Tudo"
 
-#: ../mail/em-format-html-display.c:2018
-msgid "Toggle Attachment Bar"
-msgstr "Alternar Barra de Anexos"
-
-#: ../mail/em-format-html-display.c:2020
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Sem Anexo"
 
@@ -11849,89 +11859,90 @@ msgstr "Buscando `%s'"
 msgid "Valid signature but cannot verify sender"
 msgstr "Assinatura válida, mas não é possível verificar o remetente"
 
-#: ../mail/em-format-html.c:880
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para site FTP (%s)"
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para arquivo local (%s) válido no site \"%s\""
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para arquivo local (%s)"
 
-#: ../mail/em-format-html.c:944
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: ../mail/em-format-html.c:1181
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../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 "De"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Para"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format-html.c:1476 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "Bcc"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1000
+#: ../mail/em-format-html.c:1588 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Programa de correio"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1613
+#: ../mail/em-format-html.c:1615
 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:1616
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format-html.c:1628 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
+#: ../widgets/misc/e-dateedit.c:363
 msgid "Date"
 msgstr "Data"
 
-#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1651 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "Grupos de Notícias"
@@ -11941,27 +11952,27 @@ msgstr "Grupos de Notícias"
 msgid "%s attachment"
 msgstr "anexo %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:1576
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Não foi possível analisar a mensagem S/MIME: Erro desconhecido"
 
-#: ../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 "Não foi possível analisar a mensagem MIME. Exibindo como fonte."
 
-#: ../mail/em-format.c:1278
+#: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de criptografia não suportada para multiparte/criptografado"
 
-#: ../mail/em-format.c:1445
+#: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Error verifying signature"
 msgstr "Erro ao verificar assinatura"
 
-#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
@@ -12060,7 +12071,7 @@ msgid "_Send New Message To..."
 msgstr "En_viar Nova Mensagem Para..."
 
 #: ../mail/em-popup.c:622
-msgid "_Add to Addressbook"
+msgid "_Add to Address Book"
 msgstr "_Adicionar ao Catálogo de Endereços"
 
 #: ../mail/em-subscribe-editor.c:615
@@ -12088,24 +12099,24 @@ msgstr "Não foi selecionado um servidor"
 msgid "Do not show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: ../mail/em-utils.c:357
-msgid "Filters"
-msgstr "Filtros"
+#: ../mail/em-utils.c:319
+msgid "Message Filters"
+msgstr "F_iltros de Mensagens"
 
-#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
+#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
 msgid "message"
 msgstr "mensagem"
 
-#: ../mail/em-utils.c:672
+#: ../mail/em-utils.c:634
 msgid "Save Message..."
 msgstr "Salvar Mensagem..."
 
-#: ../mail/em-utils.c:721
+#: ../mail/em-utils.c:683
 msgid "Add address"
 msgstr "Adicionar endereço"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1205
+#: ../mail/em-utils.c:1167
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -12625,14 +12636,14 @@ msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importador de pastas no formato Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../plugins/startup-wizard/startup-wizard.c:237
 #: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Por favor, aguarde"
@@ -12642,7 +12653,7 @@ msgstr "Por favor, aguarde"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
 
-#: ../mail/importers/mail-importer.c:377
+#: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "Varrendo %s"
@@ -12843,6 +12854,30 @@ msgstr "Criar uma nova pasta de correio"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao atualizar configurações ou pastas de correio."
 
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "Importante"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_Trabalho"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Pessoal"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "A _Fazer"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Mais tarde"
+
 #: ../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
@@ -13006,10 +13041,6 @@ msgstr "_Criptografar sempre para mim, mesmo ao enviar correio criptografado"
 msgid "Attach original message"
 msgstr "Anexar a mensagem original"
 
-#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Anexo"
-
 #: ../mail/mail-config.glade.h:46
 msgid "Automatically insert _smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
@@ -13132,62 +13163,66 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "Criptografar _mensagens enviadas (por padrão)"
 
 #: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr "Fonte de Largura Fi_xa:"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "Largura Fi_xa:"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "Propriedades da Fonte"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "Nome _Completo:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correio HTML"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "I_ncluir testes remotos"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "Embutido"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "Tabela de Idiomas"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "Configuração de Correio"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "Tabela de Cabeçalhos de Correio"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Redator de Mensagens"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -13195,19 +13230,19 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "_Empresa:"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da C_have PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "Toque um arqui_vo de som quando uma nova mensagem chegar"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13215,7 +13250,7 @@ msgstr ""
 "Por favor, digite um nome descritivo para esta conta no espaço abaixo.\n"
 "Este nome será usado apenas com o propósito de exibição."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13224,7 +13259,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -13235,114 +13270,110 @@ msgstr ""
 "menos que você queira estas informações incluídas em toda mensagem de "
 "correio enviada."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar a mensagem original"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Responder a:"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "S_elecionar..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "Fonte _Padrão:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "Se_lecionar..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "Selecionar um arquivo de som"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "Enviar destinatários da mensagem:"
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Enviando Correio"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "_Tipo do Servidor: "
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "Certificado de assi_natura:"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "_Assinatura:"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "Tabelas de Assinaturas"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificação Ortográfica"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_erminal Font:"
-msgstr "Fonte de _Terminal:"
-
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "Ti_po: "
@@ -13447,23 +13478,24 @@ msgstr "Estilo de _resposta:"
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.glade.h:172
-msgid "_Show animated images"
-msgstr "_Exibir imagens animadas"
-
+#. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:173
+msgid "_Show image animations"
+msgstr "Exibir Animações"
+
+#: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "_Usar Conexão Segura:"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "cor"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "descrição"
 
@@ -13569,7 +13601,7 @@ msgstr "com todas as pastas locais e remotas ativas"
 msgid "with all local folders"
 msgstr "com todas as pastas locais"
 
-#: ../mail/mail-folder-cache.c:861
+#: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13722,11 +13754,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2090
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: ../mail/mail-ops.c:2102
+#: ../mail/mail-ops.c:2104 ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13735,22 +13767,22 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2112
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever os dados: %s"
 
-#: ../mail/mail-ops.c:2262
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: ../mail/mail-ops.c:2262
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: ../mail/mail-ops.c:2378
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Verificando Serviço"
 
@@ -13758,26 +13790,6 @@ msgstr "Verificando Serviço"
 msgid "Canceling..."
 msgstr "Cancelando..."
 
-#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
-#, c-format
-msgid "<b>%s (%s)</b> : %s"
-msgstr "<b>%s (%s)</b> : %s"
-
-#: ../mail/mail-send-recv.c:270
-#, c-format
-msgid "<b>%s (%s)</b>"
-msgstr "<b>%s (%s)</b>"
-
-#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
-#, c-format
-msgid "<b>%s</b> : %s"
-msgstr "<b>%s</b> : %s"
-
-#: ../mail/mail-send-recv.c:278
-#, c-format
-msgid "<b>%s</b>"
-msgstr "<b>%s</b>"
-
 #: ../mail/mail-send-recv.c:329
 msgid "Send & Receive Mail"
 msgstr "Enviar e Receber Correio"
@@ -13799,7 +13811,7 @@ msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:678
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Digite a Senha para %s"
@@ -14096,38 +14108,42 @@ msgid "Do you want the operation to be performed in the subfolders?"
 msgstr "Você deseja que a operação seja executada nas sub-pastas?"
 
 #: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all messages as read?"
+msgstr "Deseja marcar como lidas todas as mensagens?"
+
+#: ../mail/mail.error.xml.h:50
 msgid "Do you wish to save your changes?"
 msgstr "Você deseja salvar suas alterações?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Enter password."
 msgstr "Digite a senha."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 msgid "Error loading filter definitions."
 msgstr "Erro ao carregar definições de filtro."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:53
 msgid "Error while performing operation."
 msgstr "Erro ao executar operação."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Error while {0}."
 msgstr "Erro {0}."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but cannot overwrite it."
 msgstr "O arquivo existe, mas não é possível sobrescrevê-lo."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but is not a regular file."
 msgstr "O arquivo existe, mas não é um arquivo comum."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Se você continuar, você não será capaz de recuperar estas mensagens."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
@@ -14135,12 +14151,12 @@ msgstr ""
 "Se você excluir a pasta, todo o seu conteúdo e o conteúdo das suas sub-"
 "pastas serão excluído permanentemente."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr ""
 "Se você continuar as informações da conta serão excluídas permanentemente."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14149,12 +14165,12 @@ msgstr ""
 "todas as informações do proxy serão excluídas\n"
 "permanentemente."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:62
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 "Se você continuar as informações da conta serão excluídas permanentemente."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14162,19 +14178,19 @@ msgstr ""
 "Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
 "reiniciado."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Invalid authentication"
 msgstr "Autenticação inválida"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correio atualizados automaticamente."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:67
 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 "
@@ -14186,35 +14202,35 @@ msgstr ""
 "adicionado, listará todos os destinatários de sua mensagem. Para evitar "
 "isto, você deve adicionar pelo menos um destinatário Para: ou Cc:."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read"
 msgstr "Marcar todas as mensagens como lidas"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 msgid "Mark all messages as read in the selected folder"
 msgstr "Marcar todas as mensagens como lidas na pasta selecionada"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "Pasta faltando."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "No sources selected."
 msgstr "Não foram selecionadas fontes."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir muitas mensagens ao mesmo tempo pode levar um longo tempo."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
 msgstr "Por favor, verifique suas configurações de conta e tente novamente."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
 msgstr "Por favor, ative a conta ou envie usando outra conta."
 
-#: ../mail/mail.error.xml.h:75
+#: ../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."
@@ -14223,7 +14239,7 @@ msgstr ""
 "pesquisar endereços de email clicando no botão Para: ao lado da caixa de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14235,49 +14251,49 @@ msgstr ""
 "{0}\n"
 "Enviar mesmo assim?"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "Por favor, digite um nome único para identificar esta assinatura."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "Por favor, aguarde."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problemas ao migrar a pasta de correio antiga &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "Consultando servidor"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Consultando servidor para obter a lista de mecanismos de autenticação "
 "suportados."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "Ler o recibo de leitura."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Realmente excluir a pasta &quot;{0}&quot;. e todas as suas sub-pastas?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Search Folders automatically updated."
 msgstr "Pastas de Pesquisa atualizadas automaticamente."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 msgid "Send Receipt"
 msgstr "Enviar Recibos de Leitura"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Signature Already Exists"
 msgstr "A assinatura já existe"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14285,7 +14301,7 @@ msgstr ""
 "Pastas do sistema são necessárias para que o Ximian Evolution funcione "
 "corretamente e não podem ser renomeadas, movidas ou excluídas."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14302,7 +14318,7 @@ msgstr ""
 "adicionado, listará todos os destinatários de sua mensagem. Para evitar "
 "isto, você deve adicionar pelo menos um destinatário Para: ou Cc:. "
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14316,7 +14332,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram atualizadas."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14330,7 +14346,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "E foram atualizadas."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The message was sent via the &quot;sendmail&quot; external application. "
 "Sendmail reports the following error: status 67: mail not sent.\n"
@@ -14342,11 +14358,11 @@ msgstr ""
 "A mensagem está armazenada na Caixa de saída. Verifique erros na mensagem e "
 "envie novamente."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "A arquivo de script deve existir e ser executável."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14355,7 +14371,7 @@ msgstr ""
 "vá para o editor de Pasta de Pesquisa para adicioná-la explicitamente, caso "
 "seja requerido."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14363,14 +14379,14 @@ msgstr ""
 "Esta mensagem não pode ser enviada pois a conta que você escolheu para mandá-"
 "la não está ativada"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr ""
 "Esta mensagem não pode ser enviada pois você não especificou nenhum "
 "destinatário"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14378,15 +14394,23 @@ msgstr ""
 "Este servidor não suporta este tipo de autenticação e pode não suportar a "
 "autenticação de forma alguma."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta assinatura foi alterada, mas não foi salva."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Isto marcará como lidas todas as mensagens na pasta selecionada (e em suas "
+"subordinadas)."
+
+#: ../mail/mail.error.xml.h:114
 msgid "Unable to connect to the GroupWise server."
 msgstr "Impossível conectar ao servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14394,40 +14418,40 @@ msgstr ""
 "Impossível abrir a pasta de rascunhos para esta conta. Usar a pasta de "
 "rascunhos do sistema?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
 msgid "Unable to read license file."
 msgstr "Impossível ler o arquivo de licença."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
 msgid "Use _Default"
 msgstr "Usar _Padrão"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
 msgid "Use default drafts folder?"
 msgstr "Usar pasta de rascunhos padrão?"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
 msgid "You have not filled in all of the required information."
 msgstr "Você não preencheu todas as informações necessárias."
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 "Você possui mensagens ainda não enviadas. Você deseja sair mesmo assim?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
 msgid "You may not create two accounts with the same name."
 msgstr "Você não pode criar duas contas com o mesmo nome."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid "You must name this Search Folder."
 msgstr "Você deve nomear esta Pasta de Pesquisa."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:123
 msgid "You must specify a folder."
 msgstr "Você deve especificar uma pasta."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14437,99 +14461,99 @@ msgstr ""
 "Faça isso selecionando as pastas individualmente e/ou selecionando\n"
 "todas as pastas locais, todas as pastas remotas ou ambas."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr ""
 "O seu login no seu servidor &quot;{0}&quot; como &quot;{0}&quot; falhou."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "Your message with the subject &quot;{0}&quot; was not delivered."
 msgstr "Sua mensagem com o assunto &quot;{0}&quot; não foi entregue."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid "_Discard changes"
 msgstr "_Descartar alterações"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid "_Expunge"
 msgstr "_Excluir Permanentemente"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid "_Open Messages"
 msgstr "A_brir Mensagens"
 
-#: ../mail/message-list.c:1004
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Não Lida"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Lida"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Respondida"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Várias Mensagens Não Lidas"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Várias Mensagens"
 
-#: ../mail/message-list.c:1012
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Mínima"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Mais Baixa"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Mais Alta"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Máxima"
 
-#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1341 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1348 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1357 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1369 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2068
-msgid "Message List"
-msgstr "Lista de Mensagens"
+#: ../mail/message-list.c:2063
+msgid "Messages"
+msgstr "_Mensagens"
 
-#: ../mail/message-list.c:3446
+#: ../mail/message-list.c:3441
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -14696,29 +14720,25 @@ msgstr "Fazer backup e restaurar configurações e dados do Evolution"
 msgid "Restore Settings..."
 msgstr "Restaurar Configurações..."
 
-#: ../plugins/bbdb/bbdb.c:429
+#: ../plugins/bbdb/bbdb.c:430 ../plugins/bbdb/bbdb.c:439
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Contatos Automáticos"
 
-#: ../plugins/bbdb/bbdb.c:438
-msgid "<span weight=\"bold\">Automatic Contacts</span>"
-msgstr "<span weight=\"bold\">Contatos Automáticos</span>"
-
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:451
+#: ../plugins/bbdb/bbdb.c:454
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr ""
 "Cri_ar entradas no catálogo de endereços automaticamente quando responder "
 "mensagens"
 
-#: ../plugins/bbdb/bbdb.c:472
-msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
-msgstr "<span weight=\"bold\">Contatos de Mensageiros Instantâneos</span>"
+#: ../plugins/bbdb/bbdb.c:475
+msgid "Instant Messaging Contacts"
+msgstr "Contatos de Mensagens Instantâneas"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:485
+#: ../plugins/bbdb/bbdb.c:490
 msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr ""
@@ -14726,7 +14746,7 @@ msgstr ""
 "mensageiro instantâneo"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:502
+#: ../plugins/bbdb/bbdb.c:507
 msgid "Synchronize with _buddy list now"
 msgstr "Sincronizar com minha lista de ami_gos agora"
 
@@ -14867,8 +14887,8 @@ msgstr "Você deseja tornar o Evolution seu cliente padrão de e-mail?"
 
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
-msgid "Mark as default folder"
-msgstr "Marcar como pasta padrão"
+msgid "Mark as _default folder"
+msgstr "Marcar como pasta _padrão"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
@@ -14924,11 +14944,11 @@ msgstr ""
 "Esta opção conectará ao servidor Exchange usando a autenticação padrão de "
 "senha em texto aberto."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "Fora do Escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../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."
@@ -14937,72 +14957,72 @@ msgstr ""
 "para cada pessoa que enviar correio para você enquanto você\n"
 "estiver fora do escritório."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "Eu estou fora do escritório"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "Eu estou no escritório"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "Alterar a senha para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "Mudar a Senha"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "Gerencia as definições do representate para a conta do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "Assistente de Delegação"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "Diversos"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "Visualizar o tamanho de todas as pastas de Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "Tamanho das Pastas"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Configurações do Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:619
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "Url _OWA:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "A_utenticar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "Tipo de Autenticação"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "V_erificar por Tipos Suportados"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:164
+#: ../plugins/exchange-operations/exchange-calendar.c:193
+#: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15042,13 +15062,13 @@ msgstr "Nova Senha:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "A sua senha atual expirou. Por favor, altere sua senha agora."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "Sua senha vai vencer nos próximos %d dias"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
 msgid "Custom"
 msgstr "Personalizar"
 
@@ -15072,34 +15092,34 @@ msgstr "Delegar Para"
 msgid "Remove the delegate %s?"
 msgstr "Remover o representante %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr "Não foi possível acessar o Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr "Não foi possível encontrar no Active Directory"
 
-#: ../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 "Não foi possível delegar %s no Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Não foi possível remover o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
 msgstr "Não foi possível atualizar a lista de representantes."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Não foi possível adicionar o representante %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
 msgstr "Erro ao abrir lista de representantes."
 
@@ -15161,15 +15181,15 @@ msgstr "_Tarefas:"
 msgid "Permissions..."
 msgstr "Permissões..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "Nome da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "Tamanho da Pasta"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Subescrever a Pastas de Outros Usuários"
@@ -15184,14 +15204,14 @@ msgstr "Árvore de Pastas do Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Cancelar a Inscrição na Pasta..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Realmente cancelar a inscrição da pasta \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:538
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Cancelar a inscrição de \"%s\""
@@ -15212,15 +15232,15 @@ msgstr "_Mudar a Senha"
 msgid "ok_button"
 msgstr "botão_ok"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
 msgstr "(Permissão negada.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User:"
 msgstr "Adicionar Usuário:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
 msgid "Add User"
 msgstr "Adicionar Usuário"
 
@@ -15285,7 +15305,7 @@ msgid "Select User"
 msgstr "Selecionar Usuário"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
 msgstr "Catálogo de Endereços..."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -15436,7 +15456,7 @@ msgid "Folder offline"
 msgstr "Pasta desconectada"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -15712,7 +15732,7 @@ msgid "<b>Users:</b>"
 msgstr "<b>Usuários:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "Mensagem"
 
@@ -15793,14 +15813,6 @@ msgstr "_Escrever"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#: ../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 "dialog1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>Nome da Conta</b>"
@@ -15811,7 +15823,7 @@ msgstr "Login do Proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:502
+#: ../plugins/groupwise-features/proxy.c:503
 #: ../plugins/groupwise-features/send-options.c:83
 #, c-format
 msgid "%sEnter password for %s (user %s)"
@@ -15821,29 +15833,29 @@ msgstr "%sForneça a senha para %s (usuário %s)"
 msgid "_Proxy Login..."
 msgstr "Login do _Proxy..."
 
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:697
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver conectada."
 
-#: ../plugins/groupwise-features/proxy.c:703
+#: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "A aba do Proxy estará disponível somente quando a conta estiver habilitada."
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "Usuários"
 
-#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder-common.c:323
 msgid "Enter the users and set permissions"
 msgstr "Digite os usuários e defina as permissões"
 
-#: ../plugins/groupwise-features/share-folder-common.c:338
+#: ../plugins/groupwise-features/share-folder-common.c:342
 msgid "New _Shared Folder..."
 msgstr "_Nova Pasta Compartilhada..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:446
+#: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "Compartilhamento"
 
@@ -15867,19 +15879,19 @@ msgstr "_Importar para Agenda"
 msgid "_Import to Tasks"
 msgstr "Importar para Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:197
+#: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
 msgstr "Importar ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:225
+#: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
 msgstr "Selecionar Lista de Tarefas"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:229
+#: ../plugins/import-ics-attachments/icsimporter.c:230
 msgid "Select Calendar"
 msgstr "Selecionar Agenda"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Importar"
@@ -15957,103 +15969,103 @@ msgstr "Um compromisso na agenda '%s' está em conflito com esta reunião"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Encontrado o compromisso na agenda '%s'"
 
-#: ../plugins/itip-formatter/itip-formatter.c:487
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "Não é possível encontrar nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "Não é possível encontrar esta reunião em nenhuma agenda"
 
-#: ../plugins/itip-formatter/itip-formatter.c:498
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "Não é possível encontrar esta tarefa em nenhuma lista de tarefas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:502
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "Não é possível encontrar este item em nenhum diário"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "Procurando por uma versão existente deste compromisso"
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "Não foi possível analisar item"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Não foi possível enviar item para a agenda '%s'. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado para agenda '%s' como aceito"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado para a agenda '%s' como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado para a agenda '%s' como recusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado para a agenda '%s' como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador removeu o representante %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Notificação de cacelamento enviado para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 "Não foi possível enviar a notificação de cancelamento para o representante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Não é possível atualizar participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "Estado do participante atualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "A agenda anexada não é válida"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "A mensagem diz conter uma agenda, mas a agenda não é um iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "O item na agenda não é válido"
 
-#: ../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:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16061,11 +16073,11 @@ msgstr ""
 "A mensagem contém uma agenda, mas a agenda não contém eventos, tarefas ou "
 "informação de livre/ocupado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "A agenda anexa contém múltiplos itens"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16075,25 +16087,22 @@ msgstr ""
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1991
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "_Delete message after acting"
 msgstr "_Remover mensagem depois da ação"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2001
-msgid "<span weight=\"bold\">Conflict Search</span>"
-msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
+#: ../plugins/itip-formatter/itip-formatter.c:2004
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+msgid "Conflict Search"
+msgstr "Procura de Conflitos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2014
+#: ../plugins/itip-formatter/itip-formatter.c:2019
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Selecione a agenda para procurar por conflitos de reunião"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2031
-msgid "Conflict Search Table"
-msgstr "Tabela de Procura de Conflitos"
-
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "Hoje"
@@ -16435,26 +16444,26 @@ msgid "_Update"
 msgstr "_Atualizar"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "Hora de início:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "Hora de término:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "Enviar atuali_zações aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "A_plicar a todas as instâncias"
 
@@ -16770,7 +16779,7 @@ msgstr "Um plugin para gerenciar quais plugins estão habilitados ou não."
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:180
 msgid "Plugin Manager"
 msgstr "Gerenciador de Módulos"
 
@@ -16782,30 +16791,22 @@ msgstr "Habilitar e desabilitar módulos"
 msgid "_Plugins"
 msgstr "_Módulos"
 
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "Autore(s)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Caminho"
-
-#: ../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 "Descrição"
 
-#: ../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 "Nota: Algumas mudanças somente terão efeito após o próximo reinício"
 
-#: ../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 "Módulo"
 
@@ -16851,7 +16852,7 @@ msgid "Gives an option to print mail from composer"
 msgstr "Fornecer uma opção para imprimir a mensagem a partir do redator"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
+#: ../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"
@@ -16885,7 +16886,7 @@ msgstr "Locais"
 msgid "_Publish Calendar Information"
 msgstr "_Publicar Informação de Agenda"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Você tem certeza que deseja excluir esta URL?"
 
@@ -16908,14 +16909,18 @@ msgstr ""
 "Manualmente (pelo menu de Ações)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "P_ort:"
+msgstr "_Porta:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
 msgid "Publishing Location"
 msgstr "Local de Publicação"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
 msgid "Publishing _Frequency:"
 msgstr "_Freqüência de Publicação:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.glade.h:13
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -16933,11 +16938,11 @@ msgstr ""
 "WebDAV seguro (HTTPS)\n"
 "Local especificado"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
 msgstr "_Tipo do Serviço:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 msgid "_File:"
 msgstr "_Arquivo:"
 
@@ -16945,7 +16950,7 @@ msgstr "_Arquivo:"
 msgid "_Publish as:"
 msgstr "_Publicar como:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -17085,13 +17090,13 @@ msgid "Save Selected"
 msgstr "Salvar Selecionado"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Save to _Disk"
-msgstr "Salvar no _Disco"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "Salvar agendas ou lista de tarefas no disco."
 
+#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
+msgid "_Save to Disk"
+msgstr "Salvar no _Disco"
+
 #.
 #. * 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.
@@ -17105,8 +17110,8 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Selecionar arquivo de destino"
 
@@ -17119,11 +17124,11 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Selecionar uma agenda ou fonte de tarefas para visualização."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "_Show only this Calendar"
+msgid "Show _only this Calendar"
 msgstr "Mo_strar somente esta Agenda"
 
 #: ../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 "Mo_strar somente esta Lista de Tarefas"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
@@ -17160,13 +17165,13 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "Por favor, selecione a informação que você deseja importar:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Importando dados."
@@ -17245,40 +17250,46 @@ msgid "Printer settings"
 msgstr "Configurações da impressora"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "A barra lateral está visível"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Pular diálogo de alerta de desenvolvimento"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 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 ""
-"A versão de configuração do Evolution, com maior/menor/nível de configuração"
+"A versão de configuração do Evolution, com maior/menor/nível de configuração "
+"(por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "A altura padrão para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "A largura padrão para a janela principal, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "A largura padrão para a barra lateral, em pixels."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
 msgstr ""
 "A última versão de configuração do Evolution atualizada, com maior/menor/"
-"nível de configuração"
+"nível de configuração (por exemplo \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17289,33 +17300,37 @@ msgstr ""
 "estilo dos botões é determinado pela configuração da barra de ferramentas do "
 "GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "A barra de ferramentas está visível"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr ""
 "Se o Evolution deve iniciar em modo desconectado em vez de modo conectado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "Se a barra lateral deve estar visível."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "Se a barra de ferramentas deve estar visível."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Se o diálogo de alerta em versões de desenvolvimento deve ser pulado."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "Se os botões de janela devem estar visíveis."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "Estilo dos botões de janela"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "Botões de janela são visíveis"
 
@@ -17331,8 +17346,8 @@ msgstr "Conexões Ativas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Clique em OK para fechar estas conexões e desconectar"
 
-#: ../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 "(Sem título)"
 
@@ -17441,15 +17456,11 @@ msgstr ""
 "Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
 "Afonso Celso Medina <afmedina@uol.com.br>"
 
-#: ../shell/e-shell-window-commands.c:544
-msgid "Groupware Suite"
-msgstr "Conjunto de Aplicativos de Groupware"
-
 #: ../shell/e-shell-window-commands.c:775
 msgid "_Work Online"
 msgstr "_Trabalhar Conectado"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Trabalhar Desconectado"
 
@@ -17457,23 +17468,23 @@ msgstr "_Trabalhar Desconectado"
 msgid "Work Offline"
 msgstr "Trabalhar Desconectado"
 
-#: ../shell/e-shell-window.c:370
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr ""
 "O Evolution está atualmente conectado. Clique neste botão para trabalhar "
 "desconectado."
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está em processo de desconecção"
 
-#: ../shell/e-shell-window.c:385
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr ""
 "O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
 "conectado."
 
-#: ../shell/e-shell-window.c:775
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "Mudar para %s"
@@ -17482,24 +17493,24 @@ msgstr "Mudar para %s"
 msgid "Uknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "OK"
 
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: ../shell/e-shell.c:1275
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o Banco de Dados de configuração"
 
@@ -17605,7 +17616,7 @@ msgstr ""
 "A Equipe do Evolution\n"
 
 #: ../shell/main.c:261
-msgid "Don't tell me again"
+msgid "Do not tell me again"
 msgstr "Não me diga novamente"
 
 #: ../shell/main.c:471
@@ -17718,7 +17729,7 @@ msgstr "A atualização de versões anteriores falhou: {0}"
 
 #: ../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 "
@@ -17789,7 +17800,7 @@ msgstr ""
 "\n"
 "Editar configurações de confiança:"
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../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 "
@@ -17799,7 +17810,7 @@ msgstr ""
 "então você confia na autenticidade deste certificado a não ser que aqui "
 "esteja indicado o contrário"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../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 "
@@ -17842,22 +17853,22 @@ msgstr "Válido até"
 msgid "E-Mail Address"
 msgstr "Endereço de Email"
 
-#: ../smime/gui/certificate-viewer.c:342
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Visualizador de Certificado: %s"
 
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "Digite a senha para '%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 "Digite a nova senha para o banco de dados de certificados"
 
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "Digite a nova senha"
 
@@ -18068,7 +18079,7 @@ msgid "_Edit CA Trust"
 msgstr "_Editar Confiança do CA"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "O certificado já existe"
 
@@ -18247,27 +18258,27 @@ msgstr "Digite a senha para o arquivo PKCS12:"
 msgid "Imported Certificate"
 msgstr "Certificado Importado"
 
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "Um anexo a adicionar."
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "Tipo de conteúdo do anexo."
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "O nome de arquivo a exibir na mensagem."
 
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "Descrição do anexo."
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "Marcar anexo para exibição embutida por padrão."
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "Assunto padrão para a mensagem."
 
@@ -18368,7 +18379,7 @@ msgstr "Mover para Pasta..."
 msgid "Paste"
 msgstr "Colar"
 
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Colar a área de transferência"
 
@@ -18396,7 +18407,7 @@ msgstr "Salvar contatos selecionados como um VCard."
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "Salvar contatos da pasta selecionada como VCard."
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
@@ -18442,7 +18453,7 @@ msgstr "Parar o Carregamento"
 msgid "View the current contact"
 msgstr "Ver o contato atual"
 
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:38
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "Açõe_s"
@@ -18471,7 +18482,7 @@ msgstr "_Mover Contato para..."
 msgid "_Move Folder Contacts To"
 msgstr "_Mover a Pasta de Contatos Para"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_Novo"
 
@@ -18496,110 +18507,115 @@ msgid "Day"
 msgstr "Dia"
 
 #: ../ui/evolution-calendar.xml.h:6
-msgid "Delete All Occurrences"
-msgstr "Excluir Todas as Ocorrências"
+msgid "Delete _all Occurrences"
+msgstr "Excl_uir Todas as Ocorrências"
 
 #: ../ui/evolution-calendar.xml.h:7
+msgid "Delete all occurrences"
+msgstr "Excluir Todas as Ocorrências"
+
+#: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
 msgstr "Excluir o compromisso"
 
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete this Occurrence"
-msgstr "Excluir esta Ocorrência"
+#: ../ui/evolution-calendar.xml.h:10
+msgid "Delete this occurrence"
+msgstr "Excluir esta ocorrência"
 
-#: ../ui/evolution-calendar.xml.h:9
+#: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "Ir Para"
 
-#: ../ui/evolution-calendar.xml.h:10
+#: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "Voltar"
 
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "Avançar"
 
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "Lista"
 
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "Mês"
 
-#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 msgid "Next"
 msgstr "Próxima"
 
-#: ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Visualiza a impressão da agenda a ser impressa"
 
-#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../ui/evolution-calendar.xml.h:20
+#: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "Imprimir esta agenda"
 
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "Excluir _Permanentemente"
 
-#: ../ui/evolution-calendar.xml.h:22
+#: ../ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "Excluir permanentemente compromissos e reuniões antigas"
 
-#: ../ui/evolution-calendar.xml.h:23
+#: ../ui/evolution-calendar.xml.h:25
 msgid "Select _Date"
 msgstr "Selecionar _Data"
 
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecionar _Hoje"
 
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "Selecionar uma data específica"
 
-#: ../ui/evolution-calendar.xml.h:26
+#: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "Selecionar hoje"
 
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "Exibir como uma lista"
 
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "Exibir um dia"
 
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "Exibir um mês"
 
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "Exibir uma semana"
 
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "Exibir a semana útil"
 
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:35
 msgid "View the current appointment"
 msgstr "Ver o compromisso atual"
 
-#: ../ui/evolution-calendar.xml.h:34
+#: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "Semana"
 
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "Semana Útil"
 
-#: ../ui/evolution-calendar.xml.h:40
+#: ../ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Abrir Compromisso"
 
@@ -18674,11 +18690,11 @@ msgstr "_Fechar"
 #: ../ui/evolution-editor.xml.h:18 ../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:38
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Aj_uda"
 
@@ -18690,23 +18706,26 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_Opções"
 
-#: ../ui/evolution-event-editor.xml.h:1
-msgid "Alar_ms"
-msgstr "Alar_mes"
+#: ../ui/evolution-event-editor.xml.h:2
+msgid "All Day Event"
+msgstr "Evento de dia inteiro"
 
 #: ../ui/evolution-event-editor.xml.h:3
-msgid "All day Event"
+msgid "All _Day Event"
 msgstr "Evento de _dia inteiro"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
+#: ../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 "Classificar como Confidencial"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
+#: ../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 "Classificar como Privado"
 
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
+#: ../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 "Classificar como Público"
 
@@ -18722,7 +18741,8 @@ msgstr "Opções a_vançadas de envio"
 msgid "Make this a recurring event"
 msgstr "Tornar este evento recorrente"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
+#: ../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 "Público"
 
@@ -18735,7 +18755,7 @@ msgid "R_ole Field"
 msgstr "Campo _Papel"
 
 #: ../ui/evolution-event-editor.xml.h:16
-msgid "Show time as b_usy"
+msgid "Show time as _busy"
 msgstr "E_xibir hora como ocupado"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
@@ -18762,12 +18782,13 @@ msgstr "Alternar a exibição do campo de estado"
 msgid "Toggles whether the time zone is displayed"
 msgstr "Alternar a exibição do campo de fuso horário"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
+#: ../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 "Alternar a exibição do campo de categorias"
 
 #: ../ui/evolution-event-editor.xml.h:24
-msgid "Toggles whether to have All day Event"
+msgid "Toggles whether to have All Day Event"
 msgstr "Alternar a exibição do campo evento de dia inteiro"
 
 #: ../ui/evolution-event-editor.xml.h:25
@@ -18775,14 +18796,16 @@ msgid "Toggles whether to show time as busy"
 msgstr "Alternar a exibição do tempo como ocupado"
 
 #: ../ui/evolution-event-editor.xml.h:26
-msgid "_All day Event"
-msgstr "Evento de _dia inteiro"
+msgid "_Alarms"
+msgstr "Alarmes"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "C_lassificação"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "_Confidencial"
 
@@ -18790,7 +18813,8 @@ msgstr "_Confidencial"
 msgid "_Free/Busy"
 msgstr "_Livre/Ocupado"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "_Particular"
 
@@ -18904,12 +18928,12 @@ msgstr "Agrupar Todos os En_cadeamentos"
 msgid "Collapse all message threads"
 msgstr "Agrupar todas as cadeias de mensagem"
 
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Copiar a(s) mensagem(ns) selecionada(s) para a área de transferência"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7 ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Cortar mensagem(ns) selecionada(s) para a área de transferência"
 
@@ -18942,11 +18966,11 @@ msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr "Ocultar mensagens excluídas ao invés de exibi-las cortadas"
 
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Mar_k Messages as Read"
-msgstr "Marcar Men_sagens como Lidas"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
+msgstr "Marcar Todas Men_sagens como Lidas"
 
-#: ../ui/evolution-mail-list.xml.h:17 ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "Colar mensagem(ns) da área de transferência"
 
@@ -19051,10 +19075,14 @@ msgstr "Redigir uma resposta à lista de discussão da mensagem selecionada"
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Redigir uma resposta ao remetente da mensagem selecionada"
 
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "Copiar mensagens selecionadas para outra pasta"
 
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Copia as mensagens selecionadas para a área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "Criar Re_gra"
@@ -19091,6 +19119,10 @@ msgstr "Criar uma regra para filtrar mensagens para esta lista de discussão"
 msgid "Create a rule to filter messages with this subject"
 msgstr "Criar uma regra para filtrar mensagens com este assunto"
 
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Recorta as mensagens selecionadas para a área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "Diminuir o tamanho do texto"
@@ -19104,12 +19136,12 @@ msgid "Display the next message"
 msgstr "Exibir a próxima mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "Exibir a próxima mensagem não lida"
+msgid "Display the next thread"
+msgstr "Exibir o próximo tópico"
 
 #: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "Exibir o próximo encadeamento não lido"
+msgid "Display the next unread message"
+msgstr "Exibir a próxima mensagem não lida"
 
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
@@ -19148,8 +19180,8 @@ msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensagens selecionadas pelo estado de indesejada"
 
 #: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected message(s) for follow-up"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como lembrete"
+msgid "Flag selected messages for follow-up"
+msgstr "Marcar as mensagens selecionadas como lembrete"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -19184,36 +19216,36 @@ msgid "Mar_k as"
 msgstr "Mar_car como"
 
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as having been read"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como lida(s)"
+msgid "Mark the selected messages as having been read"
+msgstr "Marcar as mensagens selecionadas como lidas"
 
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as important"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como importante(s)"
+msgid "Mark the selected messages as important"
+msgstr "Marcar as mensagens selecionadas como importante"
 
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as junk"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como indesejada(s)"
+msgid "Mark the selected messages as junk"
+msgstr "Marcar as mensagens selecionadas como indesejadas"
 
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não sendo indesejada(s)"
+msgid "Mark the selected messages as not being junk"
+msgstr "Marcar as mensagens selecionadas como não indesejadas"
 
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como não lida(s)"
+msgid "Mark the selected messages as not having been read"
+msgstr "Marcar as mensagens selecionadas como não lidas"
 
 #: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Marcar a(s) mensagem(ns) selecionada(s) como sem importância"
+msgid "Mark the selected messages as unimportant"
+msgstr "Marcar as mensagens selecionadas como não importantes"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensagens selecionadas para exclusão"
 
 #: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected message(s) to another folder"
-msgstr "Mover a(s) mensagem(ns) selecionada(s) para outra pasta"
+msgid "Move selected messages to another folder"
+msgstr "Mover as mensagens selecionadas para outra pasta"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19236,17 +19268,21 @@ msgid "Open a window for composing a mail message"
 msgstr "Abrir uma janela para redigir uma mensagem de correio"
 
 #: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in a new window"
+msgid "Open the selected messages in a new window"
 msgstr "Abrir a mensagem selecionada em uma nova janela"
 
 #: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in the composer for editing"
+msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir a mensagem selecionada no redator para editá-la"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mensagem Não Lida An_terior"
 
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Colar mensagens da área de transferência"
+
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "P_ublicar uma Nova Nensagem na Pasta"
@@ -19288,7 +19324,7 @@ msgid "Reset the text to its original size"
 msgstr "Restaurar o texto ao seu tamanho original"
 
 #: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the message as a text file"
+msgid "Save the selected messages as a text file"
 msgstr "Salvar a mensagem como um arquivo texto"
 
 #: ../ui/evolution-mail-message.xml.h:86
@@ -19328,11 +19364,11 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Exibir um cursor intermitente no corpo das mensagens exibidas"
 
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message in the normal style"
+msgid "Show messages in the normal style"
 msgstr "Exibir a mensagem no estilo normal"
 
 #: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message with all email headers"
+msgid "Show messages with all email headers"
 msgstr "Exibir a mensagem com todos os cabeçalhos de e-mail"
 
 #: ../ui/evolution-mail-message.xml.h:97
@@ -19340,7 +19376,7 @@ msgid "Show the raw email source of the message"
 msgstr "Exibir o código-fonte bruto da mensagem"
 
 #: ../ui/evolution-mail-message.xml.h:98
-msgid "Un-delete the selected messages"
+msgid "Undelete the selected messages"
 msgstr "Desfazer a exclusão das mensagens selecionadas"
 
 #: ../ui/evolution-mail-message.xml.h:99
@@ -19584,6 +19620,10 @@ msgstr "Salvar o arquivo atual com um nome diferente"
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
+#: ../ui/evolution-message-composer.xml.h:29
+msgid "Send"
+msgstr "Enviar"
+
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
@@ -19741,11 +19781,11 @@ msgid "_Status Details"
 msgstr "Detalhes de _Estado"
 
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+msgid "Copy selected tasks"
 msgstr "Copiar tarefa selecionada"
 
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Cut selected tasks"
 msgstr "Cortar tarefa selecionada"
 
 #: ../ui/evolution-tasks.xml.h:7
@@ -19765,7 +19805,7 @@ msgid "Mark selected tasks as complete"
 msgstr "Marcar tarefas selecionadas como concluídas"
 
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr "Colar tarefa da área de transferência"
 
 #: ../ui/evolution-tasks.xml.h:13
@@ -19881,6 +19921,14 @@ msgid "Show information about Evolution"
 msgstr "Exibir informação sobre o Evolution"
 
 #: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "_Barra Lateral"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "_Ver Barra de Estado"
+
+#: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
 msgstr "Enviar Relatório de Erro"
 
@@ -19888,75 +19936,75 @@ msgstr "Enviar Relatório de Erro"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Submit _Bug Report"
 msgstr "Enviar Relatório de _Erro"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
 msgid "Toggle whether we are working offline."
 msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:34
 msgid "Tool_bar"
 msgstr "_Barra de Ferramentas"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
 msgid "Tool_bar style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Exibir/Esconder a Barra Lateral"
+
+#: ../ui/evolution.xml.h:37
 msgid "View/Hide the Status Bar"
 msgstr "Exibir/Esconder a Barra de Estado"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:38
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "Fe_char esta Janela"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 msgid "_Forget Passwords"
 msgstr "Esquecer _Senhas"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Hide buttons"
 msgstr "_Ocultar botões"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Icons only"
 msgstr "Í_cones somente"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Quick Reference"
 msgstr "_Referência Rápida"
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:48
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:49
 msgid "_Switcher Appearance"
 msgstr "Al_ternador de Aparência"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:50
 msgid "_Synchronization Options..."
 msgstr "Opções de _Sincronização..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:51
 msgid "_Text only"
 msgstr "Somente _texto"
 
-#: ../ui/evolution.xml.h:50
-msgid "_View Status Bar"
-msgstr "_Ver Barra de Estado"
-
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
 msgid "_Window"
 msgstr "_Janela"
 
@@ -20029,7 +20077,7 @@ msgid "With _Status"
 msgstr "Com _Estado"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -20085,9 +20133,9 @@ msgid "_Edit..."
 msgstr "_Editar..."
 
 #: ../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:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "Tabela"
 
@@ -20157,74 +20205,70 @@ msgid "MTWTFSS"
 msgstr "STQQSSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1098
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "Botão Anterior"
-
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "Agenda Mensal"
 
-#: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
-#: ../widgets/text/e-text.c:3569
+#: ../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:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "Cor de preenchimento"
 
-#: ../widgets/misc/e-canvas-background.c:466
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../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:3575
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "Cor de preenchimento GDK"
 
-#: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../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:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "Preencher pontilhado"
 
-#: ../widgets/misc/e-canvas-background.c:487
-#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:494
-#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:501
-#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:508
-#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../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:3017
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Largura mínima"
 
-#: ../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:3018
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Largura Mínima"
 
@@ -20237,7 +20281,7 @@ msgstr "Espaçamento"
 msgid "Now"
 msgstr "Agora"
 
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "A hora deve estar no formato: %s"
@@ -20246,90 +20290,94 @@ msgstr "A hora deve estar no formato: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "O valor percentual deve estar entre 0 e 100, inclusive"
 
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
 msgid "Central European"
 msgstr "Centro europeu"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Chinese"
 msgstr "Chinês"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Cyrillic"
 msgstr "Cirílico"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Greek"
 msgstr "Grego"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Hebrew"
 msgstr "Hebraico"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:72
+msgid "Thai"
+msgstr "Tailandês"
+
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Western European"
 msgstr "Oeste Europeu"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Western European, New"
 msgstr "Oeste Europeu, Novo"
 
-#: ../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:93 ../widgets/misc/e-charset-picker.c:94
+#: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
 msgstr "Tradicional"
 
-#: ../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:98 ../widgets/misc/e-charset-picker.c:99
 msgid "Simplified"
 msgstr "Simplificado"
 
-#: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:102
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:105
 msgid "Visual"
 msgstr "Visual"
 
-#: ../widgets/misc/e-charset-picker.c:171
+#: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunto de caracteres desconhecido: %s"
 
-#: ../widgets/misc/e-charset-picker.c:216
+#: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "Codificação de Caracteres"
 
-#: ../widgets/misc/e-charset-picker.c:231
+#: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
 msgstr "Escolha o conjunto de caracteres a ser usado"
 
-#: ../widgets/misc/e-charset-picker.c:338
+#: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "Outro..."
 
-#: ../widgets/misc/e-charset-picker.c:479
+#: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
 msgstr "Codificação de C_aracteres"
 
@@ -20338,40 +20386,32 @@ msgid "..."
 msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:321
-msgid "Date and Time Entry"
-msgstr "Entrada de Data e Hora"
+msgid "Date and Time"
+msgstr "Data e Hora"
 
 #: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
 msgstr "Entrada de texto para digitar data"
 
-#: ../widgets/misc/e-dateedit.c:341
-msgid "Text Date Entry"
-msgstr "Entrada de Data em Texto"
-
 #: ../widgets/misc/e-dateedit.c:362
 msgid "Click this button to show a calendar"
 msgstr "Clique neste botão para mostrar uma agenda"
 
-#: ../widgets/misc/e-dateedit.c:363
-msgid "Date Button"
-msgstr "Botão de Data"
-
 #: ../widgets/misc/e-dateedit.c:384
 msgid "Combo box to select time"
 msgstr "Combo box para seleção de hora"
 
 #: ../widgets/misc/e-dateedit.c:385
-msgid "Time Combo Box"
-msgstr "Seletor de Hora"
+msgid "Time"
+msgstr "_Hora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 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:1448 ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -20411,11 +20451,11 @@ msgstr "Rótulo do componente"
 msgid "A widget to display in place of the usual expander label"
 msgstr "Um widget para exibir no lugar do usual rótulo do expansor"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Tamanho do expansor"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Tamanho da seta do expansor"
 
@@ -20427,16 +20467,21 @@ msgstr "Espaçamento do Indicador"
 msgid "Spacing around expander arrow"
 msgstr "Espaçamento ao redor da seta do expansor"
 
-#: ../widgets/misc/e-filter-bar.c:201
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Pesquisa Avançada"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "_Pesquisas"
 
-#: ../widgets/misc/e-filter-bar.c:203
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "Pesquisas"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:226
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "Salvar Pesquisa"
 
@@ -20456,11 +20501,11 @@ msgstr "Pesquisa _Avançada..."
 msgid "Choose Image"
 msgstr "Escolher Imagem"
 
-#: ../widgets/misc/e-map.c:651
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "Mapa Mundi"
 
-#: ../widgets/misc/e-map.c:653
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -20480,55 +20525,55 @@ msgstr "Sincronizar Registros Particulares:"
 msgid "Sync Categories:"
 msgstr "Categorias de Sincronização:"
 
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "Mensagem vazia"
 
-#: ../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 "Modelo de refluxo"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
 msgid "Column width"
 msgstr "Largura da coluna"
 
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
-msgid "Search Text Entry"
-msgstr "Entrada de Texto para Pesquisa"
+#: ../widgets/misc/e-search-bar.c:371
+msgid "Search"
+msgstr "_Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "_Pesquisar Agora"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Limpar"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Tipo de Pesquisa"
 
-#: ../widgets/misc/e-search-bar.c:893
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID do item"
 
-#: ../widgets/misc/e-search-bar.c:900
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID do Sub-item"
 
-#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "Texto"
 
-#: ../widgets/misc/e-search-bar.c:987
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "Pesquisar A_gora"
 
@@ -20554,7 +20599,7 @@ msgstr "Modo de Seleção"
 msgid "Cursor Mode"
 msgstr "Modo do Cursor"
 
-#: ../widgets/misc/e-send-options.c:524
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "Quando exc_luída:"
 
@@ -20730,23 +20775,23 @@ msgstr "Coluna Com Foco"
 msgid "Unselected Column"
 msgstr "Coluna Não Selecionada"
 
-#: ../widgets/table/e-cell-text.c:1742
+#: ../widgets/table/e-cell-text.c:1749
 msgid "Strikeout Column"
 msgstr "Coluna Riscada"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1756
 msgid "Underline Column"
 msgstr "Coluna Sublinhada"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1763
 msgid "Bold Column"
 msgstr "Coluna em Negrito"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1770
 msgid "Color Column"
 msgstr "Coluna Colorida"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1784
 msgid "BG Color Column"
 msgstr "Coluna da Cor de Fundo"
 
@@ -20866,16 +20911,16 @@ msgid "_Show these fields in order:"
 msgstr "_Mostrar estes campos na ordem:"
 
 #: ../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:1804
 msgid "DnD code"
 msgstr "Código 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:1818
 msgid "Full Header"
 msgstr "Cabeçalho Completo"
 
@@ -20896,198 +20941,198 @@ msgstr ""
 "arraste-a para o local que você deseja que\n"
 "ela apareça."
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d itens)"
 
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d item)"
 
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d itens)"
 
-#: ../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:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Cores de Linha Alternantes"
 
-#: ../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:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../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 "Grade Desenhada Horizontalmente"
 
-#: ../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:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../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 "Grade Desenhada Verticalmente"
 
-#: ../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:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
+#: ../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 "Foco de desenho"
 
-#: ../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:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modo do cursor"
 
-#: ../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:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modelo de seleção"
 
-#: ../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:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../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 "Comprimento do Limiar"
 
-#: ../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:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../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 "Altura de linha uniforme"
 
-#: ../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 "Congelado"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "Personalizar Visão Atual"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "Ordenar em Ordem Crescente"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "Ordenar em Ordem Decrescente"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "Não Ordenar"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "Agrupar Por Este Campo"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "Agrupar Por Caixa"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "Remover Esta Coluna"
 
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "Adicionar uma Coluna..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "Melhor Ajuste"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "Formatar Colunas..."
 
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "Personalizar Visão Atual..."
 
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Conjunto de Fontes"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Ordenar Informação"
 
-#: ../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:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Árvore"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Cabeçalho da tabela"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modelo de tabela"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Linha do cursor"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "Buscar sempre"
 
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "Usar clique para adicionar"
 
-#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "Adaptador de tabela ETree"
 
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "Visual Retrô"
 
-#: ../widgets/table/e-tree.c:3318
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "Desenhar linhas e expansores +/-."
 
@@ -21104,7 +21149,7 @@ msgid "This should test the minicard canvas item"
 msgstr "Isto deveria testar o item canvas do mini-cartão"
 
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "Processador de Eventos"
 
@@ -21117,57 +21162,57 @@ msgid "GDKFont"
 msgstr "GDKFont"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "Alinhamento"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "Usar omissão de palavra óbvia"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "Omissão de Palavras"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "Quebra de linha"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "Caracteres de quebra"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "Máximo de linhas"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "Permitir quebras de linha"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "Desenhar bordas"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "Desenhar fundo"
 
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "Desenhar base"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "Posição do cursor"
 
@@ -21175,365 +21220,514 @@ msgstr "Posição do cursor"
 msgid "Emulate label resize"
 msgstr "Emular a alteração de tamanho do rótulo"
 
-#: ../widgets/text/e-text.c:2724
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "Métodos de Entrada"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "Riscado"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "Âncora"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "Largura do Clip"
 
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "Altura do Clip"
 
-#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "Clip"
 
-#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "Preencher retângulo do clip"
 
-#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "Deslocamento X"
 
-#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Deslocamento Y"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "Largura do texto"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "Altura do texto"
 
-#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "Contexto do MI"
 
-#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "Alça do Popup"
 
-msgid "Select target addressbook."
-msgstr "Selecionar catálogo de endereços alvo."
+#~ msgid "Addressbook"
+#~ msgstr "Catálogo de Endereços"
 
-msgid "(none)"
-msgstr "(nenhum)"
+#~ 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."
+#~ msgstr ""
+#~ "A seleção desta opção significa que o Evolution apenas tentará usar SSL/"
+#~ "TLS se você estiver em um ambiente inseguro. Por exemplo, se você e seu "
+#~ "servidor LDAP estiverem atrás de uma firewall no trabalho, então o "
+#~ "Evolution não precisa usar SSL/TLS, pois a sua conexão já é segura."
 
-msgid "Primary Email"
-msgstr "Email Principal"
+#~ msgid "Advanced..."
+#~ msgstr "Avançado..."
 
-msgid "Select an Action"
-msgstr "Selecionar uma Ação"
+#~ msgid "_Advanced..."
+#~ msgstr "_Avançado..."
 
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contato \"%s\""
+#~ msgid "(%d seconds)"
+#~ msgstr "(%d segundos)"
 
-msgid "Add address to existing contact \"%s\""
-msgstr "Adicionar endereço a um contato existente \"%s\""
+#~ msgid "(%d %s %d %s)"
+#~ msgstr "(%d %s %d %s)"
 
-msgid "Merge E-Mail Address"
-msgstr "Mesclar Endereço de E-Mail"
+#~ msgid "(%d %s)"
+#~ msgstr "(%d %s)"
 
-msgid "Discard Changes"
-msgstr "Descartar Alterações"
+#~ msgid " %u second"
+#~ msgstr " %u segundo"
 
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s até %s"
+#~ msgid " %u seconds"
+#~ msgstr " %u segundos"
 
-msgid "description of appointment"
-msgstr "descrição do compromisso"
+#~ msgid " %u minute"
+#~ msgstr " %u minuto"
 
-msgid "Dismiss"
-msgstr "Ignorar"
+#~ msgid " %u minutes"
+#~ msgstr " %u minutos"
 
-msgid "Dismiss All"
-msgstr "Ignorar Tudo"
+#~ msgid "%u hour"
+#~ msgstr "%u hora"
 
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Alarme em %s\n"
-"%s\n"
-"Iniciando em %s\n"
-"Terminando em %s"
+#~ msgid "%u hours"
+#~ msgstr "%u horas"
 
-msgid "Remove"
-msgstr "Remover"
+#~ msgid "Or_ganizer"
+#~ msgstr "Or_ganizador"
 
-msgid "Don't Remove"
-msgstr "Não Remover"
+#~ msgid "_Description:"
+#~ msgstr "_Descrição:"
 
-msgid "05 minutes"
-msgstr "05 minutos"
+#~ msgid "_Set alarm\t"
+#~ msgstr "_Configurar alarme\t"
 
-msgid "10 minutes"
-msgstr "10 minutos"
+#~ msgid "<span weight=\"bold\">Basics</span>"
+#~ msgstr "<span weight=\"bold\">Fundamentos</span>"
 
-msgid "15 minutes"
-msgstr "15 minutos"
+#~ msgid "Classi_fication:"
+#~ msgstr "Classi_ficação:"
 
-msgid "30 minutes"
-msgstr "30 minutos"
+#~ msgid "_Group"
+#~ msgstr "_Grupo"
 
-msgid "60 minutes"
-msgstr "60 minutos"
+#~ msgid "Task Table"
+#~ msgstr "Tabela de Tarefas"
 
-msgid "<b>Alerts</b>"
-msgstr "<b>Alertas</b> "
+#~ msgid "Removal Complete"
+#~ msgstr "Remoção Concluída"
 
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Servidor de Livre/Ocupado Padrão</b>"
+#~ msgid "Con_tacts..."
+#~ msgstr "Con_tatos..."
 
-msgid "<b>General</b>"
-msgstr "<b>Geral</b>"
+#~ msgid "Memo Table"
+#~ msgstr "Tabela de Memorandos"
 
-msgid "<b>Publishing</b>"
-msgstr "<b>Publicação</b>"
+#~ msgid "Timezone Button"
+#~ msgstr "Botão de Fuso Horário "
 
-msgid "<b>Task List</b>"
-msgstr "<b>Lista de Tarefas</b>"
+#~ msgid "The Evolution Groupware Suite"
+#~ msgstr "O Conjunto de Aplicações para Grupos de Trabalho Evolution"
 
-msgid "<b>Time</b>"
-msgstr "<b>Hora</b>"
+#~ msgid "Mail Accounts Table"
+#~ msgstr "Tabela de Contas de Correio"
 
-msgid "<b>Work Week</b>"
-msgstr "<b>Semana Útil</b>"
+#~ msgid "Attachment Button"
+#~ msgstr "Botão de Anexo"
 
-msgid "Calendar and Tasks Settings"
-msgstr "Configurações de Agenda e Tarefas"
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "Alternar Barra de Anexos"
 
-msgid "Color for overdue tasks"
-msgstr "Cor para tarefas atrasadas"
+#~ msgid "Filters"
+#~ msgstr "Filtros"
 
-msgid "Color for tasks due today"
-msgstr "Cor das tarefas com prazo para hoje"
+#~ msgid "T_erminal Font:"
+#~ msgstr "Fonte de _Terminal:"
 
-msgid "Days"
-msgstr "Dias"
+#~ msgid "_Show animated images"
+#~ msgstr "_Exibir imagens animadas"
 
-msgid "Hours"
-msgstr "Horas"
+#~ msgid "<b>%s (%s)</b> : %s"
+#~ msgstr "<b>%s (%s)</b> : %s"
 
-msgid "Minutes"
-msgstr "Minutos"
+#~ msgid "<b>%s (%s)</b>"
+#~ msgstr "<b>%s (%s)</b>"
 
-msgid "_Add URL"
-msgstr "Adicionar _URL"
+#~ msgid "<b>%s</b> : %s"
+#~ msgstr "<b>%s</b> : %s"
 
-msgid "option menu to choose reminder units"
-msgstr "menu de opções para escolher unidades do lembrete"
+#~ msgid "<b>%s</b>"
+#~ msgstr "<b>%s</b>"
 
-msgid "option menu to choose time units"
-msgstr "menu de opções para escolher unidades de tempo"
+#~ msgid "Message List"
+#~ msgstr "Lista de Mensagens"
 
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "Barra de _Anexos (solte aqui os anexos)"
+#~ msgid "<span weight=\"bold\">Automatic Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contatos Automáticos</span>"
 
-msgid "Scheduling"
-msgstr "Agendar"
+#~ msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+#~ msgstr "<span weight=\"bold\">Contatos de Mensageiros Instantâneos</span>"
 
-msgid "Invitations"
-msgstr "Convites"
+#~ msgid "dialog1"
+#~ msgstr "dialog1"
 
-msgid "<b>Date and Time</b>"
-msgstr "<b>Data e Hora</b>"
+#~ msgid "<span weight=\"bold\">Conflict Search</span>"
+#~ msgstr "<span weight=\"bold\">Procura de Conflitos</span>"
 
-msgid "<b>Send Options</b>"
-msgstr "<b>Opções de Envio</b>"
+#~ msgid "Id"
+#~ msgstr "Id"
 
-msgid "This appointment has customized alarms"
-msgstr "Este compromisso possui alarmes personalizados"
+#~ msgid "Path"
+#~ msgstr "Caminho"
 
-msgid "_Alarm"
-msgstr "_Alarme"
+#~ msgid "Delete this Occurrence"
+#~ msgstr "Excluir esta Ocorrência"
 
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>Dele_gados</b>"
+#~ msgid "Alar_ms"
+#~ msgstr "Alar_mes"
 
-msgid "<b>From:</b>"
-msgstr "<b>De:</b>"
+#~ msgid "_All day Event"
+#~ msgstr "Evento de _dia inteiro"
 
-msgid "_Delegate To..."
-msgstr "_Delegar Para..."
+#~ msgid "Previous Button"
+#~ msgstr "Botão Anterior"
 
-msgid "Assignment"
-msgstr "Atribuição"
+#~ msgid "Text Date Entry"
+#~ msgstr "Entrada de Data em Texto"
 
-msgid "Task Description"
-msgstr "Descrição da Tarefa"
+#~ msgid "Date Button"
+#~ msgstr "Botão de Data"
 
-msgid "_Publish Free/Busy Information"
-msgstr "_Publicar Informação de Livre/Ocupado"
+#~ msgid "Time Combo Box"
+#~ msgstr "Seletor de Hora"
 
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
+#~ msgid "Search Text Entry"
+#~ msgstr "Entrada de Texto para Pesquisa"
 
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d/%m/%Y %H:%M"
+#~ msgid "Select target addressbook."
+#~ msgstr "Selecionar catálogo de endereços alvo."
 
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d/%m/%Y %I %p"
+#~ msgid "(none)"
+#~ msgstr "(nenhum)"
 
-msgid "%a %m/%d/%Y %H"
-msgstr "%a %d/%m/%Y %H"
+#~ msgid "Primary Email"
+#~ msgstr "Email Principal"
 
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d/%m/%Y %I:%M:%S %p"
+#~ msgid "Select an Action"
+#~ msgstr "Selecionar uma Ação"
 
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d/%m/%Y %H:%M:%S"
+#~ msgid "Create a new contact \"%s\""
+#~ msgstr "Criar um novo contato \"%s\""
 
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d/%m/%Y %I:%M %p"
+#~ msgid "Add address to existing contact \"%s\""
+#~ msgstr "Adicionar endereço a um contato existente \"%s\""
 
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y %H:%M"
+#~ msgid "Merge E-Mail Address"
+#~ msgstr "Mesclar Endereço de E-Mail"
 
-msgid "%m/%d/%Y %I %p"
-msgstr "%d/%m/%Y %I %p"
+#~ msgid "Discard Changes"
+#~ msgstr "Descartar Alterações"
 
-msgid "%m/%d/%Y %H"
-msgstr "%d/%m/%Y %H"
+#~ msgid ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s until %s"
+#~ msgstr ""
+#~ "<big><b>%s</b></big>\n"
+#~ "%s até %s"
 
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+#~ msgid "description of appointment"
+#~ msgstr "descrição do compromisso"
 
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+#~ msgid "Dismiss"
+#~ msgstr "Ignorar"
 
-msgid "%I %p"
-msgstr "%I %p"
+#~ msgid "Dismiss All"
+#~ msgstr "Ignorar Tudo"
 
-msgid "_Rule name:"
-msgstr "Nome da _regra:"
+#~ msgid ""
+#~ "Alarm on %s\n"
+#~ "%s\n"
+#~ "Starting at %s\n"
+#~ "Ending at %s"
+#~ msgstr ""
+#~ "Alarme em %s\n"
+#~ "%s\n"
+#~ "Iniciando em %s\n"
+#~ "Terminando em %s"
 
-msgid "If"
-msgstr "Se"
+#~ msgid "Remove"
+#~ msgstr "Remover"
 
-msgid "Execute actions"
-msgstr "Executar ações"
+#~ msgid "Don't Remove"
+#~ msgstr "Não Remover"
 
-msgid "Execute Command..."
-msgstr "Executar Comando..."
+#~ msgid "05 minutes"
+#~ msgstr "05 minutos"
 
-msgid "Server: %s, Type: %s"
-msgstr "Servidor: %s, Tipo: %s"
+#~ msgid "10 minutes"
+#~ msgstr "10 minutos"
 
-msgid "Path: %s, Type: %s"
-msgstr "Caminho: %s, Tipo: %s"
+#~ msgid "15 minutes"
+#~ msgstr "15 minutos"
 
-msgid "Type: %s"
-msgstr "Tipo: %s"
+#~ msgid "30 minutes"
+#~ msgstr "30 minutos"
 
-msgid "Automatic contacts"
-msgstr "Contatos automáticos"
+#~ msgid "60 minutes"
+#~ msgstr "60 minutos"
 
-msgid "Exchange Connector access error."
-msgstr "Erro de acesso da conta do Exchange."
+#~ msgid "<b>Alerts</b>"
+#~ msgstr "<b>Alertas</b> "
 
-msgid "Meetings and Tasks"
-msgstr "Reuniões e Tarefas"
+#~ msgid "<b>Default Free/Busy Server</b>"
+#~ msgstr "<b>Servidor de Livre/Ocupado Padrão</b>"
 
-msgid "Plugin manager"
-msgstr "Gerenciador de módulos"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Geral</b>"
 
-msgid "Sa junk-plugin"
-msgstr "Sa junk-plugin"
+#~ msgid "<b>Publishing</b>"
+#~ msgstr "<b>Publicação</b>"
 
-msgid "learns junk messages using spamd."
-msgstr "aprender mensagens indesejadas utilizando o spamd."
+#~ msgid "<b>Task List</b>"
+#~ msgstr "<b>Lista de Tarefas</b>"
 
-msgid "Uid"
-msgstr "Uid"
+#~ msgid "<b>Time</b>"
+#~ msgstr "<b>Hora</b>"
 
-msgid "Url"
-msgstr "Url"
+#~ msgid "<b>Work Week</b>"
+#~ msgstr "<b>Semana Útil</b>"
 
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"A extensão de nome de arquivo sugerida para este tipo de arquivo (%s) não é "
-"usada no nome de arquivo escolhido. Você deseja continuar?"
+#~ msgid "Calendar and Tasks Settings"
+#~ msgstr "Configurações de Agenda e Tarefas"
 
-msgid "Evolution Settings"
-msgstr "Configurações do Evolution"
+#~ msgid "Color for overdue tasks"
+#~ msgstr "Cor para tarefas atrasadas"
 
-msgid "C"
-msgstr "C"
+#~ msgid "Color for tasks due today"
+#~ msgstr "Cor das tarefas com prazo para hoje"
 
-msgid "CN"
-msgstr "CN"
+#~ msgid "Days"
+#~ msgstr "Dias"
 
-msgid "OU"
-msgstr "OU"
+#~ msgid "Hours"
+#~ msgstr "Horas"
 
-msgid "O"
-msgstr "O"
+#~ msgid "Minutes"
+#~ msgstr "Minutos"
 
-msgid "L"
-msgstr "L"
+#~ msgid "_Add URL"
+#~ msgstr "Adicionar _URL"
 
-msgid "DN"
-msgstr "DN"
+#~ msgid "option menu to choose reminder units"
+#~ msgstr "menu de opções para escolher unidades do lembrete"
 
-msgid "DC"
-msgstr "DC"
+#~ msgid "option menu to choose time units"
+#~ msgstr "menu de opções para escolher unidades de tempo"
 
-msgid "ST"
-msgstr "ST"
+#~ msgid "_Attachment Bar (drop attachments here)"
+#~ msgstr "Barra de _Anexos (solte aqui os anexos)"
 
-msgid "E"
-msgstr "L"
+#~ msgid "Scheduling"
+#~ msgstr "Agendar"
 
-msgid "_Preview Pane"
-msgstr "_Painel de Visualização"
+#~ msgid "Invitations"
+#~ msgstr "Convites"
 
-msgid "_Select All"
-msgstr "_Selecionar Tudo"
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>Data e Hora</b>"
 
-msgid "Delete this occurrence"
-msgstr "Excluir esta ocorrência"
+#~ msgid "<b>Send Options</b>"
+#~ msgstr "<b>Opções de Envio</b>"
+
+#~ msgid "This appointment has customized alarms"
+#~ msgstr "Este compromisso possui alarmes personalizados"
+
+#~ msgid "<b>Dele_gatees</b>"
+#~ msgstr "<b>Dele_gados</b>"
+
+#~ msgid "<b>From:</b>"
+#~ msgstr "<b>De:</b>"
+
+#~ msgid "_Delegate To..."
+#~ msgstr "_Delegar Para..."
+
+#~ msgid "Assignment"
+#~ msgstr "Atribuição"
+
+#~ msgid "_Publish Free/Busy Information"
+#~ msgstr "_Publicar Informação de Livre/Ocupado"
+
+#~ msgid "%a %m/%d/%Y %I:%M %p"
+#~ msgstr "%a %d/%m/%Y %I:%M %p"
+
+#~ msgid "%a %m/%d/%Y %H:%M"
+#~ msgstr "%a %d/%m/%Y %H:%M"
+
+#~ msgid "%a %m/%d/%Y %I %p"
+#~ msgstr "%a %d/%m/%Y %I %p"
+
+#~ msgid "%a %m/%d/%Y %H"
+#~ msgstr "%a %d/%m/%Y %H"
+
+#~ msgid "%m/%d/%Y %I:%M:%S %p"
+#~ msgstr "%d/%m/%Y %I:%M:%S %p"
+
+#~ msgid "%m/%d/%Y %H:%M:%S"
+#~ msgstr "%d/%m/%Y %H:%M:%S"
+
+#~ msgid "%m/%d/%Y %I:%M %p"
+#~ msgstr "%d/%m/%Y %I:%M %p"
+
+#~ msgid "%m/%d/%Y %H:%M"
+#~ msgstr "%d/%m/%Y %H:%M"
+
+#~ msgid "%m/%d/%Y %I %p"
+#~ msgstr "%d/%m/%Y %I %p"
+
+#~ msgid "%m/%d/%Y %H"
+#~ msgstr "%d/%m/%Y %H"
+
+#~ msgid "%I:%M:%S %p"
+#~ msgstr "%I:%M:%S %p"
+
+#~ msgid "%H:%M:%S"
+#~ msgstr "%H:%M:%S"
+
+#~ msgid "%I %p"
+#~ msgstr "%I %p"
+
+#~ msgid "_Rule name:"
+#~ msgstr "Nome da _regra:"
+
+#~ msgid "If"
+#~ msgstr "Se"
+
+#~ msgid "Execute actions"
+#~ msgstr "Executar ações"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Executar Comando..."
+
+#~ msgid "Server: %s, Type: %s"
+#~ msgstr "Servidor: %s, Tipo: %s"
+
+#~ msgid "Path: %s, Type: %s"
+#~ msgstr "Caminho: %s, Tipo: %s"
+
+#~ msgid "Type: %s"
+#~ msgstr "Tipo: %s"
+
+#~ msgid "Automatic contacts"
+#~ msgstr "Contatos automáticos"
+
+#~ msgid "Exchange Connector access error."
+#~ msgstr "Erro de acesso da conta do Exchange."
+
+#~ msgid "Meetings and Tasks"
+#~ msgstr "Reuniões e Tarefas"
+
+#~ msgid "Plugin manager"
+#~ msgstr "Gerenciador de módulos"
+
+#~ msgid "Sa junk-plugin"
+#~ msgstr "Sa junk-plugin"
+
+#~ msgid "learns junk messages using spamd."
+#~ msgstr "aprender mensagens indesejadas utilizando o spamd."
+
+#~ msgid "Uid"
+#~ msgstr "Uid"
+
+#~ msgid "Url"
+#~ msgstr "Url"
+
+#~ msgid ""
+#~ "The suggested filename extension of this filetype (%s) is unused in the "
+#~ "chosen filename. Do you want to continue?"
+#~ msgstr ""
+#~ "A extensão de nome de arquivo sugerida para este tipo de arquivo (%s) não "
+#~ "é usada no nome de arquivo escolhido. Você deseja continuar?"
+
+#~ msgid "Evolution Settings"
+#~ msgstr "Configurações do Evolution"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "CN"
+#~ msgstr "CN"
+
+#~ msgid "OU"
+#~ msgstr "OU"
+
+#~ msgid "O"
+#~ msgstr "O"
+
+#~ msgid "L"
+#~ msgstr "L"
+
+#~ msgid "DN"
+#~ msgstr "DN"
+
+#~ msgid "DC"
+#~ msgstr "DC"
+
+#~ msgid "ST"
+#~ msgstr "ST"
+
+#~ msgid "E"
+#~ msgstr "L"
+
+#~ msgid "_Preview Pane"
+#~ msgstr "_Painel de Visualização"
+
+#~ msgid "_Select All"
+#~ msgstr "_Selecionar Tudo"
 
-msgid "Customize My Evolution"
-msgstr "Personalizar o Meu Evolution"
+#~ msgid "Customize My Evolution"
+#~ msgstr "Personalizar o Meu Evolution"
 
-msgid "Move"
-msgstr "Mover"
+#~ msgid "Move"
+#~ msgstr "Mover"
 
-msgid "_About Evolution..."
-msgstr "_Sobre o Evolution..."
+#~ msgid "_About Evolution..."
+#~ msgstr "_Sobre o Evolution..."
 
-msgid "_Send / Receive"
-msgstr "_Enviar/Receber"
+#~ msgid "_Send / Receive"
+#~ msgstr "_Enviar/Receber"
 
-msgid "Always Search"
-msgstr "Pesquisar Sempre"
+#~ msgid "Always Search"
+#~ msgstr "Pesquisar Sempre"
 
 #~ msgid "Message _List As"
 #~ msgstr "_Lista de Mensagens Como"
diff --git a/po/sq.po b/po/sq.po
index c08f0ada52..ac4c32beff 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -1,21 +1,19 @@
-# Përkthimi i mesazheve të evolution.HEAD.sq në shqip
+# Përkthimi i mesazheve të evolution në shqip
 # This file is distributed under the same license as the evolution package.
 #
-#
 # Laurent Dhima <laurenti@alblinux.net>, 2003, 2004, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution.HEAD.sq\n"
+"Project-Id-Version: evolution gnome-2-14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 06:05+0100\n"
-"PO-Revision-Date: 2006-03-02 17:45+0100\n"
+"POT-Creation-Date: 2006-04-21 04:29+0200\n"
+"PO-Revision-Date: 2006-04-21 09:39+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
-"Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"Language-Team: albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.2\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
@@ -111,32 +109,32 @@ msgstr "Shko tek data"
 msgid "a table to view and select the current time range"
 msgstr "një tabelë për të shfaqur dhe zgjedhur intervalin e kohës aktuale"
 
-#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:149 ../a11y/calendar/ea-week-view.c:151
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Përmban %d ndodhi."
 msgstr[1] "Përmban %d ndodhi."
 
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:151 ../a11y/calendar/ea-week-view.c:153
 msgid "It has no events."
 msgstr "Nuk ka ndodhi."
 
-#: ../a11y/calendar/ea-day-view.c:152
+#: ../a11y/calendar/ea-day-view.c:155
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Paraqitja e javës së punës: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:155
+#: ../a11y/calendar/ea-day-view.c:158
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Paraqitja ditore: %s. %s"
 
-#: ../a11y/calendar/ea-day-view.c:186
+#: ../a11y/calendar/ea-day-view.c:189
 msgid "calendar view for a work week"
 msgstr "paraqitja e kalendarit për një javë pune"
 
-#: ../a11y/calendar/ea-day-view.c:188
+#: ../a11y/calendar/ea-day-view.c:191
 msgid "calendar view for one or more days"
 msgstr "paraqitja e kalendarit për një apo më shumë ditë"
 
@@ -212,21 +210,21 @@ msgstr "Pulsanti \"shko tek\""
 msgid "Click here, you can find more events."
 msgstr "Kliko këtu për gjetur aktivitete të tjerë.֣"
 
-#: ../a11y/calendar/ea-week-view.c:155
+#: ../a11y/calendar/ea-week-view.c:158
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Paraqitja mujore: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:159
+#: ../a11y/calendar/ea-week-view.c:162
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Paraqitja javore: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:190
+#: ../a11y/calendar/ea-week-view.c:193
 msgid "calendar view for a month"
 msgstr "paraqitja e kalendarit për një muaj"
 
-#: ../a11y/calendar/ea-week-view.c:192
+#: ../a11y/calendar/ea-week-view.c:195
 msgid "calendar view for one or more weeks"
 msgstr "paraqitja e kalendarit për një apo më shumë javë"
 
@@ -540,9 +538,9 @@ msgstr "Konfiguro këtu plotësimin automatik"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -814,7 +812,7 @@ msgstr "Ruaj si VCard..."
 msgid "_Properties..."
 msgstr "_Pronësitë..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Zgjedhësi i origjinës së kontakteve"
 
@@ -823,12 +821,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Hyrje anonime tek server-i LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Autentifikimi dështoi.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Shkruaj fjalëkalimin për %s (përdoruesi %s)"
@@ -1065,8 +1063,8 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "Baza e kërkimit është emri i veçantë (DN) i zërit ku kërkimet tuaja do të "
-"fillojnë. Nëse kjo fushë lihet bosh kërkimi do të fillojë nga baza e degëzimit"
-"të kartelave."
+"fillojnë. Nëse kjo fushë lihet bosh kërkimi do të fillojë nga baza e "
+"degëzimittë kartelave."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1188,12 +1186,9 @@ msgstr "cards"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114 ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:2021
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -2461,7 +2456,7 @@ msgstr "Shërbimi"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:478
+#: ../plugins/publish-calendar/publish-calendar.c:497
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "Vendodhja"
@@ -2525,15 +2520,15 @@ msgstr "Ndryshuar"
 msgid "Contact Editor - %s"
 msgstr "Editori i kontakteve - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2772
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Ju lutem zgjidhni një figurë për këtë kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Asnjë figurë"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3057
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2541,7 +2536,7 @@ msgstr ""
 "E dhëna e kontaktit është e pavlefshme:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3109
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Kontakt i pavlefshëm."
 
@@ -2698,8 +2693,8 @@ msgstr "Shërbimi _IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Pozicioni:"
 
@@ -2869,7 +2864,7 @@ msgstr "Burimi"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:480
+#: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
@@ -2882,7 +2877,7 @@ msgid "Save as VCard..."
 msgstr "Ruaje si VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1086
+#: ../calendar/gui/dialogs/comp-editor.c:1088
 #: ../calendar/gui/e-calendar-table.c:1174
 #: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
@@ -3102,7 +3097,7 @@ msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:491
+#: ../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"
@@ -3149,7 +3144,7 @@ msgstr "Siti web"
 #: ../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:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "Gjerësia"
@@ -3164,7 +3159,7 @@ msgstr "Gjerësia"
 #: ../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:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
 #: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "Lartësia"
@@ -3684,19 +3679,19 @@ msgstr "Importuesi i Evolution CSV dhe Tab"
 msgid "Importing ..."
 msgstr "Duke importuar ..."
 
-#: ../addressbook/importers/evolution-ldif-importer.c:761
+#: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "Format LDAP Data Interchange (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:762
+#: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Importuesi LDIF i Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:554
+#: ../addressbook/importers/evolution-vcard-importer.c:547
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:555
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Importuesi VCard i Evolution"
 
@@ -3759,7 +3754,7 @@ msgstr "Formati"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Kreu i faqes"
@@ -3864,8 +3859,8 @@ msgstr "Hija"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Madhësia:"
 
@@ -4352,7 +4347,7 @@ msgid "_Save Changes"
 msgstr "_Ruaj ndryshimet"
 
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Dërgo"
 
@@ -4465,14 +4460,14 @@ msgid "Memos"
 msgstr "Përkujtesa"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-calendar-table.c:525 ../calendar/gui/e-tasks.c:1347
 #: ../calendar/gui/print.c:1828 ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Aktivitete"
@@ -4491,9 +4486,6 @@ msgid "Evolution Calendar alarm notification service"
 msgstr "Shërbimi i njoftimit të alarmit të kalendarit të Evolution"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
-#: ../calendar/gui/alarm-notify/util.c:65
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:112
-#: ../calendar/gui/misc.c:114
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutë"
@@ -4628,67 +4620,34 @@ msgstr ""
 msgid "invalid time"
 msgstr "orë e pavlefshme"
 
-#. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#, c-format
-msgid "(%ld seconds)"
-msgstr "(%ld sekonda)"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#, c-format
-msgid "(%d %s %d %s)"
-msgstr "(%d %s %d %s)"
-
-#. 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/alarm-notify/util.c:65
-#: ../calendar/gui/dialogs/recurrence-page.c:998 ../calendar/gui/misc.c:112
-msgid "second"
-msgstr "sekondë"
-
-#: ../calendar/gui/alarm-notify/util.c:65 ../calendar/gui/misc.c:112
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
-msgid "seconds"
-msgstr "sekonda"
-
-#: ../calendar/gui/alarm-notify/util.c:67 ../calendar/gui/misc.c:114
-#, c-format
-msgid "(%d %s)"
-msgstr "(%d %s)"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u second"
-msgstr " %u sekondë"
-
-#: ../calendar/gui/alarm-notify/util.c:78 ../calendar/gui/misc.c:125
-#, c-format
-msgid " %u seconds"
-msgstr " %u sekonda"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
-#, c-format
-msgid " %u minute"
-msgstr " %u minutë"
-
-#: ../calendar/gui/alarm-notify/util.c:80 ../calendar/gui/misc.c:127
+#. 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 " %u minutes"
-msgstr " %u minuta"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d orë"
+msgstr[1] "%d orë"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hour"
-msgstr "%u orë"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minutë"
+msgstr[1] "%d minuta"
 
-#: ../calendar/gui/alarm-notify/util.c:82 ../calendar/gui/misc.c:129
+#. 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 "%u hours"
-msgstr "%u orë"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "sekondë"
+msgstr[1] "sekonda"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
@@ -5116,10 +5075,10 @@ msgstr "Printo"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5378,7 +5337,7 @@ msgstr "minutë(a)"
 msgid "start of appointment"
 msgstr "fillimit të takimit"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
 msgid "Action/Trigger"
 msgstr "Veprimi"
 
@@ -5495,7 +5454,7 @@ msgid "Display"
 msgstr "Shfaq"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "I lirë/zënë"
@@ -5855,30 +5814,30 @@ msgstr "_Lëviz"
 msgid "Cancel _Drag"
 msgstr "Anullo _zvarritjen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:800
+#: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "I pamundur rifreskimi i objektit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:943 ../composer/e-msg-composer.c:2479
+#: ../calendar/gui/dialogs/comp-editor.c:945 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> I bashkangjitur"
 msgstr[1] "<b>%d</b> Të bashkangjitur"
 
-#: ../calendar/gui/dialogs/comp-editor.c:975
+#: ../calendar/gui/dialogs/comp-editor.c:977
 msgid "Hide Attachment _Bar"
 msgstr "Fshih _shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978
-#: ../calendar/gui/dialogs/comp-editor.c:1442
+#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Shfaq _shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1087
-#: ../calendar/gui/dialogs/event-page.c:1897
+#: ../calendar/gui/dialogs/comp-editor.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5887,83 +5846,83 @@ msgstr "Shfaq _shtyllën e bashkangjitjes"
 msgid "_Remove"
 msgstr "_Hiq"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3620 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "_Pronësitë"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "_Shto të bashkangjitur..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1466
+#: ../calendar/gui/dialogs/comp-editor.c:1468
 #: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Shfaq të bashkangjiturit"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Shtyp butonin hapsirë për të shpalosur shtyllën e bashkangjitjes"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2117
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Ndrysho takimin"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2080
-#: ../calendar/gui/dialogs/comp-editor.c:2123
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Takimi - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/dialogs/comp-editor.c:2125
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Takimi - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../calendar/gui/dialogs/comp-editor.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Aktivitet i caktuar - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2088
-#: ../calendar/gui/dialogs/comp-editor.c:2131
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Aktiviteti - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/comp-editor.c:2134
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Zë i ditarit - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2102
-#: ../calendar/gui/dialogs/comp-editor.c:2144
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Asnjë përmbledhje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2652
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501 ../widgets/misc/e-attachment-bar.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:2654
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535 ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bashkangjitur"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2741
-#: ../calendar/gui/dialogs/comp-editor.c:2795
-#: ../calendar/gui/dialogs/comp-editor.c:2819
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ndryshimet e kryera në këtë element mund të anullohen nëse arrin një "
 "rifreskim"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2843
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "I pamundur përdorimi i versionit aktual!"
 
@@ -6050,106 +6009,106 @@ msgid "Recurrence"
 msgstr "Përvjetor"
 
 #: ../calendar/gui/dialogs/event-page.c:807
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:2714
 msgid "This event has alarms"
 msgstr "Ky aktivitet përmban alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../calendar/gui/dialogs/event-page.c:872
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "Kale_ndari:"
 
-#: ../calendar/gui/dialogs/event-page.c:881
+#: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganizuesi:"
 
-#: ../calendar/gui/dialogs/event-page.c:919
+#: ../calendar/gui/dialogs/event-page.c:916
 msgid "_Delegatees"
 msgstr "Të _deleguar"
 
-#: ../calendar/gui/dialogs/event-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:918
 msgid "Atte_ndees"
 msgstr "Pjes_marrës"
 
-#: ../calendar/gui/dialogs/event-page.c:1089
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "Ngjarje pa datë fillimi"
 
-#: ../calendar/gui/dialogs/event-page.c:1092
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "Ngjarje pa datë përfundimi"
 
-#: ../calendar/gui/dialogs/event-page.c:1260
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Data e fillimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1270
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "Data e përfundimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1293
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "Ora e fillimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1300
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "Ora e përfundimit është e gabuar"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Organizuesi i zgjedhur nuk ka më një llogari."
 
-#: ../calendar/gui/dialogs/event-page.c:1461
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "Nevoitet një organizues."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Nevoitet të paktën një pjesmarrës."
 
-#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Shto "
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2621
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "E pamundur hapja e kalendarit '%s'."
 
-#: ../calendar/gui/dialogs/event-page.c:2920
+#: ../calendar/gui/dialogs/event-page.c:2924
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d ditë para takimit"
 msgstr[1] "%d ditë para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2928
+#: ../calendar/gui/dialogs/event-page.c:2932
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d orë para takimit"
 msgstr[1] "%d orë para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2940
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minutë para takimit"
 msgstr[1] "%d minuta para takimit"
 
-#: ../calendar/gui/dialogs/event-page.c:2952
+#: ../calendar/gui/dialogs/event-page.c:2956
 msgid "Customize"
 msgstr "Personalizo"
 
@@ -6158,7 +6117,7 @@ msgstr "Personalizo"
 #. 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/event-page.c:2957
+#: ../calendar/gui/dialogs/event-page.c:2961
 #: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
@@ -6287,14 +6246,14 @@ msgstr "Anëtar"
 
 #. To translators: RSVP means "please reply"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:503
+#: ../calendar/gui/e-meeting-list-view.c:509
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:514
+#: ../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:12
 msgid "Status"
@@ -6331,7 +6290,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "E pamundur hapja e përkujtesave tek '%s'."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupi:"
@@ -6430,6 +6389,15 @@ msgstr "në"
 msgid "first"
 msgstr "i pari"
 
+#. 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:998
+msgid "second"
+msgstr "sekondë"
+
 #. 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.
@@ -6574,7 +6542,7 @@ msgstr "<span weight=\"bold\">Gjendja</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "U plotësua"
@@ -6650,11 +6618,11 @@ msgstr "_Aktivitet"
 msgid "Task Details"
 msgstr "Detajet e aktivitetit"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Data e duhur është e gabuar"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "E pamundur hapja e aktiviteteve tek '%s'."
@@ -6738,30 +6706,6 @@ msgid_plural "%d weeks"
 msgstr[0] "%d javë"
 msgstr[1] "%d javë"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:408
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d orë"
-msgstr[1] "%d orë"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:414
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutë"
-msgstr[1] "%d minuta"
-
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:420
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "sekondë"
-msgstr[1] "sekonda"
-
 #: ../calendar/gui/e-alarm-list.c:464
 msgid "Unknown action to be performed"
 msgstr "Veprim i panjohur"
@@ -6922,27 +6866,27 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165 ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Po"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Jo"
 
 #. 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:122 ../calendar/gui/e-cal-popup.c:167
+#: ../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-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6959,35 +6903,35 @@ msgstr "Përsëritet"
 msgid "Assigned"
 msgstr "Caktuar"
 
-#: ../calendar/gui/e-cal-popup.c:173 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "Ruaj Si..."
 
-#: ../calendar/gui/e-cal-popup.c:189 ../mail/em-format-html-display.c:1913
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Zgjidh kartelën ku duhen ruajtur të bashkangjiturit e zgjedhur..."
 
-#: ../calendar/gui/e-cal-popup.c:218 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "figurë_paemër.%s"
 
-#: ../calendar/gui/e-cal-popup.c:272 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
 #: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_Ruaje si..."
 
-#: ../calendar/gui/e-cal-popup.c:273 ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "Vendose si _sfond"
 
-#: ../calendar/gui/e-cal-popup.c:274
+#: ../calendar/gui/e-cal-popup.c:278
 msgid "_Save Selected"
 msgstr "_Ruaj të zgjedhurit"
 
-#: ../calendar/gui/e-cal-popup.c:396 ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "Hap në %s..."
@@ -7401,7 +7345,7 @@ msgstr ""
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7414,7 +7358,7 @@ msgstr "U pranua me përpjekje"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7743,81 +7687,81 @@ msgid "Resources"
 msgstr "Gjëndja"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98 ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Vetjake"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupi"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Burimi"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Dhoma"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133 ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Moderues"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Pjesmarrësi i kërkuar"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Pjesmarrës shtesë"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Jo pjesmarrës"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183 ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Kërkon veprim"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Përpjekje"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "Deleguar"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:464
+#: ../calendar/gui/e-meeting-list-view.c:470
 msgid "Attendee                          "
 msgstr "Pjesmarrës                          "
 
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Në proçes"
 
 #. 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:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -7826,7 +7770,7 @@ msgstr "%A, %B %d, %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
@@ -7912,7 +7856,7 @@ msgstr "Kliko për të shtuar një përkujtesë"
 msgid "Memo sort"
 msgstr "Renditja e përkujtesave"
 
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:818
+#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:836
 #: ../calendar/gui/gnome-cal.c:2557
 #, c-format
 msgid ""
@@ -7931,7 +7875,7 @@ msgstr "Duke ngarkuar përkujtesat"
 msgid "Opening memos at %s"
 msgstr "Duke hapur përkujtesat tek %s"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1221
+#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1239
 msgid "Deleting selected objects..."
 msgstr "Duke eleminuar objektet e zgjedhur..."
 
@@ -7940,20 +7884,20 @@ msgstr "Duke eleminuar objektet e zgjedhur..."
 msgid "Enter the password for %s"
 msgstr "Shkruaj fjalëkalimin për %s"
 
-#: ../calendar/gui/e-tasks.c:866
+#: ../calendar/gui/e-tasks.c:884
 msgid "Loading tasks"
 msgstr "Duke ngarkuar aktivitetet"
 
-#: ../calendar/gui/e-tasks.c:953
+#: ../calendar/gui/e-tasks.c:971
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Duke lexuar aktivitetet tek %s"
 
-#: ../calendar/gui/e-tasks.c:1198
+#: ../calendar/gui/e-tasks.c:1216
 msgid "Completing tasks..."
 msgstr "Duke plotësuar aktivitetet..."
 
-#: ../calendar/gui/e-tasks.c:1248
+#: ../calendar/gui/e-tasks.c:1266
 msgid "Expunging"
 msgstr "Duke pastruar"
 
@@ -8233,12 +8177,6 @@ msgstr "I pamundur migrimi i kalendarit `%s'"
 msgid "Unable to migrate tasks `%s'"
 msgstr "I pamundur migrimi i aktiviteteve `%s'"
 
-#. Can't be zero
-#: ../calendar/gui/misc.c:105
-#, c-format
-msgid "(%d seconds)"
-msgstr "(%d sekonda)"
-
 #: ../calendar/gui/print.c:493
 msgid "1st"
 msgstr "1-ri"
@@ -10150,7 +10088,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:986
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Shtylla e bashkangjitjes"
 
@@ -10353,7 +10291,7 @@ msgstr ""
 "tjera mail."
 
 #: ../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 "Për arsye &quot;{1}&quot;."
 
@@ -10471,11 +10409,11 @@ msgstr "_Ruaj mesazhin"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Suite Groupware"
 
@@ -10643,7 +10581,7 @@ msgstr "Dëshiron t'a mbishkruash?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "File ekziston &quot;{0}&quot;."
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "_Mbishkruaj"
 
@@ -10811,7 +10749,7 @@ msgstr "Mungon data."
 msgid "Missing file name."
 msgstr "Mungon emri i file."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Mungon emri."
 
@@ -10883,6 +10821,10 @@ msgstr "më parë"
 msgid "months"
 msgstr "muaj"
 
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:178
+msgid "seconds"
+msgstr "sekonda"
+
 #: ../filter/filter.glade.h:19
 msgid "the current time"
 msgstr "ora aktuale"
@@ -11060,7 +11002,7 @@ msgstr "[Prezgjedhur]"
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:518 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:474
+#: ../plugins/publish-calendar/publish-calendar.c:493
 msgid "Enabled"
 msgstr "Aktiv"
 
@@ -11093,14 +11035,14 @@ msgstr "Firma(t)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesazhi i Përcjellë --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "një dërgues i panjohur"
 
 #. 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:1713
+#: ../mail/em-composer-utils.c:1712
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11240,11 +11182,11 @@ msgstr "nuk është shënuar me flamurë"
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "Për në plehra"
+msgstr "Të padëshiruar"
 
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
-msgstr "Teksti për t'u refuzuar"
+msgstr "Teksti i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
 msgid "Label"
@@ -11268,11 +11210,11 @@ msgstr "Kreu i mesazhit"
 
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "Mesazhi është për tu flakur"
+msgstr "Mesazhi është i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "Mesazhi nuk është për tu flakur"
+msgstr "Mesazhi nuk është i padëshiruar"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
@@ -11424,7 +11366,7 @@ msgstr "Kopje e keqe"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Në ardhje"
 
@@ -11510,7 +11452,7 @@ msgstr "Kartelë e _Re..."
 msgid "_Rename..."
 msgstr "_Riemërto..."
 
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Zbraz Koshin"
 
@@ -11590,11 +11532,11 @@ msgstr "_Shëno si Parëndësi"
 
 #: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
-msgstr "Shëno si _Plehrë"
+msgstr "Shëno si _Padëshiruar"
 
 #: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
-msgstr "Shëno si _Jo për në plehra"
+msgstr "Shëno si _Jo i padëshiruar"
 
 #: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
@@ -11968,7 +11910,7 @@ msgstr "GrupeLajmesh"
 msgid "%s attachment"
 msgstr "%s bashkangjitur"
 
-#: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1576
+#: ../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 "I pamundur analizimi i mesazhit S/MIME: Gabim i panjohur"
 
@@ -11984,11 +11926,11 @@ msgstr "Lloj i pasuportuar kriptimi për multipart/encrypted"
 msgid "Unsupported signature format"
 msgstr "Format firme i pasuportuar"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Gabim gjatë kontrollit të firmës"
 
-#: ../mail/em-format.c:1454 ../mail/em-format.c:1518
+#: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Gabim i panjohur gjatë verifikimit të firmës"
 
@@ -12120,20 +12062,20 @@ msgstr "Mos shfaq më këtë mesazh."
 msgid "Message Filters"
 msgstr "Filtrat e mesazheve"
 
-#: ../mail/em-utils.c:462 ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496 ../mail/em-utils.c:533
 msgid "message"
 msgstr "mesazh"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Ruaj mesazhin..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Shto adresën"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Mesazhet nga %s"
@@ -12156,7 +12098,7 @@ msgstr "Kontrolli automatik i smiley"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr "Kontrollo që posta në ardhje të mos përmbajë material për t'u refuzuar"
+msgstr "Kontrollo që posta në ardhje të mos përmbajë material të padëshiruar"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -12447,7 +12389,7 @@ msgstr "Kontrollo smiles në tekst dhe zëvendësoi me figurat."
 
 #: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
-msgstr "Vër në funksion provën për material për t'u refuzuar tek mesazhet në ardhje"
+msgstr "Vër në funksion kontrollin për material të padëshiruar tek mesazhet në ardhje"
 
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
@@ -12804,8 +12746,8 @@ msgstr[1] "%d fshirë"
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d refuzim"
-msgstr[1] "%d refuzime"
+msgstr[0] "%d i padëshiruar"
+msgstr[1] "%d të padëshiruar"
 
 #: ../mail/mail-component.c:546
 #, c-format
@@ -13083,7 +13025,7 @@ msgstr "K_ontrollo për llojet suportuar "
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check in_coming mail for junk"
-msgstr "Kontrollo postën në _hyrje për material për t'u refuzuar"
+msgstr "Kontrollo postën në _hyrje për material të padëshiruar"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
@@ -13091,7 +13033,7 @@ msgstr "Kontrollo drejtshkrimin kur _shkruan"
 
 #: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
-msgstr "Kontrolli i mesazheve në hyrje të postës për në plehra"
+msgstr "Kontrollon mesazhet në hyrje nëse duhen klasifikuar si të padëshiruar"
 
 #: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
@@ -13907,14 +13849,14 @@ 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 ""
-"Një kartelë jo bosh tek &quot;{1}&quot; ekziston.\n"
+"Një kartelë jo bosh tek &quot;{1}&quot; ekziston rregullisht.\n"
 "\n"
 "Mund të vendosni t'a shpërfillni këtë kartelë, mbishkruani apo shtoni "
-"përmbajtjen e saj, ose të dilni.\n"
+"përmbajtjen e saj, ose të dilni."
 
-#: ../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}?"
@@ -13922,7 +13864,7 @@ msgstr ""
 "Një ricevutë leximi është kërkuar për &quot;{1}&quot;. Dërgon njoftimin për "
 "ricevutë tek {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."
@@ -13930,7 +13872,7 @@ msgstr ""
 "Një firmë me emrin &quot;{0}&quot; ekziston. Ju lutem zgjidhni një emër "
 "tjetër."
 
-#: ../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."
@@ -13938,27 +13880,27 @@ msgstr ""
 "Duke shtuar një frazë të qartë tek rreshti i subjektit i mesazheve tuaj u "
 "jipni një ide marrësve mbi përmbajtjen e mesazhit tuaj."
 
-#: ../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 ""
 "Jeni i sigurt që dëshironi të eleminoni këtë llogari dhe të gjithë proxies e "
 "saj?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Jeni i sigurt që dëshironi të eleminoni këtë llogari?"
 
-#: ../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 ""
 "Jeni i sigurt që dëshironi të ç'aktivoni këtë llogari dhe fshini të gjithë "
 "proxies e saj?"
 
-#: ../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 "Jeni i sigurt që dëshironi të hapni {0} mesazhe njëkohësisht?"
 
-#: ../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?"
@@ -13966,7 +13908,7 @@ msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë të gjithë mesazhet e "
 "fshirë në të gjitha kartelat?"
 
-#: ../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;?"
@@ -13974,81 +13916,81 @@ msgstr ""
 "Jeni i sigurt që dëshironi të eleminoni përgjithmonë të gjithë mesazhet e "
 "fshirë tek kartela &quot;{0}&quot;?"
 
-#: ../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 "Jeni i sigurt që dëshironi të dërgoni një mesazh në formatin 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 "Jeni i sigurt që dëshironi të dërgoni një mesazh vetëm me marrësit 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 "Jeni i sigurt që dëshironi të dërgoni një mesazh pa subjekt?"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Sepse &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Sepse &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Firmë bosh"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "I pamundur shtimi i kartelës së kërkimit &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 "I pamundur kopjimi i kartelës &quot;{o}&quot; tek &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "I pamundur krijimi i kartelës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "I pamundur krijimi i directory për ruajtjen e përkohshme."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "I pamundur krijimi i directory për ruajtje, sepse &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "I pamundur eleminimi i kartelës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "E pamundur fshirja e kartelës së sistemit &quot;{0}&quot;."
 
-#: ../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 ""
 "I pamundur ndryshimi i kartelës së kërkimit &quot;{0}&quot; m.q.s. nuk "
 "ekziston."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "E pamundur lëvizja e kartelës &quot;{0}&quot; në &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "E pamundur hapja e burimit &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "E pamundur hapja e burimit &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "E pamundur hapja e objektivit &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 "
@@ -14058,31 +14000,31 @@ msgstr ""
 "problemi instalimi.  Nuk do të jeni në gjendje të përdorni këtë provider "
 "derisa të pranoni liçencën e tij."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "I pamundur riemërtimi i &quot;{0}&quot; në &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 "I pamundur riemërtimi apo lëvizja e kartelës së sistemit &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "E pamundur ruajtja e ndryshimeve në llogari."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "E pamundur ruajtja tek directory &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "E pamundur ruajtja tek file &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "I pamundur caktimi i skriptit të firmës &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."
@@ -14091,71 +14033,71 @@ msgstr ""
 "fjalëkalimet gërmat e mëdha ndikojnë; mund të keni shtypur pulsantin e "
 "shkrimit me gërma të mëdha."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "E pamundur ruajtja e file të firmës."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Eleminoj &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Eleminon llogarinë?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Anullon ndryshimet?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Mos elemino"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Mos ç'aktivo"
 
-#: ../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 "Dëshiron që operacioni të zbatohet tek nënkartelat?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Dëshiron të shënosh të gjithë mesazhet si të lexuar?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Dëshiron të ruash ndryshimet e kryera?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Shkruaj fjalëkalimin."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Gabim gjatë ngarkimit përcaktimeve të filtrit."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Gabim gjatë kryerjes së operacionit."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Gabim kur {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "File ekziston por nuk mund të mbishkruhet."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "File ekziston por nuk është një file i rregullt."
 
-#: ../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 "Nëse vazhdoni, nuk do të jeni në gjendje të rekuperoni këto mesazhe."
 
-#: ../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."
@@ -14163,11 +14105,11 @@ msgstr ""
 "Nëse eleminon kartelën, përmbajtja e saj dhe të nënkartelave të saj do të "
 "fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Nëse vazhdoni, të gjithë llogaritë e proxy do të fshihen përgjithmonë."
 
-#: ../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."
@@ -14175,11 +14117,11 @@ msgstr ""
 "Nëse vazhdoni, informacionet e llogarisë dhe\n"
 "të gjitha informacionet e proxy do të fshihen përgjithmonë."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Nëse vazhdoni, informacionet e llogarisë do të fshihen përgjithmonë."
 
-#: ../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."
@@ -14187,19 +14129,19 @@ msgstr ""
 "Nëse dilni, këto mesazhe nuk do të dërgohenpara se Evolution të niset "
 "përsëri."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Shpërfill"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Autentifikim i pavlefshëm"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "Filtrat e mesazheve u rifreskuan automatikisht."
 
-#: ../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 "
@@ -14211,35 +14153,35 @@ msgstr ""
 "rreshtohen në mesazh. Për të shmangur këtë duhet shtuar të paktën një marrës "
 "Për: ose CC."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Shëno si të lexuar të gjithë mesazhet"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Shëno si të lexuar të gjithë mesazhet tek kartela e zgjedhur"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Kartela mungon."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Nuk është zgjedhur burimi."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Hapja e shumë mesazheve njëkohësisht mund të marrë një kohë tepër të gjatë."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Kontrollo rregullimet e llogarisë suaj dhe riprovo."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Aktivo llogarinë ose dërgo duke përdorur një llogari tjetër."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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."
@@ -14248,7 +14190,7 @@ msgstr ""
 "kërkoni për adresat email duke klikuar tek butoni Për: në vazhdim tek kutia "
 "e zërave."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -14260,49 +14202,49 @@ msgstr ""
 "{0}\n"
 "Dërgoj sidoqoftë?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Shkruaj një emër të papërdorur për të identifikuar këtë firmë."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Ju lutem prisni."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem gjatë migrimit të kartelës së vjetër së postës &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Duke pyetur serverin"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Duke pyetur serverin për listën me mekanizmat e suportuar të autentifikimit."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Kërkohet ricevutë leximi."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr ""
 "Me të vërtetë eleminon kartelën &quot;{0}&quot; me të gjitha nënkartelat e "
 "saj?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Kartela e kërkimit u përditësua automatikisht."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Dërgo ricevutë"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Firma ekziston"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
 "cannot be renamed, moved, or deleted."
@@ -14310,7 +14252,7 @@ msgstr ""
 "Kartelat e sistemit nevoiten që Ximian Evolution të funksionojë si duhet dhe "
 "ato nuk mund të riemërtohen, lëvizen, apo eleminohen."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14327,7 +14269,7 @@ msgstr ""
 "rreshtohen në mesazh. Për të shmangur këtë duhet shtuar të paktën një marrës "
 "Për: ose CC. "
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14341,7 +14283,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Dhe u përditësua."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14355,23 +14297,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "Dhe u përditësuan."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Mesazhi është dërguar me anë të programit të jashtëm &quot;sendmail&quot;.  "
-"Sendmail njoftoi gabimin në vazhdim: status 67: mesazhi nuk u dërgua.\n"
-"Mesazhi është magazinuar në kartelën NëDalje.  Kontrollo mesazhin për "
-"gabime dhe rinise."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "File me script duhet të ekzistojë dhe duhet të jetë i ekzekutueshëm."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14380,19 +14310,19 @@ msgstr ""
 "shko tek editori i kartelave të kërkimit për t'a shtuar si duhet, nëse ka "
 "nevojë."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr ""
-"Ky mesazh nuk mund të dërgohet pasi profili me të cilin dëshironi ta dërgoni nuk "
-"është aktivuar"
+"Ky mesazh nuk mund të dërgohet pasi profili me të cilin dëshironi ta dërgoni "
+"nuk është aktivuar"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Ky mesazh nuk mund të dërgohet pasi nuk keni specifikuar asnjë marrës"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -14400,23 +14330,23 @@ msgstr ""
 "Ky server nuk suporton këtë lloj autentifikimi dhe ka mundësi të mos "
 "suportojë fare autentifikimet."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Firma është ndryshuar, por nuk është ruajtur."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
-"Të gjithë mesazhet tek kartela e zgjedhur dhe nën-kartelat e saj "
-"do të shënohen si të lexuar."
+"Të gjithë mesazhet tek kartela e zgjedhur dhe nën-kartelat e saj do të "
+"shënohen si të lexuar."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "E pamundur lidhja me serverin GroupWise."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -14424,39 +14354,39 @@ msgstr ""
 "E pamundur hapja e kartelës së kopjeve për këtë profil. Dëshironi të "
 "përdorni kartelën e kopjeve të sistemit?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "I pamundur leximi i file të liçencës."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Përdor të _Prezgjedhurin"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Përdor kartelën e prezgjedhur të kopjeve?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Nuk keni plotësuar të gjitha informacionet e kërkuara."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Keni akoma mesazhe të padërguar, dëshironi të dilni sidoqoftë?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Nuk mund të krijohen dy llogari me të njëjtin emër."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Duhet t'i jepni një emër kësaj Kartele kërkimi."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Ju duhet të përcaktoni një kartelë."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14466,27 +14396,23 @@ msgstr ""
 "Mund të zgjidhni kartelat një nga një, dhe/ose duke zgjedhurtë gjitha "
 "kartelat lokale, të gjitha kartelat remote, ose së bashku."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Futja në serverin tuaj &quot;{0}&quot; si &quot;{0}&quot; dështoi."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Mesazhi juaj me subjekt &quot;{0}&quot; nuk u dërgua."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Shto (në fund)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Anullo ndryshimet"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Pastro"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Hap mesazhet"
 
@@ -14557,7 +14483,7 @@ msgstr "%b %d %Y"
 msgid "Messages"
 msgstr "Mesazhet"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Duke krijuar listën e mesazheve"
 
@@ -14758,8 +14684,8 @@ msgid ""
 "lists."
 msgstr ""
 "Plotëson automatikisht rubrikën me emrat dhe adresat email kur i përgjigjeni "
-"mesazheve. Gjithashtu plotëson informacionet e kontaktit IM nga lista "
-"juaj buddy."
+"mesazheve. Gjithashtu plotëson informacionet e kontaktit IM nga lista juaj "
+"buddy."
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -14894,11 +14820,10 @@ msgid "Default Sources"
 msgstr "Burimet e prezgjedhur"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-#, fuzzy
 msgid ""
 "Provides functionallity for marking a calendar or addressbook as the default "
 "one."
-msgstr "Afron funksionet bazë për kalendarët e motit."
+msgstr "Afron funksionin për kthimin e një kalendari apo rubrike si të prezgjedhur."
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
 msgid "Open Other User's Folder"
@@ -15003,9 +14928,8 @@ msgid "Exchange Settings"
 msgstr "Rregullimet e Exchange"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:609
-#, fuzzy
 msgid "_OWA URL:"
-msgstr "Url _OWA:"
+msgstr "_OWA URL:"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
@@ -15019,13 +14943,15 @@ msgstr "Lloji i autentikimit"
 msgid "Ch_eck for Supported Types"
 msgstr "Kontrollo për lloj_et suportuar"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
-#, fuzzy
+#: ../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 "Evolution është në modaliteti Ti or tani tek modaliteti për veprimet."
+msgstr ""
+"Evolution ndodhet në modalitetin jashtë linje. Tani nuk mund të krijosh apo "
+"ndryshosh kartelat.\n"
+"Për të kryer këto lloj veprimesh, kalo në modalitetin në linjë."
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -15061,9 +14987,9 @@ msgstr ""
 "tuaj."
 
 #: ../plugins/exchange-operations/exchange-config-listener.c:662
-#, fuzzy, c-format
+#, c-format
 msgid "Your password will expire in the next %d days"
-msgstr "Fjalëkalimi juaj ka skaduar."
+msgstr "Fjalëkalimi juaj do të skadojë pas %d ditësh"
 
 #: ../plugins/exchange-operations/exchange-delegates-user.c:144
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
@@ -15202,37 +15128,33 @@ msgstr "Degëzimi i kartelës Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "Ç'regjistro kartelën..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Me të vërtetë ç'regjistrohesh nga kartela \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Ç'regjistrohu nga \"%s\""
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-#, fuzzy
 msgid "Password Expiry Warning..."
-msgstr "Paralajmërim në lidhje me skadimin e fjalëkalimit..."
+msgstr "Paralajmërim mbi skadimin e fjalëkalimit..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-#, fuzzy
 msgid "Your password will expire in 7 days..."
-msgstr "Fjalëkalimi juaj ka skaduar."
+msgstr "Fjalëkalimi juaj do të skadojë pas 7 ditësh..."
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-#, fuzzy
 msgid "_Change Password"
-msgstr "Ndrysho fjalëkalimin"
+msgstr "_Ndrysho fjalëkalimin"
 
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
-#, fuzzy
 msgid "ok_button"
-msgstr "Pulsant i kombinuar"
+msgstr "ok_button"
 
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
 msgid "(Permission denied.)"
@@ -15307,7 +15229,6 @@ msgid "Select User"
 msgstr "Zgjidh përdorues"
 
 #: ../plugins/exchange-operations/exchange-user-dialog.c:182
-#, fuzzy
 msgid "Address Book..."
 msgstr "Rubrika..."
 
@@ -15320,16 +15241,16 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Regjistro tek kalendari i përdoruesve të tjerë"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A plugin that handles a collection of Exchange account specific operations "
 "and features."
-msgstr "A a nga Exchange llogari veprimet dhe."
+msgstr ""
+"Një plugin që trajton veprime specifike dhe funksione të një koleksioni "
+"profilesh Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-#, fuzzy
 msgid "Exchange Operations"
-msgstr "Rregullimet e Exchange"
+msgstr "Veprimet e Exchange"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
 msgid "Cannot change password due to configuration problems."
@@ -15366,9 +15287,8 @@ msgstr ""
 "Kontrollo URL, fjalëkalimin, dhe riprovo përsëri."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
-#, fuzzy
 msgid "Could not connect to Exchange server."
-msgstr "E pamundur lidhja me serverin {0}."
+msgstr "E pamundur lidhja me serverin Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
 msgid "Could not connect to server {0}."
@@ -15415,7 +15335,6 @@ msgid "Exchange Account is offline."
 msgstr "Llogaria Exchange është jashtë linje."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-#, fuzzy
 msgid ""
 "Exchange Connector requires access to certain\n"
 "functionality on the Exchange Server that appears\n"
@@ -15440,8 +15359,7 @@ msgstr ""
 "Informacionet që duhet t'i jepni administratorit tuaj të Exchange \n"
 "mund t'i merrni duke ndjekur lidhjen në vazhdim:\n"
 "\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
 "  "
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
@@ -15532,7 +15450,6 @@ msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "Serveri Exchange nuk është kompatibël me Exchange Connector."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-#, fuzzy
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15584,7 +15501,6 @@ msgid "Unsupported operation"
 msgstr "Veprim i pasuportuar"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-#, fuzzy
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr ""
 "Je duke ju afruar kufirit të quotës në dispozicion për magazinimin e "
@@ -15595,7 +15511,6 @@ msgid "You cannot make yourself your own delegate"
 msgstr "Nuk mund të delegoni vetveten"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-#, fuzzy
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "Ke tejkaluar kufirit të quotës për magazinimin e mesazheve në këtë server."
 
@@ -15604,31 +15519,28 @@ msgid "You may only configure a single Exchange account."
 msgstr "Mund të konfigurosh një llogari të vetme Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Liro pak hapsirë duke fshirë disa nga "
-"mesazhet e vjetër."
+"Përdorimi aktual është : {0} KB. Liro pak hapësirë duke fshirë disa prej "
+"mesazheve."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Nuk do të jesh më në gjendje të dërgosh apo "
+"Përdorimi aktual është : {0} KB. Nuk do të jesh më në gjendje të dërgosh apo "
 "marrësh mesazhe tani."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-#, fuzzy
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr ""
-"Përdorimi aktual është : {0}KB. Nuk do të jesh në gjendje të dërgosh mesazhe "
-"po nuk lirove pak hapsirë duke fshirë disa mesazhe të vjetër."
+"Përdorimi aktual është : {0} KB. Nuk do të jesh në gjendje të dërgosh "
+"mesazhe po nuk lirove pak hapësirë duke fshirë disa mesazhe të vjetër."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -15669,7 +15581,7 @@ msgstr ""
 msgid "Unsubscribe Folders"
 msgstr "Ç'regjistro kartelat"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Lista zgjedhjes"
 
@@ -15679,20 +15591,19 @@ msgstr "Rregullimi i llogarisë Groupware"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "Përcaktimi i refuzimeve"
+msgstr "Rregullimet e të padëshiruarve"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>Rregullimet e mesazheve për t'u refuzuar</b>"
+msgstr "<b>Rregullimet e mesazheve të padëshiruar</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "Rregullimet e mesazheve për t'u refuzuar..."
+msgstr "Rregullimet e mesazheve të padëshiruar..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
-#, fuzzy
 msgid "<b>Junk List:</b>"
-msgstr "<b>Lista e refuzimeve:</b>"
+msgstr "<b>Lista e të padëshiruarve:</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
@@ -15700,7 +15611,7 @@ msgstr "Email:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "Rregullimet e mesazheve për refuzim"
+msgstr "Rregullimet e mesazheve të padëshiruar"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -15713,7 +15624,7 @@ msgstr "_Aktivo"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "_Lista e refuzimit"
+msgstr "_Lista e të padëshiruarve"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
@@ -15738,9 +15649,8 @@ msgid "Accept Tentatively"
 msgstr "Prano duke e konsideruar si provë"
 
 #: ../plugins/groupwise-features/properties.glade.h:2
-#, fuzzy
 msgid "<b>Users:</b>"
-msgstr "<b>Përdoruesit :</b>"
+msgstr "<b>Përdoruesit:</b>"
 
 #: ../plugins/groupwise-features/properties.glade.h:4
 #: ../widgets/table/e-table-click-to-add.c:509
@@ -15760,7 +15670,6 @@ msgid "_Contacts..."
 msgstr "_Kontakte..."
 
 #: ../plugins/groupwise-features/properties.glade.h:12
-#, fuzzy
 msgid "_Customize notification message"
 msgstr "_Personalizo mesazhin e njoftimit"
 
@@ -15846,9 +15755,8 @@ msgid "_Proxy Login..."
 msgstr "Identifikimi në _Proxy..."
 
 #: ../plugins/groupwise-features/proxy.c:697
-#, fuzzy
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "Skeda e Proxy do të jetë e dukshme vetëm kur të aktivohet llogaria."
+msgstr "Skeda e Proxy do të jetë në dispozicion vetëm kur profili të jetë në linjë."
 
 #: ../plugins/groupwise-features/proxy.c:702
 msgid "The Proxy tab will be available only when the account is enabled."
@@ -15875,39 +15783,32 @@ msgid "Track Message Status..."
 msgstr "Ndiq gjendjen e mesazheve..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin to setup hula calendar sources."
-msgstr "A tek kalendari burimet."
+msgstr "Një plugin për të rregulluar burimet e kalendarit hula."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-#, fuzzy
 msgid "Hula Account Setup"
-msgstr "Rregullimi i llogarisë Groupware"
+msgstr "Rregullimi i profilit Hula"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:83
-#, fuzzy
 msgid "_Import to Calendar"
-msgstr "Kalendari mujor"
+msgstr "_Importo në kalendar"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:88
-#, fuzzy
 msgid "_Import to Tasks"
-msgstr "Ktheje në akti_vitet"
+msgstr "_Importo tek aktivitetet"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:198
-#, fuzzy
 msgid "Import ICS"
-msgstr "Importo"
+msgstr "Importo ICS"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:226
-#, fuzzy
 msgid "Select Task List"
-msgstr "Listë e Re Aktivitetesh"
+msgstr "Zgjidh listën e aktiviteteve"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:230
-#, fuzzy
 msgid "Select Calendar"
-msgstr "Kalendar i Ri"
+msgstr "Zgjidh kalendarin"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
 #: ../shell/e-shell-importer.c:703
@@ -15920,102 +15821,90 @@ msgid "iCalendar format (.ics)"
 msgstr "Format iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-#, fuzzy
 msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "Sinkronizimi zgjedhur kalendari me"
+msgstr "Sinkronizon aktivitetin/kalendarin/rubrikën e zgjedhur me Apple iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-#, fuzzy
 msgid "Synchronize to iPod"
-msgstr "Opsionet e _sinkronizimit..."
+msgstr "Sinkronizo me iPod"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-#, fuzzy
 msgid "iPod Synchronization"
-msgstr "Opsionet e _sinkronizimit..."
+msgstr "Sinkronizimi i iPod"
 
 #: ../plugins/ipod-sync/sync.c:158
-#, fuzzy
 msgid "No output directory!"
-msgstr "Rikthe kartelën e Evolution"
+msgstr "Asnjë directory output!"
 
 #: ../plugins/ipod-sync/sync.c:159
-#, fuzzy
 msgid ""
 "The output directory was not found on iPod! Please ensure that iPod has been "
 "correctly set up and try again."
-msgstr "nuk në sipër dhe."
+msgstr ""
+"Directory e daljes nuk u gjet në iPod! Sigurohu që iPod është konfiguruar si "
+"duhet dhe provo përsëri."
 
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-#, fuzzy
 msgid "Could not export data!"
-msgstr "I pamundur shkrimi i të dhënave: %s"
+msgstr "I pamundur eksportimi i të dhënave!"
 
 #: ../plugins/ipod-sync/sync.c:203
-#, fuzzy
 msgid "Exporting data failed."
-msgstr "Duke importuar të dhënat."
+msgstr "Eksportimi i të dhënve dështoi."
 
 #: ../plugins/ipod-sync/sync.c:231
-#, fuzzy
 msgid "Could not open addressbook!"
-msgstr "I pamundur ngarkimi i librit të adresave"
+msgstr "E pamundur hapja e rubrikës!"
 
 #: ../plugins/ipod-sync/sync.c:232
-#, fuzzy
 msgid "Could not open the Evolution addressbook to export data."
-msgstr "Rubrika e Evolution përfundoi në menyrë të papritur."
+msgstr "E pamundur hapja e rubrikës së Evolution për të eksportuar të dhënat."
 
 #: ../plugins/ipod-sync/sync.c:291
-#, fuzzy
 msgid "Could not open calendar/todo!"
-msgstr "E pamundur hapja e objektivit"
+msgstr "E pamundur hapja e kalendarit/listës me gjërat për tu bërë!"
 
 #: ../plugins/ipod-sync/sync.c:292
-#, fuzzy
 msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "nuk hap Evolution kalendari lista tek."
+msgstr ""
+"E pamundur hapja e kalendarit/listës me gjërat për tu bërë për të eksportuar "
+"të dhënat."
 
 #: ../plugins/itip-formatter/itip-formatter.c:275
 #: ../plugins/itip-formatter/itip-formatter.c:392
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load the calendar '%s'"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "E pamundur hapja e kalendarit '%s'"
 
 #: ../plugins/itip-formatter/itip-formatter.c:407
-#, fuzzy, c-format
+#, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
-msgstr "E pamundur hapja e kalendarit '%s' për të krijuar ngjarje dhe takime"
+msgstr "Një takim tek kalendari '%s' është në konflikt me këtë mbledhje"
 
 #: ../plugins/itip-formatter/itip-formatter.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "Takimi u gjet tek kalendari '%s'"
 
 #: ../plugins/itip-formatter/itip-formatter.c:488
-#, fuzzy
 msgid "Unable to find any calendars"
-msgstr "I pamundur migrimi i kalendarit `%s'"
+msgstr "Nuk u gjet asnjë kalendar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:495
-#, fuzzy
 msgid "Unable to find this meeting in any calendar"
-msgstr "E pamundur hapja e kalendarit '%s'."
+msgstr "E pamundur gjetja e mbledhjes në asnjë kalendar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:499
-#, fuzzy
 msgid "Unable to find this task in any task list"
-msgstr "I pamundur shtimi i përdoruesit tek lista e kontrollit të hyrjeve:"
+msgstr "E pamundur gjetja e këtij aktiviteti në asnjë listë aktivitetesh"
 
 #: ../plugins/itip-formatter/itip-formatter.c:503
-#, fuzzy
 msgid "Unable to find this journal entry in any journal"
-msgstr "tek gjej zë në"
+msgstr "E pamundur gjetja e këtij zë ditari në asnjë ditar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:529
-#, fuzzy
 msgid "Searching for an existing version of this appointment"
-msgstr "Duke kërkuar për versioni nga"
+msgstr "Duke kërkuar për një version ekzistues të këtij takimi"
 
 #: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
@@ -16042,9 +15931,9 @@ msgid "Sent to calendar '%s' as declined"
 msgstr "Dërguar kalendarit «%s» si e papranuar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "Dërguar kalendarit «%s» si e anulluar"
+msgstr "Dërguar kalendarit '%s' si e anulluar"
 
 #: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
@@ -16052,14 +15941,12 @@ msgid "Organizer has removed the delegate %s "
 msgstr "Organizuesi ka fshirë delegatin %s "
 
 #: ../plugins/itip-formatter/itip-formatter.c:907
-#, fuzzy
 msgid "Sent a cancelation notice to the delegate"
-msgstr "Dërgoi delegatit një njoftim fshirje"
+msgstr "Dërgoi delegatit një njoftim anullimi"
 
 #: ../plugins/itip-formatter/itip-formatter.c:909
-#, fuzzy
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "I pamundur dërgimi i njoftimit të fshirjes delegatit"
+msgstr "I pamundur dërgimi i njoftimit të anullimit delegatit"
 
 #: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
@@ -16081,13 +15968,12 @@ msgid "The calendar attached is not valid"
 msgstr "Kalendari i bashkangjitur nuk është i vlefshëm"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1153
-#, fuzzy
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
-"Mesazhi përmban një kalendar, por kalendari nuk është një iCalendar i "
-"vlefshëm."
+"Mesazhi reklamon praninë e një kalendari, por kalendari nuk është një "
+"iCalendar i vlefshëm."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1187
 #: ../plugins/itip-formatter/itip-formatter.c:1202
@@ -16125,9 +16011,8 @@ msgstr "_Elemino mesazhin mbas aksionit"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2004
 #: ../plugins/itip-formatter/itip-formatter.c:2036
-#, fuzzy
 msgid "Conflict Search"
-msgstr "Tabela e kërkimit të konflikteve"
+msgstr "Kërkimi i konflikteve"
 
 #. Source selector
 #: ../plugins/itip-formatter/itip-formatter.c:2019
@@ -16327,12 +16212,12 @@ msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> ka dërguar mbrapsht përgjigjen në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
-msgstr "<b>%s</b> nëpërmjet %s ka anulluar mbledhjen në vazhdim:"
+msgstr "<b>%s</b> me anë të %s ka anulluar mbledhjen në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> ka anulluar mbledhjen në vazhdim."
 
@@ -16401,12 +16286,12 @@ msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> ka dërguar përgjigjen në vazhdim mbi detyrën e shënuar:"
 
 #: ../plugins/itip-formatter/itip-view.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> me anë të %s ka anulluar detyrën e shënuar në vazhdim:"
 
 #: ../plugins/itip-formatter/itip-view.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> ka anulluar detyrën e shënuar në vazhdim:"
 
@@ -16427,9 +16312,8 @@ msgstr "<b>%s</b> nuk ka pranuar detyrën e shënuar në vazhdim:"
 
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:705
-#, fuzzy
 msgid "_Open Calendar"
-msgstr "Duke hapur kalendarin"
+msgstr "_Hap kalendarin"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:710
@@ -16437,57 +16321,48 @@ msgstr "Duke hapur kalendarin"
 #: ../plugins/itip-formatter/itip-view.c:720
 #: ../plugins/itip-formatter/itip-view.c:736
 #: ../plugins/itip-formatter/itip-view.c:741
-#, fuzzy
 msgid "_Accept"
-msgstr "Prano"
+msgstr "_Prano"
 
 #: ../plugins/itip-formatter/itip-view.c:713
-#, fuzzy
 msgid "_Decline all"
-msgstr "_Elemino gjithçka"
+msgstr "_Refuzoi të gjithë"
 
 #: ../plugins/itip-formatter/itip-view.c:713
 #: ../plugins/itip-formatter/itip-view.c:718
 #: ../plugins/itip-formatter/itip-view.c:734
 #: ../plugins/itip-formatter/itip-view.c:739
-#, fuzzy
 msgid "_Decline"
-msgstr "Refuzo"
+msgstr "_Refuzo"
 
 #: ../plugins/itip-formatter/itip-view.c:714
-#, fuzzy
 msgid "_Tentative all"
-msgstr "Përpjekje"
+msgstr "_Provoi të gjithë"
 
 #: ../plugins/itip-formatter/itip-view.c:714
 #: ../plugins/itip-formatter/itip-view.c:719
 #: ../plugins/itip-formatter/itip-view.c:735
 #: ../plugins/itip-formatter/itip-view.c:740
-#, fuzzy
 msgid "_Tentative"
-msgstr "Përpjekje"
+msgstr "_Provo"
 
 #: ../plugins/itip-formatter/itip-view.c:715
-#, fuzzy
 msgid "_Accept all"
-msgstr "Prano"
+msgstr "_Prano të gjithë"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:724
-#, fuzzy
 msgid "_Send Information"
-msgstr "Informacione mbi serverin"
+msgstr "_Dërgo informacionet"
 
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:728
-#, fuzzy
 msgid "_Update Attendee Status"
-msgstr "Rifresko gjendjen e përgjigjes"
+msgstr "_Rifresko gjëndjen e pjesmarrësve"
 
 #: ../plugins/itip-formatter/itip-view.c:731
-#, fuzzy
 msgid "_Update"
-msgstr "Rifresko"
+msgstr "_Rifresko"
 
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:888
@@ -16613,9 +16488,8 @@ msgid "Mail to task"
 msgstr "Mail në aktivitet"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-#, fuzzy
 msgid "Convert the selected message to a new task"
-msgstr "Hape mesazhin e zgjedhur në një dritare të re"
+msgstr "Konverton mesazhin e zgjedhur në një aktivitet të ri"
 
 #: ../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
@@ -16767,19 +16641,16 @@ msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "Ç'regjistrohu nga mailing list tek e cila bën pjesë ky mesazh"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
-#, fuzzy
 msgid "Mark All Read"
-msgstr "Shë_no si të Lexuar"
+msgstr "Shënoi të gjithë si të lexuar"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-#, fuzzy
 msgid "Mark me_ssages as read"
 msgstr "Shëno me_sazhet si të lexuar"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-#, fuzzy
 msgid "Used for marking all the messages under a folder as read"
-msgstr "Në përdorim për gjithçka mesazhe a kartelë"
+msgstr "Përdoret për të shënuar si të lexuar të gjithë mesazhet e një kartele"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
@@ -16832,9 +16703,8 @@ msgid "Enable and disable plugins"
 msgstr "Aktivo dhe ç'aktivo plugins"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-#, fuzzy
 msgid "_Plugins"
-msgstr "Shtojca"
+msgstr "_Shtojca"
 
 #: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
@@ -16856,7 +16726,6 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "A test plugin which demonstrates a formatter plugin which lets you choose to "
 "disable HTML messages.\n"
@@ -16864,7 +16733,7 @@ msgid ""
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
 "Një shtojcë prove që demostron një plugin formatues që ju jep mundësinë e "
-"zgjedhjes së ç'aktivimit të mesazheve HTML.\n"
+"zgjedhjes së çaktivimit të mesazheve HTML.\n"
 "\n"
 "Kjo shtojcë është vetëm për të kryer prova.\n"
 
@@ -16909,74 +16778,64 @@ msgid "Prints the message"
 msgstr "Printon mesazhin"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
-#, fuzzy
 msgid "Evolution Profiler"
-msgstr "Gabim i Evolution"
+msgstr "Profiluesi i Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-#, fuzzy
 msgid "Writes a log of profiling data events."
-msgstr "a log nga."
+msgstr "Regjistron një log profilimi të eventeve."
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#, fuzzy
 msgid "Allows calendars to be published to the web"
-msgstr "tek publikuar tek"
+msgstr "Lejo publikimin e kalendarëve në web"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
-#, fuzzy
 msgid "Calendar Publishing"
-msgstr "Kalendarët"
+msgstr "Publikimi i kalendarëve"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "Locations"
-msgstr "Vendodhja"
+msgstr "Pozicionet"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-#, fuzzy
 msgid "_Publish Calendar Information"
-msgstr "Informacione iCalendar"
+msgstr "_Publiko informacionet e kalendarit"
 
-#: ../plugins/publish-calendar/publish-calendar.c:386
+#: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "Jeni i sigurt që dëshiron të eleminosh këtë URL?"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
-#, fuzzy
 msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">Opsione</span>"
+msgstr "<span weight=\"bold\">Pozicioni/span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
-#, fuzzy
 msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">Gjendja</span>"
+msgstr "<span weight=\"bold\">Burimet</span>"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:6
-#, fuzzy
 msgid ""
 "Daily\n"
 "Weekly\n"
 "Manual (via Actions menu)"
-msgstr "Veprimet menuja"
+msgstr ""
+"Ditor\n"
+"Javor\n"
+"Manualisht (me anë të menusë së veprimeve)"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Porta:"
+msgstr "P_orta:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:11
-#, fuzzy
 msgid "Publishing Location"
-msgstr "<b>_Vendi për publikimin</b>"
+msgstr "Vendi për publikimin"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:12
-#, fuzzy
 msgid "Publishing _Frequency:"
-msgstr "<b>Frekuenca e publikimit</b>"
+msgstr "_Frekuenca e publikimit:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:13
-#, fuzzy
 msgid ""
 "SSH\n"
 "Public FTP\n"
@@ -16985,45 +16844,50 @@ msgid ""
 "WebDAV (HTTP)\n"
 "Secure WebDAV (HTTPS)\n"
 "Custom Location"
-msgstr "SSH FTP me identifikimi HTTP Vendodhja"
+msgstr ""
+"SSH\n"
+"Public FTP\n"
+"FTP (me identifikim)\n"
+"Të përbashkëta Windows\n"
+"WebDAV (HTTP)\n"
+"WebDAV i sigurt (HTTPS)\n"
+"Vendodhje e personalizuar"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#, fuzzy
 msgid "Service _type:"
-msgstr "_Lloji i serverit: "
+msgstr "Lloji i shërbimit_t:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:22
-#, fuzzy
 msgid "_File:"
-msgstr "_File"
+msgstr "_File:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
-#, fuzzy
 msgid "_Publish as:"
-msgstr "Tabela e Publikimit"
+msgstr "_Publiko si:"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#, fuzzy
 msgid ""
 "iCal\n"
 "Free/Busy"
-msgstr "I lirë/zënë"
+msgstr ""
+"iCal\n"
+"I lirë/Zënë"
 
 #: ../plugins/sa-junk-plugin/em-junk-filter.c:101
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-#, fuzzy
 msgid ""
 "Filters junk messages using Spamassassin. This plugin requires Spamassassin "
 "to be installed."
-msgstr "Filtrat mesazhe tek instaluar."
+msgstr ""
+"Filtron mesazhet e padëhiruar duke përdorur Spamassassin. Ky plugin kërkon "
+"instalimin e Spamassassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-#, fuzzy
 msgid "Spamassassin junk plugin"
-msgstr "Spamassassin (built-in)"
+msgstr "Plugin për të padëshiruarit i Spamassassin"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17102,9 +16966,8 @@ msgid "percent Done"
 msgstr "përqindja e plotësuar"
 
 #: ../plugins/save-calendar/csv-format.c:398
-#, fuzzy
 msgid "URL"
-msgstr "_URL:"
+msgstr "URL"
 
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
@@ -17147,9 +17010,8 @@ msgid "Saves selected calendar or tasks list to disk."
 msgstr "Ruan kalendarin e zgjedhur apo listën e veprimtarive në disk."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-#, fuzzy
 msgid "_Save to Disk"
-msgstr "Ruaj në _Disk"
+msgstr "_Ruaj në Disk"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -17178,19 +17040,16 @@ msgid "Selects a single calendar or task source for viewing."
 msgstr "Zgjedh një kalendar të vetëm apo burim veprimtarie për të shfaqur."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-#, fuzzy
 msgid "Show _only this Calendar"
-msgstr "_Shfaq vetëm këtë Kalendar"
+msgstr "Shfaq +vetëm këtë Kalendar"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-#, fuzzy
 msgid "Show _only this Task List"
-msgstr "_Shfaq vetëm këtë listë aktivitetesh"
+msgstr "Shfaq _vetëm këtë listë aktivitetesh"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-#, fuzzy
 msgid "A plugin that handles the Startup wizard."
-msgstr "A."
+msgstr "Një plugin që merret me proçedurën e nisjes."
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
 msgid "Startup wizard"
@@ -17305,24 +17164,24 @@ msgid "Printer settings"
 msgstr "Rregullimet e printerit"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
-#, fuzzy
 msgid "Sidebar is visible"
-msgstr "Paneli i instrumentëve është i dukshëm"
+msgstr "Paneli anësor është i dukshëm"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "Kapërce dialogun e paralajmërimit të versionit në zhvillim"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Fillo në modalitetin jashtë linje"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr "Versioni i konfigurimit të Evolution, me nivelet major/minor/konfigurim"
+msgstr ""
+"Versioni i konfigurimit të Evolution, me nivelet e konfigurimit major/minor/ "
+"(për shembull \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
@@ -17337,13 +17196,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Gjerësia e prezgjedhur e kuadratit anësor, në pixel."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-#, fuzzy
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr ""
-"Versioni i fundit i përditsuar i konfigurimit të Evolution, me nivelet major/"
-"minor/konfigurim"
+"Versioni i fundit i përditsuar i konfigurimit të Evolution, me nivelet e "
+"konfigurimit major/minor/ (për shembull \"2.6.0\")."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
@@ -17366,9 +17224,8 @@ msgstr ""
 "modalitetit në linjë."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
 msgid "Whether the sidebar should be visible."
-msgstr "Nëse paneli i instrumentëve duhet të jetë i dukshëm."
+msgstr "Nëse paneli anësor duhet të jetë i dukshëm."
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
@@ -17464,9 +17321,8 @@ msgid "Import a _single file"
 msgstr "Importo një file të _vetëm"
 
 #: ../shell/e-shell-settings-dialog.c:318
-#, fuzzy
 msgid "Evolution Preferences"
-msgstr "Kontrolli i preferimeve të postës së Evolution"
+msgstr "Prefrimet e Evolution"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17508,35 +17364,37 @@ msgstr "Bug buddy nuk mund të vihet në funksionim."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr "Laurent Dhima <laurenti@alblinux.net>"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
-msgstr "_Puno online"
+msgstr "_Puno në linjë"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "_Puno Jashtë Linje"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
-msgstr "Puno online"
+msgstr "Puno në linjë"
 
 #: ../shell/e-shell-window.c:368
-#, fuzzy
 msgid "Evolution is currently online. Click on this button to work offline."
-msgstr "Evolution aktualisht është online.  Kliko tek ky buton për të punuar offline."
+msgstr ""
+"Evolution aktualisht është në linjë.  Kliko tek ky buton për të punuar "
+"jashtë linje."
 
 #: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
-msgstr "Evolution është në procesin e daljes offline."
+msgstr "Evolution është në procesin e daljes jashtë linje."
 
 #: ../shell/e-shell-window.c:383
-#, fuzzy
 msgid "Evolution is currently offline. Click on this button to work online."
-msgstr "Evolution aktualisht është offline.  Kliko tek ky buton për të punuar online."
+msgstr ""
+"Evolution aktualisht është jashtë linje.  Kliko tek ky buton për të punuar "
+"në linjë."
 
 #: ../shell/e-shell-window.c:783
 #, c-format
@@ -17623,8 +17481,8 @@ msgstr ""
 "të files së jashtëm nën Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
-#, fuzzy, no-c-format
+#: ../shell/main.c:231
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17649,19 +17507,18 @@ msgstr ""
 "përfundimit, por disa nga karakteristikat janë akoma të paplota\n"
 "apo nuk funksionojnë si duhet.\n"
 "\n"
-"Nëse dëshironi një version stabël të Evolution, do t'ju duhet të "
-"ç'instaloni\n"
+"Nëse dëshironi një version stabël të Evolution, do t'ju duhet të çinstaloni\n"
 "këtë version dhe të instaloni versionin %s në vend të tij.\n"
 "\n"
-"Nëse ndeshni në difekte, jeni të lutur t'i raportoni tek bugzilla.ximian."
-"com.\n"
+"Nëse ndeshni në difekte, jeni të lutur t'i raportoni tek bugzilla.gnome."
+"org.\n"
 "Ky version vjen pa garanci dhe nuk është menduar për\n"
 "persona që nxehen shpejt.\n"
 "\n"
 "Shpresojmë t'ju pëlqejë rezultati i punës sonë të vështirë, dhe\n"
 "ne presim me dëshirë kontributin tuaj!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17669,36 +17526,35 @@ msgstr ""
 "Ju faleminderit\n"
 "The Evolution Team\n"
 
-#: ../shell/main.c:261
-#, fuzzy
+#: ../shell/main.c:262
 msgid "Do not tell me again"
-msgstr "Mos e shfaq më"
+msgstr "Mos ma përsërit më"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Fillo Evolution duke aktivuar komponentin e specifikuar"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Fillo në modalitetin në linjë"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Detyro përfundimin e të gjithë komponentëve të Evolution"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Detyro ri-emigrimin nga Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Dërgo rezultatin e debug të të gjithë komponuesve në një file."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Ç'aktivo ngarkimin e çfarëdo plugin."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17724,7 +17580,6 @@ msgid "Evolution can not start."
 msgstr "E pamundur nisja e Evolution."
 
 #: ../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."
@@ -17741,7 +17596,6 @@ msgid "Really delete old data?"
 msgstr "Me të vërtetë eleminon të dhënat e vjetra?"
 
 #: ../shell/shell.error.xml.h:9
-#, fuzzy
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -17764,7 +17618,6 @@ msgstr ""
 "mëparshëm të Evolution pa ndërhyrë manualisht.\n"
 
 #: ../shell/shell.error.xml.h:15
-#, fuzzy
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
@@ -17786,7 +17639,6 @@ msgid "Upgrade from previous version failed: {0}"
 msgstr "Përditësimi nga versioni i kaluar dështoi: {0}"
 
 #: ../shell/shell.error.xml.h:20
-#, fuzzy
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -18352,33 +18204,28 @@ msgid "Shutting down %s (%s)\n"
 msgstr "Duke mbyllur %s (%s)\n"
 
 #: ../ui/evolution-addressbook.xml.h:1
-#, fuzzy
 msgid "Address _Book Properties"
-msgstr "Pronësitë e Rubrikës"
+msgstr "Pronësitë e Ru_brikës"
 
 #: ../ui/evolution-addressbook.xml.h:3
-#, fuzzy
 msgid "Change the properties of the selected folder"
-msgstr "Ndrysho pronësitë e kësaj kartele"
+msgstr "Ndrysho pronësitë e kartelës së zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:4
-#, fuzzy
 msgid "Co_py All Contacts To..."
-msgstr "Kopjo kontaktet tek"
+msgstr "Ko_pjo të gjithë kontaktet tek..."
 
 #: ../ui/evolution-addressbook.xml.h:5
-#, fuzzy
 msgid "Contact _Preview"
-msgstr "Prova e printimit të kontakteve"
+msgstr "_Pamja e parë e kontaktit"
 
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "Kopjo kontaktet e zgjedhuar tek një kartelë tjetër..."
 
 #: ../ui/evolution-addressbook.xml.h:8
-#, fuzzy
 msgid "Copy the contacts of the selected folder into another folder"
-msgstr "Kopjo mesazhet e zgjedhur në një kartelë tjetër"
+msgstr "Kopjo kontaktet e kartelës së zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
@@ -18389,9 +18236,8 @@ msgid "Copy to Folder..."
 msgstr "Kopjo tek kartela..."
 
 #: ../ui/evolution-addressbook.xml.h:11
-#, fuzzy
 msgid "Create a new addressbook folder"
-msgstr "Krijo një rubrikë të re"
+msgstr "Krijo një kartelë të re rubrike"
 
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
@@ -18404,36 +18250,32 @@ msgid "Cut the selection"
 msgstr "Preje pjesën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:14
-#, fuzzy
 msgid "Del_ete Address Book"
-msgstr "Rubrikë e Re"
+msgstr "El_emino rubrikën"
 
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "Fshi kontaktet e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:17
-#, fuzzy
 msgid "Delete the selected folder"
-msgstr "Anullo fshirjen e mesazheve të zgjedhur"
+msgstr "Elemino kartelën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "Përcill kontaktin"
 
 #: ../ui/evolution-addressbook.xml.h:19
-#, fuzzy
 msgid "Mo_ve All Contacts To..."
-msgstr "Lëviz kontaktet tek"
+msgstr "Lë_viz të gjithë kontaktet tek..."
 
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "Lëviz kontaktet e zgjedhura tek një kartelë tjetër..."
 
 #: ../ui/evolution-addressbook.xml.h:21
-#, fuzzy
 msgid "Move the contacts of the selected folder into another folder"
-msgstr "Lëviz kartelën e zgjedhur nën një kartelë tjetër"
+msgstr "Lëviz kontaktet e kartelës së zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
@@ -18458,23 +18300,20 @@ msgid "Print selected contacts"
 msgstr "Printo kontaktet e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:29
-#, fuzzy
 msgid "Rename the selected folder"
-msgstr "Riemërto kartelën \"%s\" në:"
+msgstr "Riemërto kartelën e zgjedhur"
 
 #: ../ui/evolution-addressbook.xml.h:30
-#, fuzzy
 msgid "S_ave Address Book As VCard"
-msgstr "Rubrikë e Re"
+msgstr "Ru_aj rubrikën si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "Ruaj kontaktet e zgjedhur si një VCard."
 
 #: ../ui/evolution-addressbook.xml.h:33
-#, fuzzy
 msgid "Save the contacts of the selected folder as VCard"
-msgstr "Ruaj kontaktet e zgjedhur si një VCard."
+msgstr "Ruaj kontaktet e kartelës së zgjedhur si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
@@ -18507,9 +18346,8 @@ msgid "Show contact preview window"
 msgstr "Shfaq dritaren e pamjes së parë të kontaktit"
 
 #: ../ui/evolution-addressbook.xml.h:41
-#, fuzzy
 msgid "St_op"
-msgstr "Ndal"
+msgstr "Ndal_o"
 
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
@@ -18529,52 +18367,44 @@ msgid "_Actions"
 msgstr "_Veprimet"
 
 #: ../ui/evolution-addressbook.xml.h:47
-#, fuzzy
 msgid "_Copy Contact to..."
-msgstr "Kopjo kontaktin tek"
+msgstr "_Kopjo kontaktin tek..."
 
 #: ../ui/evolution-addressbook.xml.h:48
-#, fuzzy
 msgid "_Copy Folder Contacts To"
-msgstr "_Kopjo kartelën tek..."
+msgstr "_Kopjo kartelën e kontakteve tek..."
 
 #: ../ui/evolution-addressbook.xml.h:50
-#, fuzzy
 msgid "_Delete Contact"
-msgstr "_Kontakt"
+msgstr "_Elemino kontaktin"
 
 #: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "_Përcill kontaktin..."
 
 #: ../ui/evolution-addressbook.xml.h:53
-#, fuzzy
 msgid "_Move Contact to..."
-msgstr "Lëvize kontaktin tek"
+msgstr "_Lëvize kontaktin tek..."
 
 #: ../ui/evolution-addressbook.xml.h:54
-#, fuzzy
 msgid "_Move Folder Contacts To"
-msgstr "_Lëviz kartelën tek..."
+msgstr "_Lëviz kartelën e kontakteve tek"
 
 #: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
 msgid "_New"
 msgstr "_E re"
 
 #: ../ui/evolution-addressbook.xml.h:60
-#, fuzzy
 msgid "_Rename"
-msgstr "_Riemërto..."
+msgstr "_Riemërto"
 
 #: ../ui/evolution-addressbook.xml.h:61
-#, fuzzy
 msgid "_Save Contact as VCard..."
-msgstr "_Ruaje si VCard..."
+msgstr "_Ruaj kontaktin si VCard..."
 
 #: ../ui/evolution-addressbook.xml.h:62
-#, fuzzy
 msgid "_Save Folder Contacts As VCard"
-msgstr "Ruaj kontaktet e zgjedhur si një VCard."
+msgstr "_Ruaj kartelën e kontakteve si VCard"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
@@ -18585,12 +18415,10 @@ msgid "Day"
 msgstr "Dita"
 
 #: ../ui/evolution-calendar.xml.h:6
-#, fuzzy
 msgid "Delete _all Occurrences"
-msgstr "Elemino të _gjitha përkujtimoret"
+msgstr "Elemino të gjith_a përkujtimoret"
 
 #: ../ui/evolution-calendar.xml.h:7
-#, fuzzy
 msgid "Delete all occurrences"
 msgstr "Elemino të gjithë përvjetorët"
 
@@ -18599,7 +18427,6 @@ msgid "Delete the appointment"
 msgstr "Elemino takimin"
 
 #: ../ui/evolution-calendar.xml.h:10
-#, fuzzy
 msgid "Delete this occurrence"
 msgstr "Elemino këtë përvjetor"
 
@@ -18705,7 +18532,6 @@ msgid "Copy selected text to the clipboard"
 msgstr "Kopjo tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:3
-#, fuzzy
 msgid "Copy selection to clipboard"
 msgstr "Kopjo tekstin e zgjedhur tek Shënimet"
 
@@ -18714,12 +18540,10 @@ msgid "Cut selected text to the clipboard"
 msgstr "Preje tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:7
-#, fuzzy
 msgid "Cut selection to clipboard"
 msgstr "Preje tekstin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-composer-entries.xml.h:9
-#, fuzzy
 msgid "Paste from clipboard"
 msgstr "Ngjit nga shënimet"
 
@@ -18736,24 +18560,20 @@ msgid "Attach"
 msgstr "Bashkangjit"
 
 #: ../ui/evolution-editor.xml.h:2
-#, fuzzy
 msgid "Click here to attach a file"
-msgstr "<kliko këtu për të zgjedhur një kartelë>"
+msgstr "Kliko këtu për të bashkangjitur një file"
 
 #: ../ui/evolution-editor.xml.h:3
-#, fuzzy
 msgid "Click here to close the current window"
-msgstr "Mbylle file aktual"
+msgstr "Kliko këtu për të mbyllur dritaren aktuale"
 
 #: ../ui/evolution-editor.xml.h:4
-#, fuzzy
 msgid "Click here to save the current window"
-msgstr "Mbylle file aktual"
+msgstr "Kliko këtu për të ruajtur dritaren aktuale"
 
 #: ../ui/evolution-editor.xml.h:5
-#, fuzzy
 msgid "Click here to view help available"
-msgstr "<kliko këtu për të zgjedhur një datë>"
+msgstr "Kliko këtu për të shfaqur ndihmën në dispozicion"
 
 #.
 #. <cmd name="FileSave" _label="Save"
@@ -18791,166 +18611,136 @@ msgid "_Insert"
 msgstr "_Ndërfut"
 
 #: ../ui/evolution-editor.xml.h:21
-#, fuzzy
 msgid "_Options"
-msgstr "Mundësitë"
+msgstr "_Opsionet"
 
 #: ../ui/evolution-event-editor.xml.h:2
-#, fuzzy
 msgid "All Day Event"
-msgstr "_Ngjarje të ditës"
+msgstr "Ngjarje e përditshme"
 
 #: ../ui/evolution-event-editor.xml.h:3
-#, fuzzy
 msgid "All _Day Event"
-msgstr "_Ngjarje të ditës"
+msgstr "Ngjarje e për_Ditshme"
 
 #: ../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 "Në konfidencë"
+msgstr "Klasifiko si në konfidencë"
 
 #: ../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 "Privat"
+msgstr "Klasifiko si privat"
 
 #: ../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 ""
+msgstr "Klasifiko si publik"
 
 #: ../ui/evolution-event-editor.xml.h:7
-#, fuzzy
 msgid "Click here to set or unset alarms for this event"
-msgstr "Kliko këtu për të zgjedhur kartelat ku duhet dërguar"
+msgstr "Kliko këtu për të vendosur ose hequr alarmet për këtë ndodhi"
 
 #: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
-#, fuzzy
 msgid "Insert advanced send options"
-msgstr "Opsionet e de_tajuara të dërgimit"
+msgstr "Fut opsionet e hollësishme të dërgimit"
 
 #: ../ui/evolution-event-editor.xml.h:10
-#, fuzzy
 msgid "Make this a recurring event"
-msgstr "Përcaktoje këtë ngjarje si të _lëvizëshme"
+msgstr "Përcaktoje këtë ngjarje si përkujtimore"
 
 #: ../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 "Publik"
+msgstr "Pu_blik"
 
 #: ../ui/evolution-event-editor.xml.h:12
-#, fuzzy
 msgid "Query free / busy information for the attendees"
-msgstr "Publiko informacionet e disponibilitetit për këtë kalendar"
+msgstr "Kërko informacione disponibilitetit për pjesmarrësin"
 
 #: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
-#, fuzzy
 msgid "R_ole Field"
-msgstr "Fusha _Për"
+msgstr "Fusha e r_olit"
 
 #: ../ui/evolution-event-editor.xml.h:16
-#, fuzzy
 msgid "Show time as _busy"
 msgstr "Shfaq kohën si i _zënë"
 
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
-#, fuzzy
 msgid "Time _Zone"
-msgstr "Zona e orës:"
+msgstr "_Zona orare"
 
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
-#, fuzzy
 msgid "Toggles whether the Attendee Type field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së llojit të pjesmarrësit"
 
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
-#, fuzzy
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës CC"
+msgstr "Ndryshon shfaqjen e fushës së RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
-#, fuzzy
 msgid "Toggles whether the Role field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së rolit"
 
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
-#, fuzzy
 msgid "Toggles whether the Status field is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e fushës së gjëndjes"
 
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
-#, fuzzy
 msgid "Toggles whether the time zone is displayed"
-msgstr "Shkëmbe shfaqjen e fushës Nga"
+msgstr "Ndryshon shfaqjen e zonës orare"
 
 #: ../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 "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e kategorive"
 
 #: ../ui/evolution-event-editor.xml.h:24
-#, fuzzy
 msgid "Toggles whether to have All Day Event"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon prezencën e aktivitetit të përditshëm"
 
 #: ../ui/evolution-event-editor.xml.h:25
-#, fuzzy
 msgid "Toggles whether to show time as busy"
-msgstr "Shkëmbe shfaqjen e fushës Për"
+msgstr "Ndryshon shfaqjen e kohës si i zënë"
 
 #: ../ui/evolution-event-editor.xml.h:26
-#, fuzzy
 msgid "_Alarms"
-msgstr "Alarme"
+msgstr "_Alarme"
 
 #: ../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 "K_lasifikimi"
+msgstr "_Klasifikimi"
 
 #: ../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 "Në konfidencë"
+msgstr "_Në konfidencë"
 
 #: ../ui/evolution-event-editor.xml.h:30
-#, fuzzy
 msgid "_Free/Busy"
-msgstr "_I lirë/zënë:"
+msgstr "_I lirë/zënë"
 
 #: ../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 "Privat"
+msgstr "_Privat"
 
 #: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
-#, fuzzy
 msgid "_RSVP"
-msgstr "RSVP"
+msgstr "_RSVP"
 
 #: ../ui/evolution-event-editor.xml.h:33
-#, fuzzy
 msgid "_Recurrence"
-msgstr "Përvjetor"
+msgstr "_Përvjetor"
 
 #: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
-#, fuzzy
 msgid "_Status Field"
-msgstr "_Gjendja:"
+msgstr "Fu_Sha e gjëndjes"
 
 #: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
-#, fuzzy
 msgid "_Type Field"
-msgstr "Fusha _Për"
+msgstr "Fusha e lloji_T"
 
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
@@ -19011,9 +18801,8 @@ msgid "_Copy Folder To..."
 msgstr "_Kopjo kartelën tek..."
 
 #: ../ui/evolution-mail-global.xml.h:17
-#, fuzzy
 msgid "_Message Filters"
-msgstr "F_iltrat e mesazheve"
+msgstr "Filtrat e _Mesazheve"
 
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Move Folder To..."
@@ -19039,14 +18828,12 @@ msgid "Change the properties of this folder"
 msgstr "Ndrysho pronësitë e kësaj kartele"
 
 #: ../ui/evolution-mail-list.xml.h:3
-#, fuzzy
 msgid "Collapse All _Threads"
-msgstr "Grumbullo sipas _Tematikës"
+msgstr "Palos të gjitha _Temat"
 
 #: ../ui/evolution-mail-list.xml.h:4
-#, fuzzy
 msgid "Collapse all message threads"
-msgstr "Shëno si të lexuar të gjithë mesazhet"
+msgstr "Palos të gjitha temat e mesazheve"
 
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
@@ -19058,18 +18845,16 @@ msgid "Cut selected message(s) to the clipboard"
 msgstr "Preje mesazhin(et) e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-mail-list.xml.h:8
-#, fuzzy
 msgid "E_xpand All Threads"
-msgstr "Shpalos Gjithçka"
+msgstr "Sh_palos të gjitha temat"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "_Elemino përgjithmonë"
 
 #: ../ui/evolution-mail-list.xml.h:10
-#, fuzzy
 msgid "Expand all message threads"
-msgstr "Shëno si të lexuar të gjithë mesazhet"
+msgstr "Shpalos të gjitha temat e mesazheve"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
@@ -19088,9 +18873,8 @@ msgid "Hide deleted messages rather than displaying them with a line through the
 msgstr "Fshih mesazhet e fshirë në vend që t'i shfaqësh të vizuar"
 
 #: ../ui/evolution-mail-list.xml.h:16
-#, fuzzy
 msgid "Mar_k All Messages as Read"
-msgstr "Shëno me_sazhet si të lexuar"
+msgstr "Shën_o të gjithë mesazhet si të lexuar"
 
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
@@ -19147,9 +18931,8 @@ msgid "Threaded Message list"
 msgstr "Rreshtim sipas diskutimeve"
 
 #: ../ui/evolution-mail-list.xml.h:31
-#, fuzzy
 msgid "_Group By Threads"
-msgstr "Grumbullo sipas _Tematikës"
+msgstr "_Grumbullo sipas tematikës"
 
 #: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
@@ -19179,7 +18962,7 @@ msgstr "Aplikoi rregullat e filtrit mesazheve të zgjedhur"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "Kontrollo për _Refuzime"
+msgstr "Kontrollo për _të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
@@ -19202,9 +18985,8 @@ msgid "Copy selected messages to another folder"
 msgstr "Kopjo mesazhet e zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-mail-message.xml.h:13
-#, fuzzy
 msgid "Copy selected messages to the clipboard"
-msgstr "Kopjo mesazhin(et) e zgjedhur tek Shënimet"
+msgstr "Kopjo mesazhet e zgjedhur tek shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
@@ -19243,9 +19025,8 @@ msgid "Create a rule to filter messages with this subject"
 msgstr "Krijo një rregull për të filtruar mesazhet me këtë subjekt"
 
 #: ../ui/evolution-mail-message.xml.h:23
-#, fuzzy
 msgid "Cut selected messages to the clipboard"
-msgstr "Preje mesazhin(et) e zgjedhur tek Shënimet"
+msgstr "Preje mesazhin e zgjedhur tek Shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
@@ -19260,9 +19041,8 @@ msgid "Display the next message"
 msgstr "Shfaq mesazhin në vazhdim"
 
 #: ../ui/evolution-mail-message.xml.h:28
-#, fuzzy
 msgid "Display the next thread"
-msgstr "Shfaq diskutimin e palexuar në vazhdim"
+msgstr "Shfaq temën në vazhdim"
 
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
@@ -19281,9 +19061,8 @@ msgid "Display the previous unread message"
 msgstr "Shfaq mesazhin paraardhës të palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:33
-#, fuzzy
 msgid "F_orward As..."
-msgstr "_Përcill kontaktin..."
+msgstr "P_ërcille si..."
 
 #: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
@@ -19303,12 +19082,11 @@ msgstr "Filtro në _Subjekt..."
 
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "Kontrollo nëse duhen flakur mesazhet e zgjedhur"
+msgstr "Kontrollo mesazhet e zgjedhur për praninë e të padëshiruarve"
 
 #: ../ui/evolution-mail-message.xml.h:39
-#, fuzzy
 msgid "Flag selected messages for follow-up"
-msgstr "Shëno mesazhin(et) e zgjedhur si vazhdim"
+msgstr "Shëno mesazhet e zgjedhur për në ndjekje"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
@@ -19343,43 +19121,36 @@ msgid "Mar_k as"
 msgstr "Shë_no si"
 
 #: ../ui/evolution-mail-message.xml.h:50
-#, fuzzy
 msgid "Mark the selected messages as having been read"
-msgstr "Shëno mesazhin(et) e zgjedhur si të lexuar"
+msgstr "Shëno mesazhet e zgjedhur si të lexuar"
 
 #: ../ui/evolution-mail-message.xml.h:51
-#, fuzzy
 msgid "Mark the selected messages as important"
-msgstr "Shëno mesazhin(et) e zgjedhur si të rendësishëm"
+msgstr "Shëno mesazhet e zgjedhur si të rendësishëm"
 
 #: ../ui/evolution-mail-message.xml.h:52
-#, fuzzy
 msgid "Mark the selected messages as junk"
-msgstr "Shëno mesazhin(et) e zgjedhur si për tu hedhur në kosh"
+msgstr "Shëno mesazhet e zgjedhur si të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:53
-#, fuzzy
 msgid "Mark the selected messages as not being junk"
-msgstr "Shëno mesazhin(et) e zgjedhur si jo për tu hedhur në kosh"
+msgstr "Shëno mesazhet e zgjedhur si jo të padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:54
-#, fuzzy
 msgid "Mark the selected messages as not having been read"
-msgstr "Shëno mesazhin(et) e zgjedhur si të palexuar"
+msgstr "Shëno mesazhet e zgjedhur si të palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:55
-#, fuzzy
 msgid "Mark the selected messages as unimportant"
-msgstr "Shëno mesazhin(et) e zgjedhur si të parendësishëm"
+msgstr "Shëno mesazhet e zgjedhur si të parendësishëm"
 
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "Shëno mesazhet e zgjedhur për t'i eleminuar"
 
 #: ../ui/evolution-mail-message.xml.h:57
-#, fuzzy
 msgid "Move selected messages to another folder"
-msgstr "Lëviz mesazhin(et) e zgjedhur në një kartelë tjetër"
+msgstr "Lëviz mesazhet e zgjedhur në një kartelë tjetër"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -19395,30 +19166,27 @@ msgstr "Mesazhi në vazhdim i _Palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "Jo për t'u flakur"
+msgstr "Jo i padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "Hap një dritare për të hartuar një mesazh"
 
 #: ../ui/evolution-mail-message.xml.h:64
-#, fuzzy
 msgid "Open the selected messages in a new window"
-msgstr "Hape mesazhin e zgjedhur në një dritare të re"
+msgstr "Hap mesazhet e zgjedhur në një dritare të re"
 
 #: ../ui/evolution-mail-message.xml.h:65
-#, fuzzy
 msgid "Open the selected messages in the composer for editing"
-msgstr "Hape mesazhin e zgjedhur në një dritare për t'a ndryshuar"
+msgstr "Hap mesazhet e zgjedhur në kompozues për t'a ndryshuar"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
 msgstr "Mesazhi pa_raardhës i palexuar"
 
 #: ../ui/evolution-mail-message.xml.h:67
-#, fuzzy
 msgid "Paste messages from the clipboard"
-msgstr "Ngjit mesazhin(et) nga shënimet"
+msgstr "Ngjit mesazhet nga shënimet"
 
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
@@ -19461,9 +19229,8 @@ msgid "Reset the text to its original size"
 msgstr "Rikthe tekstin në madhësine e tij orgjinale"
 
 #: ../ui/evolution-mail-message.xml.h:85
-#, fuzzy
 msgid "Save the selected messages as a text file"
-msgstr "Ruaj mesazhin si file teksti"
+msgstr "Ruaj mesazhet e zgjedhur si file teksti"
 
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
@@ -19502,21 +19269,18 @@ msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Shfaq një kursor pulsues në trupin e mesazheve"
 
 #: ../ui/evolution-mail-message.xml.h:95
-#, fuzzy
 msgid "Show messages in the normal style"
-msgstr "Paraqit mesazhin në stil normal"
+msgstr "Shfaq mesazhet në stilin e zakonshëm"
 
 #: ../ui/evolution-mail-message.xml.h:96
-#, fuzzy
 msgid "Show messages with all email headers"
-msgstr "Shfaq mesazhin me të gjithë emrat e email-it"
+msgstr "Shfaq mesazhet me të gjithë headers e email"
 
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "Shfaq buruesin e papërpunuar të mesazhit"
 
 #: ../ui/evolution-mail-message.xml.h:98
-#, fuzzy
 msgid "Undelete the selected messages"
 msgstr "Anullo fshirjen e mesazheve të zgjedhur"
 
@@ -19529,18 +19293,16 @@ msgid "Zoom _Out"
 msgstr "Zv_ogëlo"
 
 #: ../ui/evolution-mail-message.xml.h:101
-#, fuzzy
 msgid "_Attached"
-msgstr "Bashkangjit"
+msgstr "_Bashkangjitur"
 
 #: ../ui/evolution-mail-message.xml.h:102
 msgid "_Caret Mode"
 msgstr "Modalitet paraqitje _kursori"
 
 #: ../ui/evolution-mail-message.xml.h:103
-#, fuzzy
 msgid "_Clear Flag"
-msgstr "H_iq flamurin"
+msgstr "_Hiq shënimin"
 
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
@@ -19551,9 +19313,8 @@ msgid "_Find in Message..."
 msgstr "_Gjej në mesazh..."
 
 #: ../ui/evolution-mail-message.xml.h:109
-#, fuzzy
 msgid "_Flag Completed"
-msgstr "Shën_o si plotësuar"
+msgstr "Shën_o si të plotësuar"
 
 #: ../ui/evolution-mail-message.xml.h:111
 msgid "_Go To"
@@ -19564,22 +19325,20 @@ msgid "_Important"
 msgstr "_Me rendësi"
 
 #: ../ui/evolution-mail-message.xml.h:113
-#, fuzzy
 msgid "_Inline"
-msgstr "Direkt"
+msgstr "_Në linjë"
 
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "_Refuzo"
+msgstr "_I padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
 msgstr "_Ngarko figurat"
 
 #: ../ui/evolution-mail-message.xml.h:117
-#, fuzzy
 msgid "_Message Source"
-msgstr "Burimi i mesazhit"
+msgstr "Burimi i _Mesazhit"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
@@ -19591,7 +19350,7 @@ msgstr "Madhësi _Normale"
 
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
-msgstr "_Mos refuzo"
+msgstr "_Jo i padëshiruar"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
@@ -19602,9 +19361,8 @@ msgid "_Previous Message"
 msgstr "Mesazhi _Paraardhës"
 
 #: ../ui/evolution-mail-message.xml.h:125
-#, fuzzy
 msgid "_Quoted"
-msgstr "I kuotuar"
+msgstr "_Kuotuar"
 
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
@@ -19631,44 +19389,36 @@ msgid "Main toolbar"
 msgstr "Paneli qendror i instrumentëve"
 
 #: ../ui/evolution-memos.xml.h:3
-#, fuzzy
 msgid "Copy selected memo"
-msgstr "Kopjo aktivitetin e zgjedhur"
+msgstr "Kopjo memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:5
-#, fuzzy
 msgid "Cut selected memo"
-msgstr "Preje aktivitetin e zgjedhur"
+msgstr "Preje memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:7
-#, fuzzy
 msgid "Delete selected memos"
-msgstr "Elemino aktivitetet e zgjedhur"
+msgstr "Elemino memorjet e zgjedhura"
 
 #: ../ui/evolution-memos.xml.h:9
-#, fuzzy
 msgid "Paste memo from the clipboard"
-msgstr "Ngjite tekstin nga Shënimet"
+msgstr "Ngjit memorje nga Shënimet"
 
 #: ../ui/evolution-memos.xml.h:10
-#, fuzzy
 msgid "Previews the list of memos to be printed"
-msgstr "Pamja e parë e listës së aktiviteteve që duhet printuar"
+msgstr "Pamja e parë e listës së memorjeve që duhet printuar"
 
 #: ../ui/evolution-memos.xml.h:13
-#, fuzzy
 msgid "Print the list of memos"
-msgstr "Printo listën e aktiviteteve"
+msgstr "Printo listën e memorjeve"
 
 #: ../ui/evolution-memos.xml.h:14
-#, fuzzy
 msgid "View the selected memo"
-msgstr "Shiko aktivitetin e zgjedhur"
+msgstr "Shiko memorjen e zgjedhur"
 
 #: ../ui/evolution-memos.xml.h:18
-#, fuzzy
 msgid "_Open Memo"
-msgstr "_Hap mesazhet"
+msgstr "_Hap memorjen"
 
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
@@ -19702,9 +19452,8 @@ msgid "For_mat"
 msgstr "For_mati"
 
 #: ../ui/evolution-message-composer.xml.h:9
-#, fuzzy
 msgid "Get delivery notification when your message is read"
-msgstr "Zgjidhe për të marrë ricevutë kur mesazhi yt të jetë lexuar"
+msgstr "Merr ricevutë kur mesazhi yt të jetë lexuar"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
@@ -19712,9 +19461,8 @@ msgstr "HT_ML"
 
 #: ../ui/evolution-message-composer.xml.h:11
 #: ../ui/evolution-signature-editor.xml.h:16
-#, fuzzy
 msgid "I_nsert"
-msgstr "_Ndërfut"
+msgstr "Nd_ërfut"
 
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
@@ -19729,9 +19477,8 @@ msgid "PGP Sign"
 msgstr "Firmos me PGP"
 
 #: ../ui/evolution-message-composer.xml.h:16
-#, fuzzy
 msgid "R_equest Read Receipt"
-msgstr "Kërko ricevutë leximi"
+msgstr "Kërko ric_evutë leximi"
 
 #: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
@@ -19791,9 +19538,8 @@ msgid "Send this message"
 msgstr "Nise këtë mesazh"
 
 #: ../ui/evolution-message-composer.xml.h:32
-#, fuzzy
 msgid "Set the message priority to high"
-msgstr "Ruaj mesazhin si file teksti"
+msgstr "Cakto si të lartë prioritetin e mesazhit"
 
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
@@ -19852,9 +19598,8 @@ msgid "_Post-To Field"
 msgstr "Fusha _Posto-Tek"
 
 #: ../ui/evolution-message-composer.xml.h:51
-#, fuzzy
 msgid "_Prioritize Message"
-msgstr "Printo Mesazhin"
+msgstr "_Prioritet mesazhit"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
@@ -19920,39 +19665,32 @@ msgid "_Invert Selection"
 msgstr "_Inverto zgjedhjen"
 
 #: ../ui/evolution-task-editor.xml.h:4
-#, fuzzy
 msgid "Click change / view the status details of the task"
-msgstr "shfaq gjendja hollësi nga"
+msgstr "Kliko ndrysho / shiko hollësitë e gjëndjes së aktivitetit"
 
 #: ../ui/evolution-task-editor.xml.h:9
-#, fuzzy
 msgid "Status Details"
-msgstr "Gjendja: %s"
+msgstr "Hollësitë e gjëndjes"
 
 #: ../ui/evolution-task-editor.xml.h:10
-#, fuzzy
 msgid "Time Zone"
-msgstr "Zona orare "
+msgstr "Zona orare"
 
 #: ../ui/evolution-task-editor.xml.h:23
-#, fuzzy
 msgid "_Send Options"
-msgstr "Opsione dërgimi"
+msgstr "_Opsione dërgimi"
 
 #: ../ui/evolution-task-editor.xml.h:24
-#, fuzzy
 msgid "_Status Details"
-msgstr "Gjendja: %s"
+msgstr "_Detajet e gjëndjes"
 
 #: ../ui/evolution-tasks.xml.h:3
-#, fuzzy
 msgid "Copy selected tasks"
-msgstr "Kopjo aktivitetin e zgjedhur"
+msgstr "Kopjo aktivitetet e zgjedhur"
 
 #: ../ui/evolution-tasks.xml.h:5
-#, fuzzy
 msgid "Cut selected tasks"
-msgstr "Preje aktivitetin e zgjedhur"
+msgstr "Preje aktivitetet e zgjedhur"
 
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
@@ -19971,7 +19709,6 @@ msgid "Mark selected tasks as complete"
 msgstr "Shëno aktivitetet e zgjedhura si të plotësuara"
 
 #: ../ui/evolution-tasks.xml.h:12
-#, fuzzy
 msgid "Paste tasks from the clipboard"
 msgstr "Ngjit aktivitete nga shënimet"
 
@@ -19984,14 +19721,12 @@ msgid "Print the list of tasks"
 msgstr "Printo listën e aktiviteteve"
 
 #: ../ui/evolution-tasks.xml.h:18
-#, fuzzy
 msgid "Show task preview window"
-msgstr "Shfaq dritaren e pamjes së parë të kontaktit"
+msgstr "Shfaq dritaren e pamjes së parë të aktivitetit"
 
 #: ../ui/evolution-tasks.xml.h:19
-#, fuzzy
 msgid "Task _Preview"
-msgstr "_Pamja e parë e mesazhit"
+msgstr "_Pamja e parë e aktivitetit"
 
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
@@ -20048,9 +19783,8 @@ msgid "Hide window buttons"
 msgstr "Fshih pulsantët e dritares"
 
 #: ../ui/evolution.xml.h:13
-#, fuzzy
 msgid "I_mport..."
-msgstr "_Importim..."
+msgstr "I_mportimi..."
 
 #: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
@@ -20073,9 +19807,8 @@ msgid "Send / Receive"
 msgstr "Dërgo / Merr"
 
 #: ../ui/evolution.xml.h:20
-#, fuzzy
 msgid "Send / _Receive"
-msgstr "Dërgo / Merr"
+msgstr "Dërgo / _Merr"
 
 #: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
@@ -20090,14 +19823,12 @@ msgid "Show information about Evolution"
 msgstr "Shfaq informacionet në lidhje me Evolution"
 
 #: ../ui/evolution.xml.h:24
-#, fuzzy
 msgid "Side _Bar"
-msgstr "_Bar"
+msgstr "_Shtylla anësore"
 
 #: ../ui/evolution.xml.h:25
-#, fuzzy
 msgid "Status _Bar"
-msgstr "Gjendja"
+msgstr "_Shtylla e gjëndjes"
 
 #: ../ui/evolution.xml.h:26
 msgid "Submit Bug Report"
@@ -20128,26 +19859,22 @@ msgid "Tool_bar style"
 msgstr "Stili i panelit të _instrumentëve"
 
 #: ../ui/evolution.xml.h:36
-#, fuzzy
 msgid "View/Hide the Side Bar"
-msgstr "Paraqitja Fshih Bar"
+msgstr "Shfaq/Fshih shtyllën anësore"
 
 #: ../ui/evolution.xml.h:37
-#, fuzzy
 msgid "View/Hide the Status Bar"
-msgstr "Paraqitja Fshih Gjendja Bar"
+msgstr "Shfaq/Fshih shtyllën e gjëndjes"
 
 #: ../ui/evolution.xml.h:38
-#, fuzzy
 msgid "_About"
-msgstr "_Llogaria:"
+msgstr "_Informacione"
 
 #: ../ui/evolution.xml.h:39
 msgid "_Close Window"
 msgstr "_Mbyll dritaren"
 
 #: ../ui/evolution.xml.h:42
-#, fuzzy
 msgid "_Forget Passwords"
 msgstr "Harro _Fjalëkalimet"
 
@@ -20240,9 +19967,8 @@ msgid "_Messages"
 msgstr "_Mesazhet"
 
 #: ../views/memos/galview.xml.h:1
-#, fuzzy
 msgid "_Memos"
-msgstr "_Anëtarë"
+msgstr "_Memorje"
 
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
@@ -20309,7 +20035,7 @@ msgid "_Edit..."
 msgstr "_Ndrysho..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20347,9 +20073,8 @@ msgid "Define Views..."
 msgstr "Përcakto paraqitjet..."
 
 #: ../widgets/menus/gal-view-menus.c:291
-#, fuzzy
 msgid "C_urrent View"
-msgstr "Paraqitja aktuale"
+msgstr "Paraqitja akt_uale"
 
 #: ../widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View..."
@@ -20438,14 +20163,14 @@ msgstr "Y2"
 #: ../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:3014
+#: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
 msgstr "Gjerësia minimum"
 
 #: ../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:3015
+#: ../widgets/table/e-table-item.c:3016
 msgid "Minimum Width"
 msgstr "Gjerësia më e Vogël"
 
@@ -20500,9 +20225,8 @@ msgid "Korean"
 msgstr "Koreane"
 
 #: ../widgets/misc/e-charset-picker.c:72
-#, fuzzy
 msgid "Thai"
-msgstr "En"
+msgstr "Thai"
 
 #: ../widgets/misc/e-charset-picker.c:73
 msgid "Turkish"
@@ -20556,18 +20280,16 @@ msgid "Other..."
 msgstr "Tjetër..."
 
 #: ../widgets/misc/e-charset-picker.c:482
-#, fuzzy
 msgid "Ch_aracter Encoding"
-msgstr "Kodifikimi i gërmave"
+msgstr "Kodifikimi i gërm_ave"
 
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
 #: ../widgets/misc/e-dateedit.c:321
-#, fuzzy
 msgid "Date and Time"
-msgstr "Shtimi i datës dhe orës"
+msgstr "Datë dhe ora"
 
 #: ../widgets/misc/e-dateedit.c:340
 msgid "Text entry to input date"
@@ -20582,9 +20304,8 @@ msgid "Combo box to select time"
 msgstr "Kuti e kombinuar për zgjedhjen e orarit"
 
 #: ../widgets/misc/e-dateedit.c:385
-#, fuzzy
 msgid "Time"
-msgstr "_Kohëzgjatja:"
+msgstr "Ora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
@@ -20660,9 +20381,8 @@ msgid "_Searches"
 msgstr "_Kërkimet"
 
 #: ../widgets/misc/e-filter-bar.c:204
-#, fuzzy
 msgid "Searches"
-msgstr "_Kërkimet"
+msgstr "Kërkimet"
 
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:227
@@ -20725,9 +20445,8 @@ msgstr "Gjerësia e kollonës"
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
 #: ../widgets/misc/e-search-bar.c:371
-#, fuzzy
 msgid "Search"
-msgstr "_Kërko"
+msgstr "Kërko"
 
 #: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
@@ -20763,12 +20482,12 @@ msgstr "Teksti"
 msgid "Find _Now"
 msgstr "Gjej _Tani"
 
-#: ../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 "Rreshti kursorit"
 
-#: ../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 "Kollona kursorit"
@@ -20876,9 +20595,8 @@ msgid "When decli_ned:"
 msgstr "Kur refu_zohet:"
 
 #: ../widgets/misc/e-send-options.glade.h:26
-#, fuzzy
 msgid "Wi_thin"
-msgstr "B_renda"
+msgstr "Për_mban"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "_After:"
@@ -20923,9 +20641,8 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% plotësuar)"
 
 #: ../widgets/misc/e-url-entry.c:107
-#, fuzzy
 msgid "Click here to go to URL"
-msgstr "kliko këtu për të shkuar tek url"
+msgstr "Kliko këtu për të shkuar tek adresa URL"
 
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Edit Master Category List..."
@@ -21087,9 +20804,8 @@ msgid "No grouping"
 msgstr "Të pa grupuara"
 
 #: ../widgets/table/e-table-config.c:584
-#, fuzzy
 msgid "Available Fields"
-msgstr "Fushat në di_spozicion:"
+msgstr "Fushat në dispozicion"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
@@ -21102,14 +20818,14 @@ msgstr "_Shfaq këto fusha duke i renditur:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Kod DnD"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Titulli i plotë"
 
@@ -21153,7 +20869,7 @@ msgstr "%s (%d elementë)"
 #: ../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:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
 msgid "Alternating Row Colors"
 msgstr "Ndryshimi i ngjyrave të rreshtave"
 
@@ -21161,7 +20877,7 @@ msgstr "Ndryshimi i ngjyrave të rreshtave"
 #: ../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:2979 ../widgets/table/e-table-item.c:2980
+#: ../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 "Rrjetë e vizatuar horizontalisht"
@@ -21170,7 +20886,7 @@ msgstr "Rrjetë e vizatuar horizontalisht"
 #: ../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:2986 ../widgets/table/e-table-item.c:2987
+#: ../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 "Rrjetë e vizatuar vertikalisht"
@@ -21179,7 +20895,7 @@ msgstr "Rrjetë e vizatuar vertikalisht"
 #: ../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:2993 ../widgets/table/e-table-item.c:2994
+#: ../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 "Fokusi i rrjetës"
@@ -21188,7 +20904,7 @@ msgstr "Fokusi i rrjetës"
 #: ../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:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
 msgid "Cursor mode"
 msgstr "Modaliteti kursor"
 
@@ -21196,7 +20912,7 @@ msgstr "Modaliteti kursor"
 #: ../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:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
 msgid "Selection model"
 msgstr "Modeli i zgjedhjes"
 
@@ -21204,7 +20920,7 @@ msgstr "Modeli i zgjedhjes"
 #: ../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:3007 ../widgets/table/e-table-item.c:3008
+#: ../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"
@@ -21214,7 +20930,7 @@ msgstr "Gjatësia kufirit"
 #: ../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:3041 ../widgets/table/e-table-item.c:3042
+#: ../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"
@@ -21275,31 +20991,31 @@ msgstr "Formato kollonat..."
 msgid "Customize Current View..."
 msgstr "Personalizo paraqitjen aktuale..."
 
-#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1812 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Gërmat"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Rendit informacionin"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "Degëzimi"
 
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
 msgid "Table header"
 msgstr "Titull i tabelës"
 
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
 msgid "Table model"
 msgstr "Modeli i tabelës"
 
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
 msgid "Cursor row"
 msgstr "Rreshti kursorit"
 
diff --git a/po/sv.po b/po/sv.po
index d8fb9c8960..b18b9717de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,14 +12,14 @@
 # meeting = sammanträde
 # event = evenemang
 #
-# $Id: sv.po,v 1.218 2006/03/08 21:33:46 dnylande Exp $
+# $Id: sv.po,v 1.218.2.3 2006/05/19 06:37:31 dnylande Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-08 05:36+0100\n"
-"PO-Revision-Date: 2006-03-08 22:30+0100\n"
+"POT-Creation-Date: 2006-05-18 20:46+0200\n"
+"PO-Revision-Date: 2006-05-18 23:24+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -67,32 +67,32 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "evolution-minikort"
 
-#: ../a11y/calendar/ea-cal-view-event.c:235
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Det har alarm."
 
-#: ../a11y/calendar/ea-cal-view-event.c:238
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Det har upprepningar."
 
-#: ../a11y/calendar/ea-cal-view-event.c:241
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Det är ett sammanträde."
 
-#: ../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 "Kalenderevenemang: Sammanfattningen är %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:249
+#: ../a11y/calendar/ea-cal-view-event.c:280
 msgid "Calendar Event: It has no summary."
 msgstr "Kalenderevenemang: Det har ingen sammanfattning."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "kalendervisningshändelse"
 
-#: ../a11y/calendar/ea-cal-view-event.c:485
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Tag fokus"
 
@@ -122,7 +122,7 @@ msgid "a table to view and select the current time range"
 msgstr "en tabell för att visa och välja den aktuella tidsperioden"
 
 #: ../a11y/calendar/ea-day-view.c:149
-#: ../a11y/calendar/ea-week-view.c:151
+#: ../a11y/calendar/ea-week-view.c:150
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -130,7 +130,7 @@ msgstr[0] "Det har %d evenemang."
 msgstr[1] "Det har %d evenemang."
 
 #: ../a11y/calendar/ea-day-view.c:151
-#: ../a11y/calendar/ea-week-view.c:153
+#: ../a11y/calendar/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Det har inga evenemang."
 
@@ -226,21 +226,21 @@ msgstr "Hoppaknapp"
 msgid "Click here, you can find more events."
 msgstr "Klicka här, du kan hitta fler evenemang."
 
-#: ../a11y/calendar/ea-week-view.c:158
+#: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Månadsvy: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:162
+#: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Veckovy: %s. %s"
 
-#: ../a11y/calendar/ea-week-view.c:193
+#: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "kalendervy för en månad"
 
-#: ../a11y/calendar/ea-week-view.c:195
+#: ../a11y/calendar/ea-week-view.c:194
 msgid "calendar view for one or more weeks"
 msgstr "kalendervy för en eller flera veckor"
 
@@ -515,10 +515,10 @@ msgstr "Konfigurera automatisk ifyllning här"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:585
+#: ../plugins/exchange-operations/exchange-folder.c:586
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -804,7 +804,7 @@ msgstr "Spara som Vcard..."
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1345
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Väljare för kontaktkälla"
 
@@ -813,12 +813,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ange lösenord för %s (användare %s)"
@@ -2466,6 +2466,22 @@ msgstr ""
 "Data för kontakten är ogiltiga:\n"
 "\n"
 
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
+#, c-format
+msgid "'%s' has an invalid format"
+msgstr "\"%s\" har ett ogiltigt format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
+#, c-format
+msgid "%s'%s' has an invalid format"
+msgstr "%s\"%s\" har ett ogiltigt format"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
+#, c-format
+msgid "%s'%s' is empty"
+msgstr "%s\"%s\" är tom"
+
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Ogiltig kontakt."
@@ -2623,8 +2639,8 @@ msgstr "_Snabbmeddelandetjänst:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:239
-#: ../plugins/exchange-operations/exchange-contacts.c:228
+#: ../plugins/exchange-operations/exchange-calendar.c:242
+#: ../plugins/exchange-operations/exchange-contacts.c:235
 msgid "_Location:"
 msgstr "_Plats:"
 
@@ -3680,7 +3696,7 @@ msgstr "Format"
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
 #: ../widgets/table/e-table-field-chooser-item.c:649
 #: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1825
+#: ../widgets/table/e-table-header-item.c:1826
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "Rubrik"
@@ -3784,9 +3800,9 @@ msgstr "Skuggning"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:229
-#: ../plugins/exchange-operations/exchange-contacts.c:211
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
+#: ../plugins/exchange-operations/exchange-calendar.c:231
+#: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
 msgstr "Storlek:"
 
@@ -4203,7 +4219,7 @@ msgstr "_Spara ändringar"
 
 #: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:31
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -4329,9 +4345,9 @@ msgstr "Memo"
 #: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:591
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
+#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Uppgifter"
@@ -4921,10 +4937,10 @@ msgstr "Skriv ut"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:579
-#: ../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:590
+#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
 #: ../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
@@ -5300,7 +5316,7 @@ msgid "Display"
 msgstr "Visning"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Ledig/Upptagen"
@@ -5695,7 +5711,7 @@ msgstr "Visa _bilageraden"
 #: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3619
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
@@ -5770,8 +5786,8 @@ msgstr "Ingen sammanfattning"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:464
-#: ../mail/em-utils.c:501
+#: ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535
 #: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "bilaga"
@@ -5881,7 +5897,7 @@ msgstr "Kale_nder:"
 #: ../calendar/gui/dialogs/event-page.c:878
 #: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/task-page.c:446
+#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "Or_ganisatör:"
 
@@ -5902,7 +5918,7 @@ msgid "Event with no end date"
 msgstr "Evenemang utan slutdatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1257
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
@@ -5920,25 +5936,25 @@ msgstr "Sluttiden är fel"
 
 #: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
-#: ../calendar/gui/dialogs/task-page.c:909
+#: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "Organisatören som valts har inte längre ett konto."
 
 #: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
-#: ../calendar/gui/dialogs/task-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "En organisatör krävs."
 
 #: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
-#: ../calendar/gui/dialogs/task-page.c:930
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
 #: ../calendar/gui/dialogs/event-page.c:1895
 #: ../calendar/gui/dialogs/meeting-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:1203
+#: ../calendar/gui/dialogs/task-page.c:1199
 msgid "_Add "
 msgstr "_Lägg till "
 
@@ -6159,7 +6175,7 @@ msgid "Unable to open memos in '%s'."
 msgstr "Kan inte öppna memo i \"%s\"."
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Grupp:"
@@ -6414,8 +6430,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6497,11 +6513,11 @@ msgstr "_Uppgift"
 msgid "Task Details"
 msgstr "Uppgiftsdetaljer"
 
-#: ../calendar/gui/dialogs/task-page.c:825
+#: ../calendar/gui/dialogs/task-page.c:821
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: ../calendar/gui/dialogs/task-page.c:1653
+#: ../calendar/gui/dialogs/task-page.c:1649
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna uppgifter i \"%s\"."
@@ -6649,7 +6665,7 @@ msgstr "%s för en okänd triggertyp"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Klicka för att öppna %s"
@@ -6755,9 +6771,9 @@ msgstr ""
 #: ../calendar/gui/e-cal-model-tasks.c:1005
 #: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/e-meeting-store.c:177
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ja"
@@ -6765,7 +6781,7 @@ msgstr "Ja"
 #: ../calendar/gui/e-cal-model-tasks.c:1005
 #: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Nej"
@@ -6779,10 +6795,10 @@ msgstr "Nej"
 #: ../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:125
-#: ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:223
-#: ../mail/em-utils.c:1274
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -7088,26 +7104,26 @@ msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2030
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisatör: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2034
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisatör: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2050
+#: ../calendar/gui/e-calendar-view.c:2053
 #: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2081
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Tid: %s %s"
@@ -7289,8 +7305,8 @@ msgstr "<br> Granska följande information, och välj sedan en åtgärd från me
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7304,8 +7320,8 @@ msgstr "Preliminärt godtaget"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:189
-#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675
 #: ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
@@ -7634,74 +7650,74 @@ msgid "Resources"
 msgstr "Resurser"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:100
-#: ../calendar/gui/e-meeting-store.c:117
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Person"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Grupp"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Resurs"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Rum"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Mötesordförande"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/e-meeting-store.c:154
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:185
-#: ../calendar/gui/e-meeting-store.c:208
-#: ../calendar/gui/e-meeting-store.c:777
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Preliminärt"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7712,15 +7728,15 @@ msgstr "Delegerat"
 msgid "Attendee                          "
 msgstr "Deltagare                         "
 
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Pågår"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:442
-#: ../calendar/gui/e-meeting-time-sel.c:2098
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Y"
 
@@ -7729,7 +7745,7 @@ msgstr "%A %d %B %Y"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:446
-#: ../calendar/gui/e-meeting-time-sel.c:2131
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
@@ -10247,7 +10263,7 @@ msgstr "Du kan behöva välja andra e-postalternativ på grund av &quot;{0}&quot
 
 #: ../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 "Eftersom &quot;{1}&quot;."
 
@@ -10348,12 +10364,12 @@ msgstr "_Spara meddelande"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
 #: ../data/evolution.desktop.in.in.h:2
-#: ../shell/e-shell-window-commands.c:544
+#: ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Grupprogramvarusvit"
 
@@ -10519,7 +10535,7 @@ msgid "File exists &quot;{0}&quot;."
 msgstr "Filen finns &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:129
 msgid "_Overwrite"
 msgstr "Skriv _över"
 
@@ -10696,7 +10712,7 @@ msgid "Missing file name."
 msgstr "Filnamn saknas."
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "Namn saknas."
 
@@ -10999,14 +11015,14 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Vidarebefordrat meddelande --------"
 
-#: ../mail/em-composer-utils.c:1666
+#: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1713
+#: ../mail/em-composer-utils.c:1712
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "${AbbrevWeekdayName} ${Year}-${Month}-${Day} klockan ${24Hour}:${Minute} ${TimeZone} skrev ${Sender}:"
 
@@ -11340,7 +11356,7 @@ msgstr "Utkast"
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487
 #: ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:597
+#: ../plugins/exchange-operations/exchange-folder.c:598
 msgid "Inbox"
 msgstr "Inkorg"
 
@@ -11439,7 +11455,7 @@ msgid "_Rename..."
 msgstr "_Byt namn..."
 
 #: ../mail/em-folder-tree.c:2060
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "_Töm papperskorgen"
 
@@ -11589,38 +11605,38 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968
-#: ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Standard"
 
-#: ../mail/em-folder-view.c:2111
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: ../mail/em-folder-view.c:2267
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Kan inte hämta meddelande"
 
-#: ../mail/em-folder-view.c:2460
+#: ../mail/em-folder-view.c:2459
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkplats"
 
-#: ../mail/em-folder-view.c:2462
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Skapa ny _sökmapp"
 
-#: ../mail/em-folder-view.c:2463
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Från denna adress"
 
-#: ../mail/em-folder-view.c:2464
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Till denna adress"
 
-#: ../mail/em-folder-view.c:2818
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att skicka e-post till %s"
@@ -11900,7 +11916,7 @@ msgstr "%s-bilaga"
 
 #: ../mail/em-format.c:1141
 #: ../mail/em-format.c:1289
-#: ../mail/em-format.c:1576
+#: ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunde inte tolka S/MIME-meddelande: Okänt fel"
 
@@ -11918,12 +11934,12 @@ msgid "Unsupported signature format"
 msgstr "Signaturformatet stöds inte"
 
 #: ../mail/em-format.c:1454
-#: ../mail/em-format.c:1518
+#: ../mail/em-format.c:1520
 msgid "Error verifying signature"
 msgstr "Fel vid verifiering av signatur"
 
 #: ../mail/em-format.c:1454
-#: ../mail/em-format.c:1518
+#: ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
 msgstr "Okänt fel vid verifiering av signatur"
 
@@ -12050,21 +12066,21 @@ msgstr "Visa inte detta meddelande igen."
 msgid "Message Filters"
 msgstr "Meddelandefilter"
 
-#: ../mail/em-utils.c:462
-#: ../mail/em-utils.c:499
+#: ../mail/em-utils.c:496
+#: ../mail/em-utils.c:533
 msgid "message"
 msgstr "meddelande"
 
-#: ../mail/em-utils.c:634
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Spara meddelande..."
 
-#: ../mail/em-utils.c:683
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Lägg till adress"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1167
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Meddelanden från %s"
@@ -13779,229 +13795,229 @@ msgstr "En mapp med namnet &quot;{1}&quot; finns redan. Använd ett annat namn."
 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"
+"You can choose to ignore this folder, overwrite or append its contents, or quit."
 msgstr ""
 "En icke-tom mapp finns redan vid &quot;{1}&quot;.\n"
 "\n"
-"Du kan välja att ignorera denna mapp, skriva över eller lägga till dess innehåll, eller avsluta.\n"
+"Du kan välja att ignorera denna mapp, skriva över eller lägga till dess innehåll, eller avsluta."
 
-#: ../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}?"
 msgstr "En läskvittonotifiering har begärts för &quot;{1}&quot;. Skicka kvittonotifieringen till {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 "En signatur med namnet &quot;{0}&quot; finns redan. Använd ett annat namn."
 
-#: ../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."
 msgstr "Om du lägger till meningsfulla ämnesrader till dina meddelanden kommer dina mottagare att kunna få en aning om vad ditt brev handlar om."
 
 # Osäker
-#: ../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 "Är du säker på att du vill ta bort detta konto och alla dess proxys?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
 msgstr "Är du säker på att du vill ta bort detta konto?"
 
 # Osäker
-#: ../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 "Är du säker på att du vill inaktivera detta konto och ta bort alla dess 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 "Är du säker på att du vill öppna {0} meddelanden på en gång?"
 
-#: ../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 "Är du säker på att du vill permanent ta bort alla borttagna meddelanden i alla mappar?"
 
-#: ../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;?"
 msgstr "Är du säker på att du vill ta bort alla borttagna meddelanden i mappen &quot;{0}&quot;?"
 
-#: ../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 "Är du säker på att du vill skicka ett meddelande i HTML-format?"
 
-#: ../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 "Är du säker på att du vill skicka ett meddelande med endast blindkopiemottagare?"
 
-#: ../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 "Är du säker på att du vill skicka ett meddelande utan en ämnesrad?"
 
 # Mycket konstigt meddelande...
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
 msgstr "Eftersom &quot;{0}&quot;."
 
 # Mycket konstigt meddelande...
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{2}&quot;."
 msgstr "Eftersom &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "Blank signatur"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "Kan inte lägga till sökmappen &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 "Kan inte kopiera mappen &quot;{0}&quot; till &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "Kan inte skapa mappen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "Kan inte skapa temporär sparandekatalog."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "Kan inte skapa sparandekatalogen, eftersom &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "Kan inte ta bort mappen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "Kan inte ta bort systemmappen &quot;{0}&quot;."
 
-#: ../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 "Kan inte redigera sökmappen &quot;{0}&quot; eftersom den inte finns."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kan inte flytta mappen &quot;{0}&quot; till &quot;{1}&quot;."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "Kan inte öppna källan &quot;{1}&quot;"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "Kunde inte öppna källan &quot;{2}&quot;."
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "Kan inte öppna målet &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 license."
 msgstr "Kan inte läsa licensfilen &quot;{0}&quot; på grund av ett problem med installationen. Du kommer inte att kunna använda denna leverantör innan du accepterar dess licens."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "Kan inte byta namn på &quot;{0}&quot; till &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 "Kan inte byta namn på eller flytta systemmappen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot save changes to account."
 msgstr "Kan inte spara ändringar i kontot."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "Kan inte spara till katalogen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "Kan inte spara till filen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "Kan inte ställa in signaturskriptet &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."
 msgstr "Kontrollera att ditt lösenord är rättstavat. Kom ihåg att många lösenord är känsliga för skillnader i gemener och versaler; din CapsLock kan vara aktiverad."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
 msgstr "Kunde inte spara signaturfilen."
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "Ta bort &quot;{0}&quot;?"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "Ta bort kontot?"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:44
 msgid "Discard changes?"
 msgstr "Förkasta ändringar?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "Ta inte bort"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "Inaktivera inte"
 
-#: ../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 "Vill du att åtgärden ska utföras i undermapparna?"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "Vill du markera alla meddelanden som lästa?"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "Vill du spara dina ändringar?"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Ange lösenord."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Fel vid inläsning av filterdefinitioner."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "Fel vid utförande av åtgärd."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "Fel vid {0}."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "File exists but cannot overwrite it."
 msgstr "Filen finns men kan inte skriva över den."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "Filen finns men är ingen vanlig fil."
 
-#: ../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 "Om du fortsätter kommer du inte att kunna återställa dessa meddelanden."
 
-#: ../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."
 msgstr "Om du tar bort denna mapp kommer hela dess innehåll och innehållet i alla dess undermappar att tas bort permanent."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Om du fortsätter kommer alla proxykonton att tas bort permanent."
 
-#: ../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."
@@ -14009,63 +14025,63 @@ msgstr ""
 "Om du fortsätter kommer kontoinformationen\n"
 "och all proxyinformation att tas bort permanent."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Om du fortsätter kommer kontoinformationen att tas bort permanent."
 
-#: ../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."
 msgstr "Om du avslutar kommer dessa meddelanden inte att skickas förrän Evolution startas på nytt."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "Ogiltig autentisering"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
 msgstr "E-postfilter har automatiskt blivit uppdaterade."
 
-#: ../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 your message anyway. To avoid this, you should add at least one To: or CC: recipient."
 msgstr "Många e-postsystem lägger till ett \"Apparently-To\"-huvud till meddelanden som endast har blindkopiemottagare. Detta huvud kommer, om det läggs till, att ändå lista alla dina mottagare i ditt brev. För att undvika detta bör du lägga till åtminstone en Till:- eller Kopia:-mottagare."
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "Markera alla meddelanden som lästa"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:68
 msgid "Mark all messages as read in the selected folder"
 msgstr "Markera alla meddelanden som lästa i den markerade mappen"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:69
 msgid "Missing folder."
 msgstr "Mapp saknas."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:71
 msgid "No sources selected."
 msgstr "Inga källor har valts."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:72
 msgid "Opening too many messages at once may take a long time."
 msgstr "Att öppna för många meddelanden på en gång kan ta lång tid."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:73
 msgid "Please check your account settings and try again."
 msgstr "Kontrollera dina kontoinställningar och försök igen."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:74
 msgid "Please enable the account or send using another account."
 msgstr "Aktivera kontot eller skicka med ett annat konto."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
 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 "Ange en giltig e-postadress i Till:-fältet. Du kan söka efter en e-postadress genom att klicka på Till:-knappen bredvid inmatningsfältet."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}\n"
@@ -14075,51 +14091,51 @@ msgstr ""
 "{0}\n"
 "Vill du skicka ändå?"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:79
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ange ett unikt namn för att identifiera denna signatur."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:80
 msgid "Please wait."
 msgstr "Var vänlig vänta."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:81
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "Problem vid migrering av den gamla e-postmappen &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:82
 msgid "Querying server"
 msgstr "Rådfrågar server"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Rådfrågar servern om en lista över de autentiseringsmekanismer som stöds."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "Läskvitto begärt."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "Vill du verkligen ta bort mappen &quot;{0}&quot; och alla dess undermappar?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:86
 msgid "Search Folders automatically updated."
 msgstr "Sökmappar har automatiskt blivit uppdaterade."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:87
 msgid "Send Receipt"
 msgstr "Skicka kvitto"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:88
 msgid "Signature Already Exists"
 msgstr "Signatur finns redan"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:89
 msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Systemmappar krävs för att Ximian Evolution ska fungera korrekt och de kan inte flyttas, tas bort eller döpas om."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14129,7 +14145,7 @@ msgstr ""
 "\n"
 "Många e-postsystem lägger till ett \"Apparently-To\"-huvud till meddelanden som endast har blindkopiemottagare. Detta huvud kommer, om det läggs till, att lista alla dina mottagare i ditt brev. För att undvika detta bör du lägga till åtminstone en Till:- eller Kopia:-mottagare."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14143,7 +14159,7 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "och har uppdaterats."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14157,19 +14173,11 @@ msgstr ""
 "    &quot;{1}&quot;\n"
 "och har uppdaterats."
 
-#: ../mail/mail.error.xml.h:104
-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 ""
-"Meddelandet skickades via det externa programmet &quot;sendmail&quot;. Sendmail rapporterar följande fel: status 67: mail not sent (brevet skickades inte).\n"
-"Meddelandet är lagrat i utkorgsmappen. Kontrollera om meddelandet innehåller fel och skicka på nytt."
-
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:103
 msgid "The script file must exist and be executable."
 msgstr "Skriptfilen måste finnas och vara körbar."
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14177,67 +14185,67 @@ msgstr ""
 "Denna mapp kan ha lagts till implicit.\n"
 "Gå till redigeraren för sökmappar och lägg till den explicit, om så krävs."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:106
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Detta meddelande kan inte skickas eftersom kontot du valde att skicka det med inte är aktiverat"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:107
 msgid "This message cannot be sent because you have not specified any recipients"
 msgstr "Detta meddelande kan inte skickas eftersom du inte har angivit några mottagare"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:108
 msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "Denna server stöder inte denna typ av autentisering och kanske inte alls stöder autentisering."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:109
 msgid "This signature has been changed, but has not been saved."
 msgstr "Denna signatur har ändrats, men har inte sparats."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:110
 msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "Detta kommer att markera alla meddelanden som lästa i den markerade mappen och dess undermappar."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:111
 msgid "Unable to connect to the GroupWise server."
 msgstr "Kan inte ansluta till GroupWise-servern."
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:112
 msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "Kunde inte öppna utkastmappen för detta konto. Vill du använda standardmappen för utkast istället?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:113
 msgid "Unable to read license file."
 msgstr "Kan inte läsa licensfilen."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:114
 msgid "Use _Default"
 msgstr "Använd _standard"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:115
 msgid "Use default drafts folder?"
 msgstr "Använda standardutkastmappen?"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:116
 msgid "You have not filled in all of the required information."
 msgstr "Du har inte fyllt i all nödvändig information."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:117
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:118
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan inte skapa två konton med samma namn."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:119
 msgid "You must name this Search Folder."
 msgstr "Du måste ge denna sökmapp ett namn."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:120
 msgid "You must specify a folder."
 msgstr "Du måste ange en mapp."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:121
 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."
@@ -14245,27 +14253,23 @@ msgstr ""
 "Du måste ange minst en mapp som en källa.\n"
 "Antingen genom att markera mapparna individuellt, och/eller genom att markera alla lokala mappar, alla fjärrmappar, eller bådadera."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:123
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "Din inloggning till servern &quot;{0}&quot; som &quot;{0}&quot; misslyckades."
 
-#: ../mail/mail.error.xml.h:127
-msgid "Your message with the subject &quot;{0}&quot; was not delivered."
-msgstr "Ditt meddelande med ämnet &quot;{0}&quot; levererades inte."
-
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:124
 msgid "_Append"
 msgstr "_Lägg till"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:125
 msgid "_Discard changes"
 msgstr "_Förkasta ändringar"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:127
 msgid "_Expunge"
 msgstr "_Töm"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:128
 msgid "_Open Messages"
 msgstr "_Öppna meddelanden"
 
@@ -14342,7 +14346,7 @@ msgstr "%d %b %Y"
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: ../mail/message-list.c:3441
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -14765,24 +14769,24 @@ msgstr "Mappstorlek"
 msgid "Exchange Settings"
 msgstr "Exchange-inställningar"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:609
+#: ../plugins/exchange-operations/exchange-account-setup.c:610
 msgid "_OWA URL:"
 msgstr "_OWA-URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:635
+#: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "A_utentisera"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:828
+#: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "Autentiseringstyp"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:842
+#: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "_Kontrollera vilka typer som stöds"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:193
-#: ../plugins/exchange-operations/exchange-contacts.c:167
+#: ../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."
@@ -14959,14 +14963,14 @@ msgstr "Exchange-mappträd"
 msgid "Unsubscribe Folder..."
 msgstr "Säg upp prenumeration på mapp..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:523
+#: ../plugins/exchange-operations/exchange-folder.c:464
+#: ../plugins/exchange-operations/exchange-folder.c:524
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Verkligen säga upp prenumerationen på mappen \"%s\"?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:535
+#: ../plugins/exchange-operations/exchange-folder.c:476
+#: ../plugins/exchange-operations/exchange-folder.c:536
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Säg upp prenumerationen på \"%s\""
@@ -15383,7 +15387,7 @@ msgstr "Tillåter uppsägning av prenumeration på e-postmappar i mappträdsamma
 msgid "Unsubscribe Folders"
 msgstr "Säg upp prenumeration på mappar"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:414
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
 msgid "Checklist"
 msgstr "Kontrollista"
 
@@ -16883,91 +16887,99 @@ msgid "Default window height"
 msgstr "Standardfönsterhöjd"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Default window state"
+msgstr "Standardfönstertillstånd"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "Standardfönsterbredd"
 
-#: ../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 "Id eller alias för den komponent som ska visas som standard vid uppstart."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "Senast uppgraderad konfigurationsversion"
 
-#: ../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 "Lista med sökvägar till de mappar som ska synkroniseras till disk vid frånkopplad användning"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "Skrivarinställningar"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
 msgstr "Sidoraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "Skip development warning dialog"
 msgstr "Hoppa över varningsdialogen för utveckling"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
-#: ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Evolutions konfigurationsversion, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Standardhöjd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Standardbredd för huvudfönstret, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Standardbredd för sidopanelen, i bildpunkter."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Den senast uppgraderade konfigurationsversionen för Evolution, med överordnad/underordnad/konfigurationsnivå (till exempel \"2.6.0\")."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 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 "Stilen på fönsterknapparna. Kan vara \"text\", \"icons\" (ikoner), \"both\" (både och), \"toolbar\" (verktygsrad). Om \"toolbar\" är angivet kommer stilen på knapparna att avgöras utifrån verktygsradsinställningen i GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Verktygsraden är synlig"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Huruvida Evolution kommer att starta i frånkopplat läge istället för anslutet läge."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+msgid "Whether or not the window should be maximized."
+msgstr "Huruvida fönstret ska vara maximerat eller inte."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Huruvida sidoraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Huruvida verktygsraden ska vara synlig."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Huruvida varningsdialogen i utvecklingsversioner av Evolution hoppas över."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Huruvida fönsterknapparna ska vara synliga."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Stil på fönsterknappar"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Fönsterknapparna är synliga"
 
@@ -17082,7 +17094,7 @@ msgstr "Bug-buddy kunde inte köras."
 #. 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander\n"
@@ -17093,32 +17105,32 @@ msgstr ""
 "Andreas Hydén\n"
 "Skicka synpunkter på översättningen till tp-sv@listor.tp-sv.se"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: ../shell/e-shell-window-commands.c:788
+#: ../shell/e-shell-window-commands.c:819
 #: ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: ../shell/e-shell-window.c:368
+#: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution är just nu ansluten. Klicka på denna knapp för att arbeta frånkopplad."
 
-#: ../shell/e-shell-window.c:376
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution håller på att koppla från."
 
-#: ../shell/e-shell-window.c:383
+#: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution är just nu frånkopplad. Klicka på denna knapp för att arbeta ansluten."
 
-#: ../shell/e-shell-window.c:783
+#: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "Växla till %s"
@@ -17205,7 +17217,7 @@ msgstr ""
 "importera externa filer till Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17242,7 +17254,7 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17250,35 +17262,35 @@ msgstr ""
 "Tack\n"
 "Evolution-teamet\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Starta Evolution och aktivera den angivna komponenten"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Tvinga fram nedstängning av alla Evolution-komponenter"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga fram ommigrering från Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Inaktivera inläsning av alla insticksmoduler."
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19775,7 +19787,7 @@ msgid "_Edit..."
 msgstr "_Redigera..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-header-item.c:1840
 #: ../widgets/table/e-table-scrolled.c:222
 #: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
@@ -20240,12 +20252,12 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Sök _nu"
 
-#: ../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 "Markörrad"
 
-#: ../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 "Markörkolumn"
@@ -20578,14 +20590,14 @@ msgstr "_Visa dessa fält i ordningen:"
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
 #: ../widgets/table/e-table-field-chooser-item.c:635
 #: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1804
+#: ../widgets/table/e-table-header-item.c:1805
 msgid "DnD code"
 msgstr "Drag- och släppkod"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
 #: ../widgets/table/e-table-field-chooser-item.c:642
 #: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1818
+#: ../widgets/table/e-table-header-item.c:1819
 msgid "Full Header"
 msgstr "Fullständigt huvud"
 
@@ -20764,18 +20776,18 @@ msgstr "Formatera kolumner..."
 msgid "Customize Current View..."
 msgstr "Anpassa aktuell vy..."
 
-#: ../widgets/table/e-table-header-item.c:1811
+#: ../widgets/table/e-table-header-item.c:1812
 #: ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "Typsnittssamling"
 
-#: ../widgets/table/e-table-header-item.c:1832
+#: ../widgets/table/e-table-header-item.c:1833
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "Sorteringsinformation"
 
-#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-table-header-item.c:1847
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
@@ -20999,6 +21011,19 @@ msgstr "IM-sammanhang"
 msgid "Handle Popup"
 msgstr "Handtagspopupfönster"
 
+#~ 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 ""
+#~ "Meddelandet skickades via det externa programmet &quot;sendmail&quot;. "
+#~ "Sendmail rapporterar följande fel: status 67: mail not sent (brevet "
+#~ "skickades inte).\n"
+#~ "Meddelandet är lagrat i utkorgsmappen. Kontrollera om meddelandet "
+#~ "innehåller fel och skicka på nytt."
+#~ msgid "Your message with the subject &quot;{0}&quot; was not delivered."
+#~ msgstr "Ditt meddelande med ämnet &quot;{0}&quot; levererades inte."
 #~ msgid "Addressbook"
 #~ msgstr "Adressbok"
 #~ msgid ""
diff --git a/po/th.po b/po/th.po
index b478211597..6791b3d800 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,18 +8,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-08 12:18+0700\n"
-"PO-Revision-Date: 2006-04-08 12:24+0700\n"
+"POT-Creation-Date: 2006-04-08 12:12+0700\n"
+"PO-Revision-Date: 2006-04-08 12:06+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <L10N@opentle.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "สมุดที่อยู่ evolution"
 
@@ -33,12 +33,12 @@ msgstr "ที่อยู่ติดต่อใหม่"
 msgid "New Contact List"
 msgstr "รายชื่อที่อยู่ติดต่อใหม่"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "โฟลเดอร์สมุดที่อยู่ %s มีนามบัตร %d ใบ"
-msgstr[1] "โฟลเดอร์สมุดที่อยู่ %s มีนามบัตร %d ใบ"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "โฟลเดอร์สมุดที่อยู่ปัจจุบันมีนามบัตร %d ใบ"
+msgstr[1] "โฟลเดอร์สมุดที่อยู่ปัจจุบันมีนามบัตร %d ใบ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -533,7 +533,7 @@ msgstr "กำหนดค่าเติมเต็มคำอัตโนม
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "ที่อยู่ติดต่อ"
 
@@ -784,10 +784,10 @@ msgstr "สมุดที่อยู่ใ_หม่"
 #: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1268
-#: ../calendar/gui/e-calendar-view.c:1728 ../calendar/gui/e-memo-table.c:869
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617 ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1096 ../ui/evolution-addressbook.xml.h:49
+#: ../mail/em-folder-view.c:1091 ../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"
@@ -812,7 +812,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "กำลังเข้าใช้เซิร์ฟเวอร์ LDAP แบบนิรนาม"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "การยืนยันตัวบุคคลล้มเหลว\n"
 
@@ -1186,6 +1186,7 @@ msgstr "นาที"
 #: ../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
@@ -2500,15 +2501,15 @@ msgstr "มีการเปลี่ยนแปลง"
 msgid "Contact Editor - %s"
 msgstr "เครื่องมือแก้ไขที่อยู่ติดต่อ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "กรุณาเลือกรูปสำหรับที่อยู่ติดต่อนี้"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "ไม่มีรูป"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2516,7 +2517,7 @@ msgstr ""
 "ข้อมูลที่อยู่ติดต่อผิดพลาด:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "ที่อยู่ติดต่อผิดพลาด"
 
@@ -2544,7 +2545,7 @@ msgstr "เ_ลือกสมุดที่อยู่"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr ""
 "คุณแน่ใจหรือไม่ว่า\n"
 "จะลบรายชื่อที่อยู่ติดต่อ (%s)?"
@@ -2561,7 +2562,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr ""
 "คุณแน่ใจหรือไม่ว่า\n"
 "จะลบที่อยู่ติดต่อ (%s)?"
@@ -2673,8 +2674,8 @@ msgstr "_บริการ IM:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:409
-#: ../plugins/exchange-operations/exchange-calendar.c:238
-#: ../plugins/exchange-operations/exchange-contacts.c:230
+#: ../plugins/exchange-operations/exchange-calendar.c:239
+#: ../plugins/exchange-operations/exchange-contacts.c:228
 msgid "_Location:"
 msgstr "สถาน_ที่:"
 
@@ -2858,8 +2859,8 @@ msgstr "บันทึกเป็น VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
 #: ../calendar/gui/dialogs/comp-editor.c:1088
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595 ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "เ_ปิด"
@@ -2916,13 +2917,13 @@ msgstr "_ตัด"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1256
-#: ../calendar/gui/e-calendar-view.c:1713 ../calendar/gui/e-memo-table.c:860
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602 ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3120
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1724 ../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-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_คัดลอก"
@@ -3829,8 +3830,8 @@ msgstr "การแรเงา"
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
 #: ../plugins/exchange-operations/exchange-account-setup.c:955
-#: ../plugins/exchange-operations/exchange-calendar.c:227
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-calendar.c:229
+#: ../plugins/exchange-operations/exchange-contacts.c:211
 msgid "Size:"
 msgstr "ขนาด:"
 
@@ -4042,17 +4043,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบนัดหมายนี้?"
 
 #: ../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:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบการประชุมนี้?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการลบงานนี้?"
 
@@ -4401,7 +4399,7 @@ msgstr "บันทึกช่วยจำ"
 #: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:592
+#: ../plugins/exchange-operations/exchange-folder.c:591
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4467,7 +4465,7 @@ msgstr "ช่วงเ_วลาผัดผ่อน:"
 #: ../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-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../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
@@ -4984,7 +4982,7 @@ msgstr "พิมพ์"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
-#: ../plugins/exchange-operations/exchange-folder.c:580
+#: ../plugins/exchange-operations/exchange-folder.c:579
 #: ../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:590
@@ -5263,10 +5261,11 @@ 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:5
+#: ../composer/e-msg-composer-attachment.glade.h:6
 #: ../composer/e-msg-composer-select-file.c:97
 #: ../composer/e-msg-composer-select-file.c:117
-msgid "_Suggest automatic display of attachment"
+#: ../widgets/misc/e-attachment.glade.h:6
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
@@ -5274,7 +5273,7 @@ msgid "Attach file(s)"
 msgstr "แนบแฟ้ม"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "คุณสมบัติเอกสารแนบ"
@@ -5283,19 +5282,19 @@ msgstr "คุณสมบัติเอกสารแนบ"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../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:3
+#: ../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:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "ชนิด MIME:"
@@ -5709,7 +5708,7 @@ msgstr[1] "ข้อความที่แนบมา %d ข้อควา�
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3121
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978 ../mail/message-list.c:1725
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_ย้าย"
 
@@ -5840,10 +5839,6 @@ 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 "ไม่สามารถลบเหตุการณ์ได้เนื่องจากข้อผิดพลาด corba"
@@ -6449,7 +6444,7 @@ msgstr "<span weight=\"bold\">สถานภาพ</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/print.c:2369 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "เสร็จแล้ว"
@@ -6674,7 +6669,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:2828
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "คลิกเพื่อเปิด %s"
@@ -6757,7 +6752,7 @@ msgstr "ว่าง"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "ไม่ว่าง"
 
@@ -6773,15 +6768,15 @@ msgstr ""
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:773
+#: ../calendar/gui/e-meeting-store.c:167 ../calendar/gui/e-meeting-store.c:177
+#: ../calendar/gui/e-meeting-store.c:770
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "ตกลง"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:179
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "ไม่ตกลง"
@@ -6792,8 +6787,8 @@ msgstr "ไม่ตกลง"
 #: ../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:126 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1309
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:223 ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
@@ -6823,9 +6818,9 @@ msgstr "เลือกโฟลเดอร์ที่จะบันทึก
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1707 ../calendar/gui/e-memo-table.c:854
-#: ../mail/em-folder-view.c:1092 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596 ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "_บันทึกเป็น..."
 
@@ -6892,25 +6887,25 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "กำลังลบวัตถุที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr ""
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1249 ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138 ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "บันทึกเป็น..."
 
-#: ../calendar/gui/e-calendar-table.c:1249 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1175 ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "เปิด_เว็บเพจ"
 
-#: ../calendar/gui/e-calendar-table.c:1251
-#: ../calendar/gui/e-calendar-view.c:1692
-#: ../calendar/gui/e-calendar-view.c:1708 ../calendar/gui/e-memo-table.c:855
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597 ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../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
@@ -6918,44 +6913,44 @@ msgstr "เปิด_เว็บเพจ"
 msgid "_Print..."
 msgstr "_พิมพ์..."
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-calendar-view.c:1712 ../calendar/gui/e-memo-table.c:859
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601 ../calendar/gui/e-memo-table.c:859
 #: ../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:1257
-#: ../calendar/gui/e-calendar-view.c:1695
-#: ../calendar/gui/e-calendar-view.c:1714 ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603 ../calendar/gui/e-memo-table.c:861
 #: ../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:1261 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1187 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_มอบหมายงาน"
 
-#: ../calendar/gui/e-calendar-table.c:1262 ../calendar/gui/e-memo-table.c:865
+#: ../calendar/gui/e-calendar-table.c:1188 ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "ส่ง_ต่อเป็น iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1263
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "_ทำเครื่องหมายว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1264
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_ทำเครื่องหมายงานที่เลือกว่าเสร็จแล้ว"
 
-#: ../calendar/gui/e-calendar-table.c:1269
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "ลบ_งานที่เลือก"
 
-#: ../calendar/gui/e-calendar-table.c:1502
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "คลิกเพื่อเพิ่มงาน"
@@ -6990,105 +6985,105 @@ msgstr "วันเริ่มต้น"
 msgid "Task sort"
 msgstr "ลำดับงาน"
 
-#: ../calendar/gui/e-calendar-view.c:1375
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "กำลังลบรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1377
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "กำลังคัดลอกรายการ"
 
-#: ../calendar/gui/e-calendar-view.c:1686
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "นัดหมายใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1687
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "เหตุการณ์ทั้งวันใหม่"
 
-#: ../calendar/gui/e-calendar-view.c:1688
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "การประชุมใ_หม่"
 
-#: ../calendar/gui/e-calendar-view.c:1689
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "งานใ_หม่"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1699
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_มุมมองปัจจุบัน"
 
-#: ../calendar/gui/e-calendar-view.c:1701
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "เลือก_วันนี้"
 
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "เ_ลือกวัน..."
 
-#: ../calendar/gui/e-calendar-view.c:1718
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_คัดลอกไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1719
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_ย้ายไปยังปฏิทิน..."
 
-#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "มอบหมายประชุมแ_ทน..."
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "_จัดเวลาประชุม..."
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "ส่ง_ต่อเป็น iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "_ตอบกลับ"
 
-#: ../calendar/gui/e-calendar-view.c:1724 ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613 ../mail/em-folder-view.c:1082
 #: ../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:1729
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "ให้เหตุการณ์นี้เ_คลื่อนย้ายได้"
 
-#: ../calendar/gui/e-calendar-view.c:1730 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1619 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_ลบเหตุการณ์นี้"
 
-#: ../calendar/gui/e-calendar-view.c:1731
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "ลบ_ทุกเหตุการณ์"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2141
+#: ../calendar/gui/e-calendar-view.c:2030
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ผู้ประสานงาน: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:2034
 #, c-format
 msgid "Organizer: %s"
 msgstr "ผู้ประสานงาน: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2161 ../calendar/gui/print.c:2336
+#: ../calendar/gui/e-calendar-view.c:2050 ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "สถานที่: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2192
+#: ../calendar/gui/e-calendar-view.c:2081
 #, c-format
 msgid "Time: %s %s"
 msgstr "เวลา: %s %s"
@@ -7250,7 +7245,7 @@ msgstr "<br> กรุณาดูข้อมูลข้างล่างน�
 
 #: ../calendar/gui/e-itip-control.c:1132
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7263,7 +7258,7 @@ msgstr "อาจตอบรับ"
 
 #: ../calendar/gui/e-itip-control.c:1140
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
@@ -7589,63 +7584,63 @@ msgid "Resources"
 msgstr "ทรัพยากร"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../calendar/gui/e-meeting-store.c:767
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:764
 msgid "Individual"
 msgstr "ส่วนบุคคล"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../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:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "ทรัพยากร"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:107 ../calendar/gui/e-meeting-store.c:124
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "ห้อง"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "ประธาน"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:770
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:767
 msgid "Required Participant"
 msgstr "ผู้ร่วมประชุมที่ต้องเข้า"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "ผู้ร่วมประชุมเสริม"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:142 ../calendar/gui/e-meeting-store.c:159
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "ไม่ใช่ผู้ร่วมประชุม"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:780
+#: ../calendar/gui/e-meeting-store.c:185 ../calendar/gui/e-meeting-store.c:208
+#: ../calendar/gui/e-meeting-store.c:777
 msgid "Needs Action"
 msgstr "ต้องดำเนินการ"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "ไม่แน่"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7656,14 +7651,14 @@ msgstr "ส่งผู้แทนเข้าประชุม"
 msgid "Attendee                          "
 msgstr "ผู้เข้าร่วม                           "
 
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
 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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2098
 msgid "%A, %B %d, %Y"
 msgstr "%A %d %B %Ey"
 
@@ -7671,78 +7666,78 @@ msgstr "%A %d %B %Ey"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2131
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Ey"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Ey"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "ไม่อยู่ที่ทำงาน"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "ไม่มีข้อมูล"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "ผู้เ_ข้าประชุม..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "_ตัวเลือก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "แสดง_ชั่วโมงทำการเท่านั้น"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "แสดงภาพขยาย_ออก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_ปรับปรุงข้อมูล ว่าง/ไม่ว่าง "
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "เลือก_อัตโนมัติ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_ทุกคน ทุกทรัพยากร"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "ทุก_คน และทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "ผู้เข้าประชุมห_ลัก"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "ผู้เข้าประชุมหลัก และ_ทรัพยากรชิ้นใดชิ้นหนึ่ง"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "เวลาเ_ริ่มต้น:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "เวลา_สิ้นสุด:"
 
@@ -10290,11 +10285,11 @@ msgstr "_บันทึกข้อความ"
 
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:544
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "ชุดกรุ๊ปแวร์"
 
@@ -10768,7 +10763,7 @@ msgstr "เครื่องมือควบคุมการตั้งค
 msgid "Evolution Mail preferences control"
 msgstr "เครื่องมือควบคุมการปรับแต่งเมลของ Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:518
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
@@ -11243,7 +11238,7 @@ msgstr "จดหมายร่าง"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:598
+#: ../plugins/exchange-operations/exchange-folder.c:597
 msgid "Inbox"
 msgstr "จดหมายเข้า"
 
@@ -11338,13 +11333,13 @@ msgstr "เ_ทขยะ"
 msgid "Copying `%s' to `%s'"
 msgstr "กำลังคัดลอก `%s' ไปยัง `%s'"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../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:993
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_คัดลอก"
 
@@ -11366,143 +11361,143 @@ msgstr "สร้างโฟลเดอร์"
 msgid "Specify where to create the folder:"
 msgstr "ระบุที่ที่จะสร้างโฟลเดอร์"
 
-#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_ตอบกลับผู้ส่ง"
 
-#: ../mail/em-folder-view.c:1088 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1083 ../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:1091 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "แ_ก้ไขเป็นข้อความใหม่..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "ไ_ม่ลบ"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "_ย้ายไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_คัดลอกไปยังโฟลเดอร์..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "ทำเครื่องหมาย_อ่านแล้ว"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "ทำเครื่องหมายว่า_ยังไม่อ่าน"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "ทำเครื่องหมายว่า_สำคัญ"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "ทำเครื่องหมายว่าไ_ม่สำคัญ"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "ทำเครื่องหมายเป็นเมล_ขยะ"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "ทำเครื่องหมายว่าไม่ใช่เม_ลขยะ"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "ทำเครื่องหมายว่าจะ_ตอบกระทู้..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "ติด_ป้าย"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "ไ_ม่ทำอะไร"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "ปักธ_งว่าเสร็จแล้ว"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "ล้_างธง"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "สร้าง_กฎจากข้อความ"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อเ_รื่อง..."
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "สร้างโฟลเดอร์ค้นหาจากชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "สร้างโฟลเดอร์ค้นหาจากเ_มลลิงลิสต์"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "กรองที่ชื่อเ_รื่อง"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "กรองที่ชื่อผู้_ส่ง"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "กรองที่ชื่อผู้_รับ"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "กรองที่เ_มลลิงลิสต์"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1973 ../mail/em-folder-view.c:2017
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "ปริยาย"
 
-#: ../mail/em-folder-view.c:2116
+#: ../mail/em-folder-view.c:2111
 #: ../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:2272
+#: ../mail/em-folder-view.c:2267
 msgid "Unable to retrieve message"
 msgstr "ดึงข้อความไม่สำเร็จ"
 
-#: ../mail/em-folder-view.c:2465
+#: ../mail/em-folder-view.c:2460
 msgid "_Copy Link Location"
 msgstr "คัด_ลอกที่อยู่ลิงก์"
 
-#: ../mail/em-folder-view.c:2467
+#: ../mail/em-folder-view.c:2462
 msgid "Create _Search Folder"
 msgstr "สร้างโฟลเดอร์_ค้นหา"
 
-#: ../mail/em-folder-view.c:2468
+#: ../mail/em-folder-view.c:2463
 msgid "_From this Address"
 msgstr "_จากที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2464
 msgid "_To this Address"
 msgstr "ไ_ปที่อยู่นี้"
 
-#: ../mail/em-folder-view.c:2823
+#: ../mail/em-folder-view.c:2818
 #, c-format
 msgid "Click to mail %s"
 msgstr "คลิกเพื่อส่งเมลไปยัง %s"
@@ -14755,7 +14750,7 @@ msgstr "ชนิดของการยืนยันตัวบุคคล
 msgid "Ch_eck for Supported Types"
 msgstr "_ตรวจสอบชนิดที่สนับสนุน"
 
-#: ../plugins/exchange-operations/exchange-calendar.c:191
+#: ../plugins/exchange-operations/exchange-calendar.c:193
 #: ../plugins/exchange-operations/exchange-contacts.c:167
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
@@ -14934,14 +14929,14 @@ msgstr "ลำดับชั้นโฟลเดอร์ Exchange"
 msgid "Unsubscribe Folder..."
 msgstr "เลิกบอกรับข้อมูลโฟลเดอร์..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:464
-#: ../plugins/exchange-operations/exchange-folder.c:524
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "เลิกบอกรับข้อมูลจากโฟลเดอร์ \"%s\" จริงหรือไม่?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:476
-#: ../plugins/exchange-operations/exchange-folder.c:536
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "เลิกบอกรับข้อมูลจาก \"%s\""
@@ -16169,7 +16164,7 @@ msgstr "ปลั๊กอินจัดแสดง Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr ""
 "&quot;{0}&quot; ได้มอบฉันทะการประชุม คุณต้องการเพิ่มผู้รับมอบฉันทะ &quot;{1}&quot; "
 "หรือไม่?"
@@ -16673,7 +16668,7 @@ msgid "MIME Type"
 msgstr "ชนิด MIME"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "บันทึก"
 
@@ -16925,7 +16920,7 @@ msgstr "แสดงแถบข้าง"
 msgid "Skip development warning dialog"
 msgstr "ข้ามกล่องโต้ตอบเตือนสถานะกำลังพัฒนา"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "เริ่มในโหมดออฟไลน์"
 
@@ -17109,7 +17104,7 @@ 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:530
+#: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
 "สุปราณี ธีระวัฒนสุข <supranee@opentle.org>\n"
@@ -17118,15 +17113,15 @@ msgstr ""
 "ถ้ามีเวลาโปรดมาช่วยกันแปล :-)\n"
 "http://gnome-th.sf.net"
 
-#: ../shell/e-shell-window-commands.c:775
+#: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "ทำงานออ_นไลน์"
 
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
+#: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:54
 msgid "_Work Offline"
 msgstr "ทำงานออ_ฟไลน์"
 
-#: ../shell/e-shell-window-commands.c:801
+#: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
@@ -17227,7 +17222,7 @@ msgstr ""
 "เข้าสู่ Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:230
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17261,7 +17256,7 @@ msgstr ""
 "เราหวังว่าคุณจะพึงพอใจกับผลของการทำงานอย่างหนักของเรา\n"
 "และเรากำลังรอคอยการร่วมสมทบของคุณอย่างใจจดใจจ่อ!\n"
 
-#: ../shell/main.c:254
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17269,35 +17264,35 @@ msgstr ""
 "ขอขอบคุณ\n"
 "ทีมงาน Evolution\n"
 
-#: ../shell/main.c:261
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "ไม่ต้องบอกฉันอีก"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "เรียก Evolution โดยเปิดใช้องค์ประกอบที่กำหนด"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "เริ่มทำงานในโหมดออนไลน์"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "บังคับปิดองค์ประกอบทั้งหมดของ Evolution"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "บังคับปรับรุ่นข้อมูลใหม่จาก Evolution 1.4"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "ส่งข้อความดีบั๊กของทุกองค์ประกอบลงแฟ้ม"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "ปิดการโหลดปลั๊กอินใดๆ"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18045,7 +18040,7 @@ 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-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "เลือกทั้ง_หมด"
@@ -18272,11 +18267,11 @@ msgstr "ตัดส่วนที่เลือกเข้าคลิปบ
 msgid "Paste from clipboard"
 msgstr "แปะจากคลิปบอร์ด"
 
-#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "แปะข้อความจากคลิปบอร์ด"
 
-#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "เลือกเนื้อความทั้งหมด"
 
@@ -18311,31 +18306,30 @@ msgstr "คลิกที่นี่เพื่อดูวิธีใช้
 msgid "Close"
 msgstr "ปิด"
 
-#: ../ui/evolution-editor.xml.h:10 ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "แ_ทรก"
-
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../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-editor.xml.h:15 ../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-editor.xml.h:18 ../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:41
 msgid "_File"
 msgstr "แ_ฟ้ม"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:43
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "_วิธีใช้"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "แ_ทรก"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "_ตัวเลือก"
@@ -19184,6 +19178,11 @@ msgstr "รับการแจ้งเมื่อข้อความขอ
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "แ_ทรก"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "เปิดแฟ้ม"
@@ -19817,10 +19816,6 @@ msgstr "ชนิดของมุมมอง"
 msgid "Type of view:"
 msgstr "ชนิดของมุมมอง:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-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:416
@@ -20896,9 +20891,6 @@ msgstr ""
 msgid "Handle Popup"
 msgstr ""
 
-#~ msgid "_Insert"
-#~ msgstr "แ_ทรก"
-
 #~ msgid "ordinal|first"
 #~ msgstr "วันแรก"
 
diff --git a/po/vi.po b/po/vi.po
index 6dda8e590c..c9ed56b103 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
 # 
 msgid ""
 ""
-msgstr "Project-Id-Version: evolution 1.4 Gnome HEAD\n"
+msgstr "Project-Id-Version: evolution 1.4 Gnome 2.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-26 06:04+0200\n"
-"PO-Revision-Date: 2006-05-26 14:59+0930\n"
+"POT-Creation-Date: 2006-05-25 04:39+0200\n"
+"PO-Revision-Date: 2006-05-25 17:53+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr "Project-Id-Version: evolution 1.4 Gnome HEAD\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:169
 msgid "evolution addressbook"
 msgstr "Sổ địa chỉ Evolution"
 
@@ -33,11 +33,11 @@ msgstr "Liên lạc mới"
 msgid "New Contact List"
 msgstr "Danh sách liên lạc mới"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:152
 #, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "thư mục sổ địa chỉ hiện thời %s có %d thẻ"
+msgid "current addressbook folder has %d card"
+msgid_plural "current addressbook folder has %d cards"
+msgstr[0] "thư mục sổ địa chỉ hiện thời có %d thẻ"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
@@ -56,32 +56,32 @@ msgstr "Liên lạc: "
 msgid "evolution minicard"
 msgstr "thẻ tí tị evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:264
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has alarms."
 msgstr "Nó có bảo động."
 
-#: ../a11y/calendar/ea-cal-view-event.c:267
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It has recurrences."
 msgstr "Nó có nhiều lần."
 
-#: ../a11y/calendar/ea-cal-view-event.c:270
+#: ../a11y/calendar/ea-cal-view-event.c:272
 msgid "It is a meeting."
 msgstr "Nó là cuộc họp."
 
-#: ../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 "Sự kiện lịch: tóm tắt là %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 "Sự kiện lịch: chưa có tóm tắt."
 
-#: ../a11y/calendar/ea-cal-view-event.c:297
+#: ../a11y/calendar/ea-cal-view-event.c:299
 msgid "calendar view event"
 msgstr "sự kiện xem lịch"
 
-#: ../a11y/calendar/ea-cal-view-event.c:526
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "Bắt tiêu điểm"
 
@@ -153,10 +153,9 @@ msgstr "%A %d %b %Y"
 #.specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:1551
-#: ../calendar/gui/e-week-view-main-item.c:319
-#: ../calendar/gui/e-week-view-main-item.c:533
+#: ../calendar/gui/e-day-view-top-item.c:711
+#: ../calendar/gui/e-day-view.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:321
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -187,10 +186,9 @@ msgstr "%d %b %Y"
 #.change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:1567
-#: ../calendar/gui/e-week-view-main-item.c:333
-#: ../calendar/gui/e-week-view-main-item.c:547
+#: ../calendar/gui/e-day-view-top-item.c:715
+#: ../calendar/gui/e-day-view.c:1519
+#: ../calendar/gui/e-week-view-main-item.c:335
 msgid "%d %b"
 msgstr "%d %b"
 
@@ -537,7 +535,7 @@ msgstr "Cấu hình tự động gỡ xong ở đây"
 
 #.Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247
 #: ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:586
@@ -608,7 +606,7 @@ msgstr "Trên máy này"
 #: ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198
 #: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055
+#: ../mail/em-migrate.c:1054
 #: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "Cá nhân"
@@ -669,9 +667,9 @@ msgstr "Sao chép nội dung sổ về máy để phục vụ các thao tác ngo
 #: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
 #: ../mail/em-folder-properties.c:222
 #: ../mail/mail-config.glade.h:86
 #: ../plugins/itip-formatter/itip-formatter.c:1978
@@ -715,13 +713,13 @@ msgstr "Thuộc tính Sổ địa chỉ"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153
-#: ../mail/em-migrate.c:1202
+#: ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "Đang nâng cấp..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
 #: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1243
+#: ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Đang nâng cấp « %s »"
@@ -792,21 +790,21 @@ msgstr "Tên thư mục không thể chứa ký tự sổ chéo."
 msgid "A Folder with this name already exists"
 msgstr "Thư mục tên này đã có"
 
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:953
 msgid "_New Address Book"
 msgstr "Sổ địa chỉ _mới"
 
 #.FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
+#: ../addressbook/gui/component/addressbook-view.c:954
 #: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/e-calendar-table.c:1261
-#: ../calendar/gui/e-calendar-view.c:1720
-#: ../calendar/gui/e-memo-table.c:861
+#: ../calendar/gui/e-calendar-table.c:1194
+#: ../calendar/gui/e-calendar-view.c:1617
+#: ../calendar/gui/e-memo-table.c:869
 #: ../calendar/gui/memos-component.c:452
 #: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2061
-#: ../mail/em-folder-view.c:1096
+#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091
 #: ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30
@@ -815,18 +813,18 @@ msgstr "Sổ địa chỉ _mới"
 msgid "_Delete"
 msgstr "_Xoá bỏ"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "Lưu dạng vCard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:961
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/memos-component.c:453
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "Th_uộc tính..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1349
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "Bộ chọn nguồn liên lạc"
 
@@ -835,7 +833,7 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới máy phục vụ LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:495
 msgid "Failed to authenticate.\n"
 msgstr "Việc xác thực bị lỗi.\n"
 
@@ -885,7 +883,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Địa chỉ Mạng cho thư mục đã dùng cuối cùng trong hộp thoại chọn tên."
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Vertical pane position"
 msgstr "Vị trí ô cửa sổ dọc"
 
@@ -1202,6 +1200,7 @@ msgstr "phút"
 #: ../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
@@ -1252,13 +1251,13 @@ msgstr "<b>Chỗ làm</b>"
 # Name: don't translate / Tên: đừng dịch
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:503
+#: ../addressbook/gui/widgets/eab-contact-display.c:348
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:182
 msgid "Contact"
@@ -1310,7 +1309,7 @@ msgstr "Điện thoại"
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1054
+#: ../mail/em-migrate.c:1053
 #: ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "Chỗ làm"
@@ -1338,8 +1337,11 @@ msgid "_Calendar:"
 msgstr "_Lịch:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Categories..."
-msgstr "_Loại..."
+#: ../ui/evolution-event-editor.xml.h:27
+#: ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
+msgid "_Categories"
+msgstr "_Loại"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_City:"
@@ -1426,8 +1428,8 @@ msgid "_Zip/Postal Code:"
 msgstr "Mã _bưu điện:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:522
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
+#: ../addressbook/gui/widgets/eab-contact-display.c:367
+#: ../addressbook/gui/widgets/eab-contact-display.c:382
 msgid "Address"
 msgstr "Địa chỉ"
 
@@ -1435,7 +1437,7 @@ msgstr "Địa chỉ"
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:185
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
 #: ../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
@@ -2423,7 +2425,7 @@ msgstr "Dim-ba-bu-ê"
 #: ../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:368
+#: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
 msgstr "Tên"
@@ -2434,7 +2436,7 @@ msgstr "AOL Instant Messenger"
 
 #: ../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:506
+#: ../addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2444,7 +2446,7 @@ msgstr "Yahoo Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:505
+#: ../addressbook/gui/widgets/eab-contact-display.c:350
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2474,17 +2476,17 @@ msgid "Other"
 msgstr "Khác"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:508
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:352
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:504
+#: ../addressbook/gui/widgets/eab-contact-display.c:349
 msgid "GroupWise"
 msgstr "GroupWise"
 
@@ -2518,38 +2520,38 @@ msgstr "Đã đổi"
 msgid "Contact Editor - %s"
 msgstr "Bộ sửa liên lạc — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2775
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2773
 msgid "Please select an image for this contact"
 msgstr "Hãy chọn ảnh cho liên lạc này"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2776
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2774
 msgid "No image"
 msgstr "Không ảnh"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3060
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3058
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Dữ liệu liên lạc không hợp lệ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3064
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3062
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "« %s » có dạng thức không hợp lệ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3069
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s« %s » có dạng thức không hợp lệ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3086
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3084
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s« %s » là rỗng"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3112
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Invalid contact."
 msgstr "Liên lạc không hợp lệ."
 
@@ -2561,15 +2563,15 @@ msgstr "Thêm nhanh liên lạc"
 msgid "_Edit Full"
 msgstr "_Sửa đầy"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "_Họ tên"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
 msgid "E-_mail"
-msgstr "Thư đ_iện tử"
+msgstr "Thư đ_iện tử "
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
 msgid "_Select Address Book"
 msgstr "_Chọn Sổ địa chỉ"
 
@@ -2577,7 +2579,7 @@ msgstr "_Chọn Sổ địa chỉ"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact list (%s)?"
+"to delete contact list (%s) ?"
 msgstr "Bạn có chắc muốn xoá bỏ\n"
 "danh sách liên lạc (%s) không?"
 
@@ -2592,7 +2594,7 @@ msgstr "Bạn có chắc muốn xoá bỏ\n"
 #, c-format
 msgid ""
 "Are you sure you want\n"
-"to delete contact (%s)?"
+"to delete contact (%s) ?"
 msgstr "Bạn có chắc muốn xoá bỏ\n"
 "liên lạc (%s) không?"
 
@@ -2701,7 +2703,6 @@ msgid "_IM Service:"
 msgstr "Dịch vụ t_in nhắn:"
 
 #: ../addressbook/gui/contact-editor/im.glade.h:5
-#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
 #: ../plugins/exchange-operations/exchange-contacts.c:235
@@ -2717,7 +2718,7 @@ msgid "Add an email to the List"
 msgstr "Thêm một địa chỉ thư điện tử vào danh sách"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:874
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
 msgid "Contact List Editor"
 msgstr "Bộ sửa danh sách liên lạc"
 
@@ -2749,7 +2750,7 @@ msgstr "_Chọn"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dưới đây:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../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
@@ -2758,15 +2759,15 @@ msgstr "_Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dướ
 msgid "Book"
 msgstr "Sổ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
 msgid "Is New List"
 msgstr "Là danh sách mới"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:747
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
 msgid "_Members"
 msgstr "Thành _viên"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:750
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
 msgid "Contact List Members"
 msgstr "Thành viên danh sách"
 
@@ -2886,10 +2887,10 @@ msgid "Save as VCard..."
 msgstr "Lưu dạng vCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-#: ../calendar/gui/e-calendar-table.c:1241
-#: ../calendar/gui/e-calendar-view.c:1698
-#: ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/e-calendar-table.c:1174
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-memo-table.c:852
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Mở"
@@ -2947,19 +2948,19 @@ msgstr "Cắ_t"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
-#: ../calendar/gui/e-calendar-table.c:1249
-#: ../calendar/gui/e-calendar-view.c:1705
-#: ../calendar/gui/e-memo-table.c:852
+#: ../calendar/gui/e-calendar-table.c:1182
+#: ../calendar/gui/e-calendar-view.c:1602
+#: ../calendar/gui/e-memo-table.c:860
 #: ../calendar/gui/memos-component.c:451
 #: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3124
-#: ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1082
-#: ../mail/message-list.c:1742
+#: ../composer/e-msg-composer.c:3120
+#: ../mail/em-folder-tree.c:979
+#: ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1724
 #: ../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-editor.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15
 #: ../ui/evolution-tasks.xml.h:23
@@ -3022,7 +3023,7 @@ msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-display.c:567
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "Thư điện tử"
@@ -3072,7 +3073,7 @@ msgid "Manager"
 msgstr "Quản lý"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:536
+#: ../addressbook/gui/widgets/eab-contact-display.c:381
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
@@ -3081,7 +3082,7 @@ msgid "Nickname"
 msgstr "Tên hiệu"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:547
+#: ../addressbook/gui/widgets/eab-contact-display.c:392
 msgid "Note"
 msgstr "Ghi chú"
 
@@ -3090,7 +3091,7 @@ msgid "Office"
 msgstr "Văn phòng"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -3272,90 +3273,68 @@ msgstr "Đã chọn"
 msgid "Has Cursor"
 msgstr "Có con trỏ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:163
-#: ../mail/em-popup.c:620
-msgid "_Open Link in Browser"
-msgstr "_Mở liên kết bằng trình duyệt"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../mail/em-folder-view.c:2467
-msgid "_Copy Link Location"
-msgstr "_Chép địa chỉ liên kết"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:165
-msgid "_Send New Message To ..."
-msgstr "_Gửi thư mới cho ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:166
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
-msgid "Copy _Email Address"
-msgstr "Chép _địa chỉ thư"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-display.c:135
+#: ../addressbook/gui/widgets/eab-contact-display.c:198
 msgid "(map)"
 msgstr "(bản đồ)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:300
-#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-display.c:145
+#: ../addressbook/gui/widgets/eab-contact-display.c:211
 msgid "map"
 msgstr "bản đồ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:431
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-display.c:276
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "List Members"
 msgstr "Thành viên danh sách"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:494
-#: ../addressbook/gui/widgets/eab-contact-display.c:496
+#: ../addressbook/gui/widgets/eab-contact-display.c:339
+#: ../addressbook/gui/widgets/eab-contact-display.c:341
 msgid "E-mail"
 msgstr "Thư điện từ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:518
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Position"
 msgstr "Vị trí"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-msgid "Video Chat"
-msgstr "Trò chuyện ảnh động"
+#: ../addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Video Conferencing"
+msgstr "Hội thảo ảnh động"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:520
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
+#: ../addressbook/gui/widgets/eab-contact-display.c:365
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
 msgid "Phone"
 msgstr "Điện thoại"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:521
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
 msgid "Fax"
 msgstr "Điện thư"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
 msgid "work"
 msgstr "chỗ làm"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:532
-msgid "Home Page"
-msgstr "Trang chủ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:377
+msgid "WWW"
+msgstr "WWW"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:533
-msgid "Web Log"
+#: ../addressbook/gui/widgets/eab-contact-display.c:378
+#: ../addressbook/gui/widgets/eab-contact-display.c:602
+msgid "Blog"
 msgstr "Nhật ký Mạng"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
+#: ../addressbook/gui/widgets/eab-contact-display.c:385
 msgid "personal"
 msgstr "cá nhân"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
 msgid "Job Title"
 msgstr "Tên nghề"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:749
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Home page"
 msgstr "Trang chủ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:757
-msgid "Blog"
-msgstr "Nhật ký Mạng"
-
 #.E_BOOK_ERROR_OK
 #: ../addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
@@ -3536,7 +3515,7 @@ msgid "Error adding list"
 msgstr "Gặp lỗi khi thêm danh sách"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:700
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
 msgid "Error adding contact"
 msgstr "Gặp lỗi khi thêm liên lạc"
 
@@ -3553,7 +3532,7 @@ msgid "Error removing list"
 msgstr "Gặp lỗi khi gỡ bỏ danh sách"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:655
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
 msgid "Error removing contact"
 msgstr "Gặp lỗi khi gỡ bỏ liên lạc"
 
@@ -3582,57 +3561,57 @@ msgstr "Ghi đè"
 #.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:372
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "liên lạc"
 
 # Filename: do not translate/ tên tập tin: đừng dịch
 #.This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:423
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:460
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
 msgid "Select Address Book"
 msgstr "Chọn Sổ địa chỉ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:601
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "danh sách"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
 msgstr "Chuyển liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:763
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
 msgstr "Chép liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
 msgstr "Chuyển các liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "Chép các liên lạc sang"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:994
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:997
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1038
-#: ../addressbook/gui/widgets/eab-gui-util.c:1056
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
 msgid "Contact information"
 msgstr "Thông tin lien lạc"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1058
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
 #, c-format
 msgid "Contact information for %s"
 msgstr "Thông tin lien lạc cho %s"
@@ -3728,12 +3707,12 @@ msgstr "Bộ nhập vCard Evolution"
 msgid "Print envelope"
 msgstr "In phong bì"
 
-#: ../addressbook/printing/e-contact-print.c:849
+#: ../addressbook/printing/e-contact-print.c:923
 msgid "Print contacts"
 msgstr "In các liên lạc"
 
-#: ../addressbook/printing/e-contact-print.c:939
-#: ../addressbook/printing/e-contact-print.c:967
+#: ../addressbook/printing/e-contact-print.c:1015
+#: ../addressbook/printing/e-contact-print.c:1043
 msgid "Print contact"
 msgstr "In liên lạc"
 
@@ -3886,7 +3865,7 @@ msgstr "Bóng"
 
 #.FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:962
 #: ../plugins/exchange-operations/exchange-calendar.c:231
 #: ../plugins/exchange-operations/exchange-contacts.c:218
 msgid "Size:"
@@ -4106,17 +4085,14 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Bạn có chắc muốn xoá bỏ cuộc hẹn này không?"
 
 #: ../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 "Bạn có chắc muốn xoá bỏ mục nhật ký này không?"
 
 #: ../calendar/calendar.error.xml.h:19
-#: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Bạn có chắc muốn xoá bỏ cuộc họp này không?"
 
 #: ../calendar/calendar.error.xml.h:20
-#: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "Bạn có chắc muốn xoá bỏ tác vụ này không?"
 
@@ -4381,8 +4357,8 @@ msgstr "Tách sự kiện đa ngày:"
 #: ../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
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
 msgid "Could not start evolution-data-server"
 msgstr "Không thể khởi động evolution-data-server (máy phục vụ dữ liệu)."
 
@@ -4421,7 +4397,7 @@ msgid "Calendar and Tasks"
 msgstr "Tác vụ và Lịch"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1291
 msgid "Calendars"
 msgstr "Lịch"
 
@@ -4476,7 +4452,7 @@ msgstr "Ghi nhớ"
 #: ../calendar/gui/print.c:1828
 #: ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1012
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:592
@@ -4499,12 +4475,12 @@ msgstr "_Tác vụ"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Dịch vụ báo động lịch Evolution"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "phút"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
@@ -4516,7 +4492,7 @@ msgid "hours"
 msgid_plural "hours"
 msgstr[0] "giờ"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
 msgid "Start time"
 msgstr "Thời điểm đầu:"
 
@@ -4527,8 +4503,8 @@ msgstr "Cuộc hẹn"
 
 #.Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1612
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1618
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1268
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1274
 #: ../calendar/gui/e-itip-control.c:1113
 #: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
@@ -4547,7 +4523,7 @@ msgstr "Thời gian _ngủ:"
 #: ../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-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5
 #: ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
@@ -4566,31 +4542,32 @@ msgstr "_Ngủ"
 msgid "location of appointment"
 msgstr "địa điểm cuộc hẹn"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1594
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1107
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1250
 msgid "No summary available."
 msgstr "Không có tóm tắt"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1459
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1116
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1467
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1126
 msgid "No location information available."
 msgstr "Không có thông tin về địa điểm."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1184
 #, c-format
 msgid "You have %d alarms"
 msgstr "Bạn có %d bảo động"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
+#.FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1344
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1368
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4601,7 +4578,7 @@ msgstr "Evolution chưa hỗ trợ bộ nhắc nhở lịch thông qua\n"
 "cấu hình để gửi thư. Thay vào đó, Evolution\n"
 "sẽ hiển thị một hộp thoại nhắc nhở thông thường."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1724
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1374
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4617,7 +4594,7 @@ msgstr "Lịch Evolution sắp nhắc nhở bạn. Bộ nhắc nhở này đư�
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1388
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
@@ -4716,195 +4693,183 @@ msgid "Default reminder value"
 msgstr "Giá trị nhắc nhở mặc định"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Event Gradient"
-msgstr "Dốc sự kiện"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Event Transparency"
-msgstr "Độ trong suốt sự kiện"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "Địa chỉ Mạng của máy phục vụ Rảnh/Bận"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Free/busy template URL"
 msgstr "Địa chỉ Mạng mẫu Rảnh/Bận"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
-msgid "Gradient of the events in calendar views."
-msgstr "Dốc của các sự kiện trong ô xem lịch."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Hide completed tasks"
 msgstr "Ẩn mọi tác vụ hoàn tất"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Hide task units"
 msgstr "Ẩn đơn vị tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Hide task value"
 msgstr "Ẩn giá trị tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Horizontal pane position"
 msgstr "Ví trị ô cửa sổ ngang"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "Giờ kết thức ngày làm việc, có dạng 24 giờ (0-23)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "Giờ bắt đầu ngày làm việc, có dạng 24 giờ (0-23)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Hộp thời gian được hiển thị trong khung xem Ngày/Tuần làm việc, theo phút"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Last alarm time"
 msgstr "Giờ báo động cuối cùng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "List of server URLs for free/busy publishing."
 msgstr "Danh sách các địa chỉ Mạng kiểu máy phục vụ để xuất bản thông tin Rảnh/Bận."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Marcus Bains Line"
 msgstr "Dòng Marcus Bains"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Màu Dòng Marcus Bains — Xem ngày"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Màu Dòng Marcus Bains — Thanh thời gian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Phút kết thức ngày làm việc, 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Phút bắt đầu ngày làm việc, 0-59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Month view horizontal pane position"
 msgstr "Vị trí của ô cửa sổ ngang trong khung xem tháng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Month view vertical pane position"
 msgstr "Vị trí của ô cửa sổ dọc trong khung xem tháng"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Number of units for determining a default reminder."
 msgstr "Tổng số đơn vị để quyết định lúc nào nhắc nhở mặc định."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
 msgid "Number of units for determining when to hide tasks."
 msgstr "Tổng số đơn vị để quyết định lúc nào nên ẩn cộng việc."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
 msgid "Overdue tasks color"
 msgstr "Màu của tác vụ quá hạn"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
 "không phải trong khung xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "Ví trị của ô cửa sổ ngang, giữa khung xem và lịch duyệt ngày và danh sách "
 "tác vụ khi trong khung xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "Vị trí của ô cửa sổ dọc, giữa danh sách tác vụ và khung xem cộng việc, theo "
 "điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "Ví trị của ô cửa sổ dọc, giữa khung xem và lịch duyệt ngày và danh sách công "
 "việc khi trong khung xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 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 "Ví trị của ô cửa sổ ngang, giữa lịch duyệt ngày và danh sách tác vụ khi "
 "không phải trong khung xem tháng, theo điểm ảnh."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Chương trình mà bảo động có thể chạy."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Hiện trường RSVP trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Hiện trường Vai trò trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 msgid "Show appointment end times in week and month views"
 msgstr "Hiện thời điểm kết thúc cuộc hẹn trong khung xem tuần và tháng đều"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Hiện trường Hạng trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
 msgid "Show display alarms in notification tray"
 msgstr "Hiển thị báo động trong khay thông báo"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Hiện trường Trạng thái trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Show the \"Preview\" pane"
 msgstr "Hiện khung « Xem thử »"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Show the \"Preview\" pane."
 msgstr "Hiện khung « Xem thử »"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Hiện trường Múi giờ trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Hiện trường Kiểu trong bộ sửa cuộc họp/tác vụ/sự kiện"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 msgid "Show week numbers in date navigator"
 msgstr "Hiện số thứ tự tuần trong bộ duyệt ngày"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
 msgid "Tasks due today color"
 msgstr "Màu của tác vụ hết hạn vào hôm nay"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
 msgid "Tasks vertical pane position"
 msgstr "Ví trị ô cửa sổ dọc tác vụ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4913,142 +4878,135 @@ msgstr "Mẫu địa chỉ Mạng cần dùng là dữ liệu Rảnh/Bận phụ
 "bằng phần người dùng của địa chỉ thư, và « %d » được thay thế bằng miền của "
 "địa chỉ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "Múi giờ mặc định cần dùng cho ngày và giờ trong lịch, là ví trị cơ sở dữ "
 "liệu kiểu Olsen chưa dịch như «Asia/Hanoi» (Châu Á/Hà nội)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
 msgstr "Chia thời gian"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
 msgid "Time the last alarm ran, in time_t."
 msgstr "Giờ đã bảo động cuối cùng, theo time_t"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Transparency of the events in calendar views (A value between 0 and 10, "
-"opaque by default)."
-msgstr "Độ trong suốt của sự kiện trong ô xem lịch (giá trị giữa 0 và 10, đục theo "
-"mặc định)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 msgid "Twenty four hour time format"
 msgstr "Định dạng thời gian 24 giờ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Đơn vị cho bộ nhắc nhở mặc định: « phút », « giờ » hay « ngày »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "Đơn vị để quyết định lúc nào ẩn cộng việc: « phút », « giờ » hay « ngày »."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
 msgid "Week start"
 msgstr "Tuần bắt đầu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Hôm bắt đầu tuần, từ Chủ Nhật (0) đến Thứ Bảy (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Có nên dùng khay thông báo để hiển thị báo động hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Có nên hỏi xác nhận khi xoá bỏ cuộc hẹn hay tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Có nên hỏi xác nhận khi xoá hắn cuộc hẹn và tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "Có nên nén những ngày cuối tuần trong khung xem tháng, mà hiển thị hai ngày "
 "Thứ Bảy và Chủ Nhật đều là cùng cách của một ngày tuần."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Có nên hiển thị thời điểm kết thúc sự kiện trong khung xem tuần và tháng đều "
 "hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Có nên vẽ Dòng Marcus Bains (dòng tại giờ hiện có) trong lịch hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Có nên ẩn mọi tác vụ đã hoàn tất trong khung xem tác vụ hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
 msgid "Whether to set a default reminder for appointments."
 msgstr "Có nên lập bộ nhắc nhở mặc định cho mọi cuộc hẹn hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Có nên hiển thị trường RSVP trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Có nên hiển thị trường loại trong bộ sửa cuộc họp/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Có nên hiển thị trường Vai trò trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Có nên hiển thị trường trạng thái trong bộ sửa cuộc họp/tác vụ/dữ kiện hay "
 "không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Có nên hiển thị giờ dạng 24-giờ thay vào dùng am/pm (buổi sáng/buổi chiều-"
 "tối) hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Có nên hiển thị trường múi giờ trong bộ sửa cuộc họp/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Có nên hiển thị trường kiểu trong bộ sửa cuộc họp/tác vụ/sự kiện hay không"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Có nên hiển thị số thứ tự tuần trong bộ duyệt ngày hay không."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Work days"
 msgstr "Ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
 msgid "Workday end hour"
 msgstr "Giờ kết thúc ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Workday end minute"
 msgstr "Phút kết thúc ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Workday start hour"
 msgstr "Giờ bắt đầu ngày làm việc"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Workday start minute"
 msgstr "Phút bắt đầu ngày làm việc"
 
@@ -5084,7 +5042,7 @@ msgstr "In"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:709
-#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../calendar/gui/gnome-cal.c:2111
 #: ../plugins/exchange-operations/exchange-folder.c:580
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
@@ -5155,59 +5113,59 @@ msgstr "Không cập nhật lịch được."
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Không thể mở lịch « %s » để tạo sự kiện và cuộc họp."
 
-#: ../calendar/gui/calendar-component.c:1155
+#: ../calendar/gui/calendar-component.c:1152
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Không có lịch nào sẵn sàng để tạo sự kiện và cuộc họp."
 
-#: ../calendar/gui/calendar-component.c:1269
+#: ../calendar/gui/calendar-component.c:1266
 msgid "Calendar Source Selector"
 msgstr "Bộ chọn nguồn lịch"
 
-#: ../calendar/gui/calendar-component.c:1460
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1461
+#: ../calendar/gui/calendar-component.c:1458
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: ../calendar/gui/calendar-component.c:1462
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: ../calendar/gui/calendar-component.c:1468
+#: ../calendar/gui/calendar-component.c:1465
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1469
+#: ../calendar/gui/calendar-component.c:1466
 msgid "M_eeting"
 msgstr "_Cuộc họp"
 
-#: ../calendar/gui/calendar-component.c:1470
+#: ../calendar/gui/calendar-component.c:1467
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1473
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1474
 msgid "All Day A_ppointment"
 msgstr "Cuộc hẹn _nguyên ngày"
 
-#: ../calendar/gui/calendar-component.c:1478
+#: ../calendar/gui/calendar-component.c:1475
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1481
 msgid "New calendar"
 msgstr "Lịch mới"
 
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1482
 msgid "Cale_ndar"
 msgstr "_Lịch"
 
-#: ../calendar/gui/calendar-component.c:1486
+#: ../calendar/gui/calendar-component.c:1483
 msgid "Create a new calendar"
 msgstr "Tạo lịch mới"
 
@@ -5366,21 +5324,22 @@ msgstr "Th_êm"
 msgid "Alarms"
 msgstr "Báo động"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
+#: ../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:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
-msgid "_Suggest automatic display of attachment"
-msgstr "_Đề nghị hiển thị tự động đồ đính kèm"
+#: ../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"
+msgstr "Đề nghị tự động hiển thị đính kèm"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:2
-#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:2
 #: ../widgets/misc/e-attachment.glade.h:2
 msgid "Attachment Properties"
 msgstr "Thuộc tính đính kèm"
@@ -5389,20 +5348,20 @@ msgstr "Thuộc tính đính kèm"
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
 #: ../calendar/gui/e-itip-control.glade.h:6
-#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../composer/e-msg-composer-attachment.glade.h:3
 #: ../mail/mail-config.glade.h:69
 #: ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "Mô tả:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:3
+#: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "File name:"
 msgstr "Tên tập tin:"
 
 #: ../calendar/gui/dialogs/cal-attachment.glade.h:5
-#: ../composer/e-msg-composer-attachment.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:5
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "MIME type:"
 msgstr "Kiểu MIME:"
@@ -5467,7 +5426,7 @@ msgid "Display"
 msgstr "Hiển thị"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:592
+#: ../calendar/gui/dialogs/event-editor.c:574
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "Rảnh/Bận"
@@ -5563,7 +5522,7 @@ msgid "Thursday"
 msgstr "Thứ Năm"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "Múi _giờ:"
 
@@ -5653,43 +5612,45 @@ msgid "before every appointment"
 msgstr "trước mỗi cuộc hẹn"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:288
-msgid "Cop_y calendar contents locally for offline operation"
-msgstr "Chép nội dung lịch cục bộ để hoạt động ngoại tu_yến"
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Sao chép nội dung lịch về máy để phục vụ các thao tác ngoại tuyến."
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
-msgid "Cop_y task list contents locally for offline operation"
-msgstr "Chép nội dung danh sách tác vụ cục bộ để hoạt động ngoại tu_yến"
+#: ../calendar/gui/dialogs/calendar-setup.c:291
+msgid "Copy task list contents locally for offline operation"
+msgstr "Sao chép nội dung danh sách tác vụ về máy để phục vụ các thao tác ngoại tuyến"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
-msgid "Cop_y memo list contents locally for offline operation"
-msgstr "Chép nội dung danh sách ghi nhớ cục bộ để hoạt động ngoại tu_yến"
+#: ../calendar/gui/dialogs/calendar-setup.c:293
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Sao chép nội dung danh sách ghi nhớ về máy để phục vụ các thao tác ngoại "
+"tuyến"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "_Màu sắc:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Tasks List"
 msgstr "Danh sách tác vụ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memos List"
 msgstr "Danh sách Ghi nhớ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 msgid "Calendar Properties"
 msgstr "Thuộc tính Lịch"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:462
+#: ../calendar/gui/dialogs/calendar-setup.c:463
 msgid "New Calendar"
 msgstr "Lịch mới"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:528
+#: ../calendar/gui/dialogs/calendar-setup.c:529
 msgid "Task List Properties"
 msgstr "Thuộc tính Danh sách Tác vụ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/memos-component.c:450
 msgid "New Memo List"
 msgstr "Danh sách Ghi nhớ Mới"
 
@@ -5805,7 +5766,7 @@ msgid "Due "
 msgstr "Đến hạn "
 
 #: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2861
+#: ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "Thư đính kèm - %s"
@@ -5813,26 +5774,26 @@ msgstr "Thư đính kèm - %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:2866
-#: ../composer/e-msg-composer.c:3061
+#: ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3056
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d thư đính kèm"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3125
-#: ../mail/em-folder-tree.c:987
+#: ../composer/e-msg-composer.c:3121
+#: ../mail/em-folder-tree.c:980
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978
-#: ../mail/message-list.c:1743
+#: ../mail/em-folder-view.c:973
+#: ../mail/message-list.c:1725
 msgid "_Move"
 msgstr "_Di chuyển"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3127
-#: ../mail/em-folder-tree.c:989
-#: ../mail/message-list.c:1745
+#: ../composer/e-msg-composer.c:3123
+#: ../mail/em-folder-tree.c:982
+#: ../mail/message-list.c:1727
 msgid "Cancel _Drag"
 msgstr "Thôi _kéo"
 
@@ -5841,7 +5802,7 @@ msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
 #: ../calendar/gui/dialogs/comp-editor.c:945
-#: ../composer/e-msg-composer.c:2490
+#: ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5852,101 +5813,101 @@ msgid "Hide Attachment _Bar"
 msgstr "Ẩn thanh đính _kèm"
 
 #: ../calendar/gui/dialogs/comp-editor.c:980
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "Show Attachment _Bar"
 msgstr "Hiện thanh đính _kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1089
 #: ../calendar/gui/dialogs/event-page.c:1894
 #: ../calendar/gui/dialogs/meeting-page.c:899
 #: ../calendar/gui/dialogs/task-page.c:1198
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3623
+#: ../composer/e-msg-composer.c:3619
 #: ../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 "_Gỡ bỏ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1090
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3624
-#: ../mail/em-folder-tree.c:2065
+#: ../composer/e-msg-composer.c:3620
+#: ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59
 #: ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "Th_uộc tính"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1102
+#: ../calendar/gui/dialogs/comp-editor.c:1092
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3626
+#: ../composer/e-msg-composer.c:3622
 msgid "_Add attachment..."
 msgstr "Th_êm đính kèm..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2091
+#: ../calendar/gui/dialogs/comp-editor.c:1468
+#: ../mail/em-format-html-display.c:2065
 msgid "Show Attachments"
 msgstr "Hiện các đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1469
 msgid "Press space key to toggle attachment bar"
 msgstr "Bấm phím dài để bật/tắt thanh đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2097
-#: ../calendar/gui/dialogs/comp-editor.c:2140
+#: ../calendar/gui/dialogs/comp-editor.c:2076
+#: ../calendar/gui/dialogs/comp-editor.c:2119
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2103
-#: ../calendar/gui/dialogs/comp-editor.c:2146
+#: ../calendar/gui/dialogs/comp-editor.c:2082
+#: ../calendar/gui/dialogs/comp-editor.c:2125
 #, c-format
 msgid "Meeting - %s"
 msgstr "Cuộc họp - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2105
-#: ../calendar/gui/dialogs/comp-editor.c:2148
+#: ../calendar/gui/dialogs/comp-editor.c:2084
+#: ../calendar/gui/dialogs/comp-editor.c:2127
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2109
-#: ../calendar/gui/dialogs/comp-editor.c:2152
+#: ../calendar/gui/dialogs/comp-editor.c:2088
+#: ../calendar/gui/dialogs/comp-editor.c:2131
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Tác vụ đã gán - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2111
-#: ../calendar/gui/dialogs/comp-editor.c:2154
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
 #, c-format
 msgid "Task - %s"
 msgstr "Tác vụ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../calendar/gui/dialogs/comp-editor.c:2157
+#: ../calendar/gui/dialogs/comp-editor.c:2093
+#: ../calendar/gui/dialogs/comp-editor.c:2136
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2125
-#: ../calendar/gui/dialogs/comp-editor.c:2167
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2146
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2675
+#: ../calendar/gui/dialogs/comp-editor.c:2654
 #: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:518
-#: ../mail/em-utils.c:555
-#: ../widgets/misc/e-attachment-bar.c:399
+#: ../mail/em-utils.c:498
+#: ../mail/em-utils.c:535
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "đính kèm"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2764
-#: ../calendar/gui/dialogs/comp-editor.c:2818
-#: ../calendar/gui/dialogs/comp-editor.c:2842
+#: ../calendar/gui/dialogs/comp-editor.c:2743
+#: ../calendar/gui/dialogs/comp-editor.c:2797
+#: ../calendar/gui/dialogs/comp-editor.c:2821
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến vào."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2866
+#: ../calendar/gui/dialogs/comp-editor.c:2845
 msgid "Unable to use current version!"
 msgstr "Không thể dùng phiên bản hiện thời."
 
@@ -5962,10 +5923,6 @@ msgstr "Không thể mở đích."
 msgid "Destination is read only"
 msgstr "Đích chỉ cho phép đọc thôi."
 
-#: ../calendar/gui/dialogs/delete-comp.c:206
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_Xoá bỏ mục này ra hộp thư của mọi người nhận khác không?"
-
 #: ../calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Không thể xoá bỏ sự kiện này vi găp lỗi kiểu CORBA."
@@ -6027,11 +5984,11 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người ủy nhiệm"
 
-#: ../calendar/gui/dialogs/event-editor.c:565
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "Cuộc _hẹn"
 
-#: ../calendar/gui/dialogs/event-editor.c:569
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "Định kỳ"
@@ -6047,7 +6004,7 @@ msgid "Cale_ndar:"
 msgstr "_Lịch:"
 
 #: ../calendar/gui/dialogs/event-page.c:878
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
@@ -6147,7 +6104,7 @@ msgstr "Tùy chỉnh"
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:649
 #: ../calendar/gui/e-itip-control.c:1099
-#: ../composer/e-msg-composer.c:2282
+#: ../composer/e-msg-composer.c:2271
 #: ../filter/filter-rule.c:889
 #: ../mail/em-account-editor.c:701
 #: ../mail/em-account-editor.c:1388
@@ -6200,12 +6157,16 @@ msgstr "_Mô tả:"
 msgid "Event Description"
 msgstr "Mô tả sự kiện"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:12
+msgid "Locat_ion:"
+msgstr "_Địa điểm:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Tó_m tắt:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Alarm"
 msgstr "_Báo động"
 
@@ -6282,7 +6243,7 @@ msgstr "Trả lời trước"
 #: ../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:13
+#: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
 
@@ -6572,8 +6533,8 @@ msgstr "<span weight=\"bold\">Trạng thái</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:655
 #: ../calendar/gui/e-calendar-table.c:461
 #: ../calendar/gui/e-itip-control.c:891
-#: ../calendar/gui/e-meeting-store.c:194
-#: ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/print.c:2369
 #: ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
@@ -6582,7 +6543,7 @@ msgstr "Hoàn tất"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
 #: ../calendar/gui/e-calendar-table.c:386
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1012
 msgid "High"
 msgstr "Cao"
 
@@ -6599,15 +6560,15 @@ msgstr "Đang tiến hành"
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
 #: ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1010
 msgid "Low"
 msgstr "Thấp"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919
+#: ../calendar/gui/e-cal-model.c:918
 #: ../calendar/gui/e-calendar-table.c:387
-#: ../mail/message-list.c:1016
+#: ../mail/message-list.c:1011
 msgid "Normal"
 msgstr "Chuẩn"
 
@@ -6803,7 +6764,7 @@ msgstr "%s cho kiểu gây ra lạ"
 
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70
-#: ../mail/em-folder-view.c:2832
+#: ../mail/em-folder-view.c:2822
 #, c-format
 msgid "Click to open %s"
 msgstr "Nhấn để mở %s"
@@ -6892,7 +6853,7 @@ msgstr "Rảnh"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:439
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:411
 msgid "Busy"
 msgstr "Bận"
 
@@ -6906,19 +6867,19 @@ msgstr "Vị trí địa lý phải được nhập theo dạng thức:\n"
 "10.783114,106.699804 (Sài Gòn)"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/e-meeting-store.c:175
+#: ../calendar/gui/e-meeting-store.c:761
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Có"
 
 #: ../calendar/gui/e-cal-model-tasks.c:1005
-#: ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model.c:924
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:177
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Không"
@@ -6932,23 +6893,23 @@ msgstr "Không"
 #: ../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:1329
+#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../mail/em-utils.c:1309
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:746
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "Không biết"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:920
 msgid "Recurring"
 msgstr "Lặp lại"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:922
 msgid "Assigned"
 msgstr "Đã gán"
 
@@ -6958,7 +6919,7 @@ msgid "Save As..."
 msgstr "Lưu dạng..."
 
 #: ../calendar/gui/e-cal-popup.c:193
-#: ../mail/em-format-html-display.c:1939
+#: ../mail/em-format-html-display.c:1913
 msgid "Select folder to save selected attachments..."
 msgstr "Chọn thư mục nơi cần lưu những đính kèm đã chọn..."
 
@@ -6970,10 +6931,10 @@ msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
 #: ../calendar/gui/e-cal-popup.c:276
-#: ../calendar/gui/e-calendar-table.c:1243
-#: ../calendar/gui/e-calendar-view.c:1699
-#: ../calendar/gui/e-memo-table.c:846
-#: ../mail/em-folder-view.c:1092
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1596
+#: ../calendar/gui/e-memo-table.c:854
+#: ../mail/em-folder-view.c:1087
 #: ../mail/em-popup.c:554
 #: ../mail/em-popup.c:565
 msgid "_Save As..."
@@ -7045,29 +7006,29 @@ msgstr "100%"
 msgid "Deleting selected objects"
 msgstr "Đang xoá bỏ các đối tượng đã chọn..."
 
-#: ../calendar/gui/e-calendar-table.c:956
+#: ../calendar/gui/e-calendar-table.c:882
 #: ../calendar/gui/e-calendar-view.c:803
 #: ../calendar/gui/e-memo-table.c:610
 msgid "Updating objects"
 msgstr "Đang cập nhật các đối tượng..."
 
-#: ../calendar/gui/e-calendar-table.c:1105
-#: ../calendar/gui/e-calendar-view.c:1248
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-table.c:1032
+#: ../calendar/gui/e-calendar-view.c:1138
+#: ../calendar/gui/e-memo-table.c:742
 #: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "Lưu dạng..."
 
-#: ../calendar/gui/e-calendar-table.c:1242
-#: ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1175
+#: ../calendar/gui/e-memo-table.c:853
 msgid "Open _Web Page"
 msgstr "Mở trang _Mạng"
 
-#: ../calendar/gui/e-calendar-table.c:1244
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700
-#: ../calendar/gui/e-memo-table.c:847
-#: ../mail/em-folder-view.c:1093
+#: ../calendar/gui/e-calendar-table.c:1177
+#: ../calendar/gui/e-calendar-view.c:1581
+#: ../calendar/gui/e-calendar-view.c:1597
+#: ../calendar/gui/e-memo-table.c:855
+#: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58
 #: ../ui/evolution-calendar.xml.h:44
@@ -7077,9 +7038,9 @@ msgstr "Mở trang _Mạng"
 msgid "_Print..."
 msgstr "_In..."
 
-#: ../calendar/gui/e-calendar-table.c:1248
-#: ../calendar/gui/e-calendar-view.c:1704
-#: ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-table.c:1181
+#: ../calendar/gui/e-calendar-view.c:1601
+#: ../calendar/gui/e-memo-table.c:859
 #: ../ui/evolution-addressbook.xml.h:2
 #: ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1
@@ -7087,10 +7048,10 @@ msgstr "_In..."
 msgid "C_ut"
 msgstr "Cắ_t"
 
-#: ../calendar/gui/e-calendar-table.c:1250
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706
-#: ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1584
+#: ../calendar/gui/e-calendar-view.c:1603
+#: ../calendar/gui/e-memo-table.c:861
 #: ../ui/evolution-addressbook.xml.h:57
 #: ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15
@@ -7100,30 +7061,30 @@ msgstr "Cắ_t"
 msgid "_Paste"
 msgstr "_Dán"
 
-#: ../calendar/gui/e-calendar-table.c:1254
+#: ../calendar/gui/e-calendar-table.c:1187
 #: ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Gán Tác vụ"
 
-#: ../calendar/gui/e-calendar-table.c:1255
-#: ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1188
+#: ../calendar/gui/e-memo-table.c:865
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Chuyển dạng iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1256
+#: ../calendar/gui/e-calendar-table.c:1189
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: ../calendar/gui/e-calendar-table.c:1257
+#: ../calendar/gui/e-calendar-table.c:1190
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu các tác vụ đã chọn là hoàn tất"
 
-#: ../calendar/gui/e-calendar-table.c:1262
+#: ../calendar/gui/e-calendar-table.c:1195
 msgid "_Delete Selected Tasks"
 msgstr "_Xoá bỏ các tác vụ đã chọn"
 
-#: ../calendar/gui/e-calendar-table.c:1495
+#: ../calendar/gui/e-calendar-table.c:1428
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Nhấn để thêm tác vụ"
@@ -7159,109 +7120,109 @@ msgstr "Ngày bắt đầu"
 msgid "Task sort"
 msgstr "Sắp xếp tác vụ"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1264
 msgid "Moving items"
 msgstr "Đang di chuyển mục..."
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1266
 msgid "Copying items"
 msgstr "Đang sao chép mục..."
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1575
 msgid "New _Appointment..."
 msgstr "Cuộc hẹ_n mới..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1576
 msgid "New All Day _Event"
 msgstr "Sự _kiện nguyên ngày mới"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1577
 msgid "New _Meeting"
 msgstr "Cuộc _họp mới"
 
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-view.c:1578
 msgid "New _Task"
 msgstr "_Tác vụ mới"
 
 #.FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1588
 msgid "_Current View"
 msgstr "_Khung xem hiện thời"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1590
 msgid "Select T_oday"
 msgstr "Chọn h_ôm nay"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1591
 msgid "_Select Date..."
 msgstr "_Chọn ngày..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1607
 msgid "Cop_y to Calendar..."
 msgstr "_Chép vào Lịch..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1608
 msgid "Mo_ve to Calendar..."
 msgstr "_Chuyển vào Lịch..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1609
 msgid "_Delegate Meeting..."
 msgstr "Ủ_y nhiệm cuộc họp..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1610
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1611
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển dạng iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1612
 msgid "_Reply"
 msgstr "T_rả lời"
 
-#: ../calendar/gui/e-calendar-view.c:1716
-#: ../mail/em-folder-view.c:1087
+#: ../calendar/gui/e-calendar-view.c:1613
+#: ../mail/em-folder-view.c:1082
 #: ../mail/em-popup.c:559
 #: ../mail/em-popup.c:570
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1618
 msgid "Make this Occurrence _Movable"
 msgstr "Cho phép di chuyển _lần này"
 
-#: ../calendar/gui/e-calendar-view.c:1722
+#: ../calendar/gui/e-calendar-view.c:1619
 #: ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "_Xoá bỏ lần này"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1620
 msgid "Delete _All Occurrences"
 msgstr "Xoá bỏ _mọi lần"
 
 #.To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2033
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Tổ chức: %s <%s>"
 
 #.With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2037
 #, c-format
 msgid "Organizer: %s"
 msgstr "Tổ chức: %s"
 
 #.To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195
+#: ../calendar/gui/e-calendar-view.c:2053
 #: ../calendar/gui/print.c:2336
 #, c-format
 msgid "Location: %s"
 msgstr "Địa điểm: %s"
 
 #.To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2084
 #, c-format
 msgid "Time: %s %s"
 msgstr "Giờ: %s %s"
@@ -7290,7 +7251,7 @@ msgstr "Ngày phải được nhập theo dạng thức: \n"
 #.* 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:552
 #, c-format
 msgid "%02i minute divisions"
 msgstr "lệch %02i phút"
@@ -7301,23 +7262,22 @@ msgstr "lệch %02i phút"
 #.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:1311
-#: ../calendar/gui/e-day-view.c:1534
-#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524
+#: ../calendar/gui/e-day-view-top-item.c:707
+#: ../calendar/gui/e-day-view.c:1486
+#: ../calendar/gui/e-week-view-main-item.c:312
 #: ../calendar/gui/print.c:1525
 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:745
+#: ../calendar/gui/e-day-view.c:744
 #: ../calendar/gui/e-week-view.c:503
 #: ../calendar/gui/print.c:841
 msgid "am"
 msgstr "sáng"
 
 #.String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:748
+#: ../calendar/gui/e-day-view.c:747
 #: ../calendar/gui/e-week-view.c:506
 #: ../calendar/gui/print.c:843
 msgid "pm"
@@ -7425,8 +7385,8 @@ msgstr "<br>Vui lòng xem lại các chỉ dẫn sau và chọn một hành đ�
 
 #: ../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/e-meeting-store.c:185
+#: ../calendar/gui/e-meeting-store.c:208
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
@@ -7440,8 +7400,8 @@ msgstr "Tạm đã chấp nhận"
 
 #: ../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/e-meeting-store.c:187
+#: ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/itip-utils.c:675
 #: ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1645
@@ -7776,74 +7736,74 @@ msgid "Resources"
 msgstr "Tài nguyên"
 
 #: ../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:758
+#: ../calendar/gui/e-meeting-store.c:98
+#: ../calendar/gui/e-meeting-store.c:115
+#: ../calendar/gui/e-meeting-store.c:755
 msgid "Individual"
 msgstr "Riêng lẻ"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:100
+#: ../calendar/gui/e-meeting-store.c:117
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
 msgstr "Nhóm"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103
-#: ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:102
+#: ../calendar/gui/e-meeting-store.c:119
 msgid "Resource"
 msgstr "Tài nguyên"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105
-#: ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:104
+#: ../calendar/gui/e-meeting-store.c:121
 msgid "Room"
 msgstr "Phòng"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:133
+#: ../calendar/gui/e-meeting-store.c:150
 msgid "Chair"
 msgstr "Chủ trì"
 
 #: ../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:761
+#: ../calendar/gui/e-meeting-store.c:135
+#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:758
 msgid "Required Participant"
 msgstr "Người dự cần thiết"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138
-#: ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:137
+#: ../calendar/gui/e-meeting-store.c:154
 msgid "Optional Participant"
 msgstr "Người dự tùy chọn"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140
-#: ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:139
+#: ../calendar/gui/e-meeting-store.c:156
 msgid "Non-Participant"
 msgstr "Người không tham dự"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:183
+#: ../calendar/gui/e-meeting-store.c:206
+#: ../calendar/gui/e-meeting-store.c:768
 msgid "Needs Action"
 msgstr "Cần hành động"
 
 #: ../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
+#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-time-sel.c:410
 msgid "Tentative"
 msgstr "Ướm"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:191
+#: ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
@@ -7854,15 +7814,15 @@ msgstr "Ủy nhiệm"
 msgid "Attendee                          "
 msgstr "Người dự                          "
 
-#: ../calendar/gui/e-meeting-store.c:196
-#: ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:195
+#: ../calendar/gui/e-meeting-store.c:218
 msgid "In Process"
 msgstr "Trong tiến trình"
 
 #.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:447
-#: ../calendar/gui/e-meeting-time-sel.c:2113
+#: ../calendar/gui/e-meeting-time-sel-item.c:442
+#: ../calendar/gui/e-meeting-time-sel.c:2100
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7870,87 +7830,87 @@ msgstr "%A, %d %B, %Y"
 #.name, %m = month number, %d = month day, %Y = full year.
 #.This is a strftime() format string %a = abbreviated weekday name,
 #.%m = month number, %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:451
-#: ../calendar/gui/e-meeting-time-sel.c:2146
+#: ../calendar/gui/e-meeting-time-sel-item.c:446
+#: ../calendar/gui/e-meeting-time-sel.c:2133
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #.This is a strftime() format string %m = month number,
 #.%d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:455
+#: ../calendar/gui/e-meeting-time-sel-item.c:450
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:412
 #: ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ở ngoại văn phòng"
 
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "No Information"
 msgstr "Không có thông tin"
 
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:427
 msgid "A_ttendees..."
 msgstr "Người _dự..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:444
 msgid "O_ptions"
 msgstr "Tù_y chọn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:461
 msgid "Show _only working hours"
 msgstr "Hiện chỉ giờ làm _việc thôi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "Show _zoomed out"
 msgstr "Hiện Thu _nhỏ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_Update free/busy"
 msgstr "_Cập nhật Rảnh/Bận"
 
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:501
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid "_Autopick"
 msgstr "_Tự động chọn"
 
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:534
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:551
 msgid "_All people and resources"
 msgstr "_Mọi người và tài nguyên đều"
 
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "All _people and one resource"
 msgstr "Mọi người và mộ_t tài nguyên"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:569
 msgid "_Required people"
 msgstr "Người _cần thiết"
 
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Required people and _one resource"
 msgstr "Người cần thiết _và một tài nguyên"
 
-#: ../calendar/gui/e-meeting-time-sel.c:615
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u :"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:641
 msgid "_End time:"
 msgstr "Thời điểm _cuối:"
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:870
 msgid "_Delete Selected Memos"
 msgstr "Xoá bỏ các ghi nhớ đã chọn"
 
-#: ../calendar/gui/e-memo-table.c:985
+#: ../calendar/gui/e-memo-table.c:993
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Nhấn để thêm ghi nhớ"
@@ -8012,8 +7972,7 @@ msgstr "Chọn múi giờ"
 #.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:327
-#: ../calendar/gui/e-week-view-main-item.c:541
+#: ../calendar/gui/e-week-view-main-item.c:329
 #: ../calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%d %B"
@@ -8168,10 +8127,6 @@ msgstr "Thông tin iCalendar"
 msgid "You must be an attendee of the event."
 msgstr "Bạn phải là người dự sự kiện ấy."
 
-#: ../calendar/gui/memos-component.c:450
-msgid "_New Memo List"
-msgstr "Danh sách ghi _nhớ mới"
-
 #: ../calendar/gui/memos-component.c:526
 #, c-format
 msgid "%d memo"
@@ -8571,7 +8526,7 @@ msgstr "_Danh sách tác vụ"
 msgid "Create a new task list"
 msgstr "Tạo danh sách tác vụ mới"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:438
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8582,11 +8537,11 @@ msgstr "Thao tác này sẽ xoá bỏ hoàn toàn mọi tác vụ được đán
 "\n"
 "Bạn có thật sự muốn xoá bỏ những tác vụ này sao?"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:441
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa."
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:475
 msgid "Print Tasks"
 msgstr "In tác vụ"
 
@@ -10182,7 +10137,7 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1048
+#: ../widgets/misc/e-attachment-bar.c:988
 msgid "Attachment Bar"
 msgstr "Thanh đính kèm"
 
@@ -10192,8 +10147,8 @@ msgstr "Thanh đính kèm"
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238
 #: ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:444
-#: ../widgets/misc/e-attachment.c:462
+#: ../widgets/misc/e-attachment.c:441
+#: ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Không thể đính kèm tập tin « %s »: %s"
@@ -10201,20 +10156,20 @@ msgstr "Không thể đính kèm tập tin « %s »: %s"
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:246
-#: ../widgets/misc/e-attachment.c:453
+#: ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Không thể đính kèm tập tin « %s »: không phải tập tin bình thường."
 
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "Đích gửi đến"
 
-#: ../composer/e-msg-composer-hdrs.c:560
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "Hãy chọn các thư mục nơi cần gởi thư."
 
-#: ../composer/e-msg-composer-hdrs.c:592
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "Nhấn đây để xem Sổ địa chỉ"
 
@@ -10225,45 +10180,45 @@ msgstr "Nhấn đây để xem Sổ địa chỉ"
 #.* because that causes from_changed to be called, which
 #.* expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:624
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "T_rả lời cho :"
 
 #.
 #.* From
 #.
-#: ../composer/e-msg-composer-hdrs.c:631
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "_Từ :"
 
 #.
 #.* Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:638
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "C_hủ đề:"
 
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "Ch_o :"
 
-#: ../composer/e-msg-composer-hdrs.c:648
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "Hãy gõ người nhận thư"
 
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-msg-composer-hdrs.c:652
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Chép cho: hãy gõ các địa chỉ sẽ nhận một bản sao của thư ấy."
 
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-msg-composer-hdrs.c:656
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10274,15 +10229,15 @@ msgstr "Bí mật Chép cho: hãy gõ các địa chỉ sẽ nhận một bản
 #.
 #.* Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "_Gửi tới:"
 
-#: ../composer/e-msg-composer-hdrs.c:668
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "Nhấn vào đây để chọn thư mục nơi cần gởi"
 
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "Gửi tới:"
 
@@ -10290,7 +10245,7 @@ msgstr "Gửi tới:"
 msgid "A_ttach"
 msgstr "Đính _kèm"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:239
 msgid "Insert Attachment"
 msgstr "Chèn đính kèm"
 
@@ -10307,13 +10262,13 @@ msgstr "Không thể mật mã hoá thư gửi đi: chưa lập chứng nhận m
 "này."
 
 #: ../composer/e-msg-composer.c:1295
-#: ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "Ẩn thanh đính _kèm"
 
 #: ../composer/e-msg-composer.c:1298
-#: ../composer/e-msg-composer.c:2522
-#: ../composer/e-msg-composer.c:3869
+#: ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3865
 msgid "Show _Attachment Bar"
 msgstr "Hiện thanh đính _kèm"
 
@@ -10340,24 +10295,24 @@ msgstr "Thư không tên"
 msgid "Open File"
 msgstr "Mở tập tin"
 
-#: ../composer/e-msg-composer.c:2162
+#: ../composer/e-msg-composer.c:2151
 #: ../mail/em-account-editor.c:606
 #: ../mail/em-account-editor.c:651
 #: ../mail/em-account-editor.c:718
 msgid "Autogenerated"
 msgstr "Tự động phát sinh"
 
-#: ../composer/e-msg-composer.c:2265
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "Chữ _ký:"
 
-#: ../composer/e-msg-composer.c:2533
-#: ../composer/e-msg-composer.c:3751
-#: ../composer/e-msg-composer.c:3754
+#: ../composer/e-msg-composer.c:2522
+#: ../composer/e-msg-composer.c:3747
+#: ../composer/e-msg-composer.c:3750
 msgid "Compose Message"
 msgstr "Viết thư"
 
-#: ../composer/e-msg-composer.c:4978
+#: ../composer/e-msg-composer.c:4974
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10500,7 +10455,7 @@ msgstr "_Lưu thư"
 # Name: do not translate/ tên: đừng dịch
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:522
+#: ../shell/main.c:515
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -10619,14 +10574,14 @@ msgid ""
 msgstr "Khi bạn nhận một thư yêu cầu nhận thông báo đã đọc, trình Evolution nên làm "
 "gì vậy?"
 
-#: ../e-util/e-dialog-utils.c:283
+#: ../e-util/e-dialog-utils.c:281
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Tập tin tên này đã có.\n"
 "Ghi đè lên nó không?"
 
-#: ../e-util/e-dialog-utils.c:285
+#: ../e-util/e-dialog-utils.c:283
 #: ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "Ghi đè lên tập tin không?"
@@ -10742,28 +10697,27 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Chọn thời điểm để đối chiếu"
 
-#: ../filter/filter-file.c:293
-#: ../filter/filter-file.c:299
+#: ../filter/filter-file.c:289
 msgid "Choose a file"
 msgstr "Chọn tập tin"
 
 #: ../filter/filter-label.c:121
 #: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053
+#: ../mail/em-migrate.c:1052
 #: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "Quan trọng"
 
 #.forest green
 #: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1056
+#: ../mail/em-migrate.c:1055
 #: ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "Cần làm"
 
 #.blue
 #: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1057
+#: ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "Sau đó"
@@ -10815,12 +10769,12 @@ msgstr "Gồm các nhánh"
 
 #: ../filter/filter-rule.c:986
 #: ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:328
+#: ../mail/em-utils.c:311
 msgid "Incoming"
 msgstr "Đến vào"
 
 #: ../filter/filter-rule.c:986
-#: ../mail/em-utils.c:329
+#: ../mail/em-utils.c:312
 msgid "Outgoing"
 msgstr "Gửi đi"
 
@@ -10915,7 +10869,7 @@ msgid "months"
 msgstr "tháng"
 
 #: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:178
 msgid "seconds"
 msgstr "giây"
 
@@ -10985,7 +10939,7 @@ msgid "Evolution Mail preferences control"
 msgstr "Bộ điều khiển tùy thích thư tín Evolution."
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:518
+#: ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
 #: ../mail/importers/pine-importer.c:387
@@ -11124,7 +11078,7 @@ msgstr "Giao thức"
 
 #: ../mail/em-composer-prefs.c:311
 #: ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:999
+#: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "Không tên"
 
@@ -11308,7 +11262,7 @@ msgid "Junk Test"
 msgstr "Kiểm tra Rác"
 
 #: ../mail/em-filter-i18n.h:37
-#: ../widgets/misc/e-expander.c:190
+#: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Nhãn"
 
@@ -11387,7 +11341,6 @@ msgid "Score"
 msgstr "Điểm"
 
 #: ../mail/em-filter-i18n.h:56
-#: ../mail/message-list.etspec.h:11
 msgid "Sender"
 msgstr "Người gửi"
 
@@ -11420,11 +11373,11 @@ msgid "Stop Processing"
 msgstr "Dừng xử lý"
 
 #: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1659
+#: ../mail/em-format-html.c:1584
 #: ../mail/em-format-quote.c:313
 #: ../mail/em-format.c:849
 #: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -11514,53 +11467,53 @@ msgstr "Đã gửi"
 msgid "Loading..."
 msgstr "Đang tải..."
 
-#: ../mail/em-folder-tree.c:701
+#: ../mail/em-folder-tree.c:694
 msgid "Mail Folder Tree"
 msgstr "Cây thư mục thư"
 
-#: ../mail/em-folder-tree.c:861
+#: ../mail/em-folder-tree.c:854
 #, c-format
 msgid "Moving folder %s"
 msgstr "Đang chuyển thư mục %s..."
 
-#: ../mail/em-folder-tree.c:863
+#: ../mail/em-folder-tree.c:856
 #, c-format
 msgid "Copying folder %s"
 msgstr "Đang sao chép thư mục %s..."
 
-#: ../mail/em-folder-tree.c:870
-#: ../mail/message-list.c:1647
+#: ../mail/em-folder-tree.c:863
+#: ../mail/message-list.c:1629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Đang chuyển thư vào thư mục %s..."
 
-#: ../mail/em-folder-tree.c:872
-#: ../mail/message-list.c:1649
+#: ../mail/em-folder-tree.c:865
+#: ../mail/message-list.c:1631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Đang sao chép thư vào thư mục %s..."
 
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:881
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Không thể thả thư vào kho mức độ đỉnh"
 
-#: ../mail/em-folder-tree.c:984
+#: ../mail/em-folder-tree.c:977
 #: ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "_Chép vào thư mục"
 
-#: ../mail/em-folder-tree.c:985
+#: ../mail/em-folder-tree.c:978
 #: ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "Chu_yển vào thư mục"
 
-#: ../mail/em-folder-tree.c:1690
-#: ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1683
+#: ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét các thư mục trong « %s »..."
 
-#: ../mail/em-folder-tree.c:2049
+#: ../mail/em-folder-tree.c:2042
 #: ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24
 #: ../ui/evolution-mail-global.xml.h:24
@@ -11571,29 +11524,29 @@ msgstr "Đang quét các thư mục trong « %s »..."
 msgid "_View"
 msgstr "_Xem"
 
-#: ../mail/em-folder-tree.c:2050
+#: ../mail/em-folder-tree.c:2043
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ _mới"
 
-#: ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-tree.c:2047
 msgid "_Copy..."
 msgstr "_Chép..."
 
-#: ../mail/em-folder-tree.c:2055
+#: ../mail/em-folder-tree.c:2048
 msgid "_Move..."
 msgstr "Chu_yển..."
 
 #.FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2059
+#: ../mail/em-folder-tree.c:2052
 msgid "_New Folder..."
 msgstr "Thư mục _mới..."
 
-#: ../mail/em-folder-tree.c:2062
+#: ../mail/em-folder-tree.c:2055
 #: ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "Đổi t_ên..."
 
-#: ../mail/em-folder-tree.c:2067
+#: ../mail/em-folder-tree.c:2060
 #: ../mail/mail.error.xml.h:126
 msgid "_Empty Trash"
 msgstr "Đổ _Rác"
@@ -11604,15 +11557,15 @@ msgid "Copying `%s' to `%s'"
 msgstr "Đang sao chép « %s » vào « %s »..."
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:978
-#: ../mail/em-folder-view.c:993
+#: ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
 #: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:993
+#: ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "_Chép"
 
@@ -11634,219 +11587,219 @@ msgstr "Tạo thư mục"
 msgid "Specify where to create the folder:"
 msgstr "Xác định nơi tạo thư mục:"
 
-#: ../mail/em-folder-view.c:1086
+#: ../mail/em-folder-view.c:1081
 #: ../ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: ../mail/em-folder-view.c:1088
+#: ../mail/em-folder-view.c:1083
 #: ../mail/em-popup.c:561
 #: ../mail/em-popup.c:572
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "Chuyển t_iếp"
 
-#: ../mail/em-folder-view.c:1091
+#: ../mail/em-folder-view.c:1086
 #: ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh dạng thư mới..."
 
-#: ../mail/em-folder-view.c:1097
+#: ../mail/em-folder-view.c:1092
 msgid "U_ndelete"
 msgstr "_Hủy xoá bỏ"
 
-#: ../mail/em-folder-view.c:1098
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
 msgstr "Ch_uyển sang thư mục..."
 
-#: ../mail/em-folder-view.c:1099
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "_Chép vào thư mục..."
 
-#: ../mail/em-folder-view.c:1102
+#: ../mail/em-folder-view.c:1097
 msgid "Mar_k as Read"
 msgstr "Đánh dấu Đã đọ_c"
 
-#: ../mail/em-folder-view.c:1103
+#: ../mail/em-folder-view.c:1098
 msgid "Mark as _Unread"
 msgstr "Đánh dấu _Chưa đọc"
 
-#: ../mail/em-folder-view.c:1104
+#: ../mail/em-folder-view.c:1099
 msgid "Mark as _Important"
 msgstr "Đánh dấu _Quan trọng"
 
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-folder-view.c:1100
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: ../mail/em-folder-view.c:1106
+#: ../mail/em-folder-view.c:1101
 msgid "Mark as _Junk"
 msgstr "Đánh dấu _Rác"
 
-#: ../mail/em-folder-view.c:1107
+#: ../mail/em-folder-view.c:1102
 msgid "Mark as _Not Junk"
 msgstr "Đánh dấu Kh_ông phải rác"
 
-#: ../mail/em-folder-view.c:1108
+#: ../mail/em-folder-view.c:1103
 msgid "Mark for Follo_w Up..."
 msgstr "Đánh dấu Cần theo _dõi tiếp..."
 
-#: ../mail/em-folder-view.c:1110
+#: ../mail/em-folder-view.c:1105
 msgid "_Label"
 msgstr "_Nhãn"
 
-#: ../mail/em-folder-view.c:1111
+#: ../mail/em-folder-view.c:1106
 msgid "_None"
 msgstr "_Không có"
 
-#: ../mail/em-folder-view.c:1116
+#: ../mail/em-folder-view.c:1111
 msgid "Fla_g Completed"
 msgstr "Cờ _hoàn tất"
 
-#: ../mail/em-folder-view.c:1117
+#: ../mail/em-folder-view.c:1112
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: ../mail/em-folder-view.c:1120
+#: ../mail/em-folder-view.c:1115
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc trên thư"
 
-#: ../mail/em-folder-view.c:1121
+#: ../mail/em-folder-view.c:1116
 msgid "Search Folder from _Subject"
 msgstr "Thư mục tìm kiếm trên _Chủ đề"
 
-#: ../mail/em-folder-view.c:1122
+#: ../mail/em-folder-view.c:1117
 msgid "Search Folder from Se_nder"
 msgstr "Thư mục tìm kiếm trên Người _gửi"
 
-#: ../mail/em-folder-view.c:1123
+#: ../mail/em-folder-view.c:1118
 msgid "Search Folder from _Recipients"
 msgstr "Thư mục tìm kiếm trên Người _nhận"
 
-#: ../mail/em-folder-view.c:1124
+#: ../mail/em-folder-view.c:1119
 msgid "Search Folder from Mailing _List"
 msgstr "Thư mục tìm kiếm trên _Hộp thư chung"
 
-#: ../mail/em-folder-view.c:1128
+#: ../mail/em-folder-view.c:1123
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _Chủ đề"
 
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-view.c:1124
 msgid "Filter on Sen_der"
 msgstr "Lọc theo Người _gửi"
 
-#: ../mail/em-folder-view.c:1130
+#: ../mail/em-folder-view.c:1125
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo Người _nhận"
 
-#: ../mail/em-folder-view.c:1131
+#: ../mail/em-folder-view.c:1126
 msgid "Filter on _Mailing List"
 msgstr "Lọc  theo _Hộp thư chung"
 
 #.default charset used in mail view
-#: ../mail/em-folder-view.c:1972
-#: ../mail/em-folder-view.c:2016
+#: ../mail/em-folder-view.c:1967
+#: ../mail/em-folder-view.c:2011
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../mail/em-folder-view.c:2115
+#: ../mail/em-folder-view.c:2110
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
 msgstr "In thư"
 
-#: ../mail/em-folder-view.c:2271
+#: ../mail/em-folder-view.c:2266
 msgid "Unable to retrieve message"
 msgstr "Không thể nhận thư."
 
-#: ../mail/em-folder-view.c:2469
+#: ../mail/em-folder-view.c:2459
+msgid "_Copy Link Location"
+msgstr "_Chép địa chỉ liên kết"
+
+#: ../mail/em-folder-view.c:2461
 msgid "Create _Search Folder"
 msgstr "Tạo Thư mục tìm _kiếm"
 
-#: ../mail/em-folder-view.c:2470
+#: ../mail/em-folder-view.c:2462
 msgid "_From this Address"
 msgstr "_Từ địa chỉ này"
 
-#: ../mail/em-folder-view.c:2471
+#: ../mail/em-folder-view.c:2463
 msgid "_To this Address"
 msgstr "_Cho địa chỉ này"
 
-#: ../mail/em-folder-view.c:2825
+#: ../mail/em-folder-view.c:2817
 #, c-format
 msgid "Click to mail %s"
 msgstr "Nhấn để gửi thư cho %s"
 
-#: ../mail/em-folder-view.c:2830
-msgid "Click to hide/unhide addresses"
-msgstr "Nhấn để (bỏ) ẩn địa chỉ"
-
 #.message-search popup match count string
-#: ../mail/em-format-html-display.c:499
+#: ../mail/em-format-html-display.c:496
 #, c-format
 msgid "Matches: %d"
 msgstr "Khớp: %d"
 
-#: ../mail/em-format-html-display.c:781
-#: ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "Chưa ký"
 
-#: ../mail/em-format-html-display.c:781
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Thư này không có chữ ký nên không thể đảm bảo thư này do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:782
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:757
+#: ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "Chữ ký hợp lệ"
 
-#: ../mail/em-format-html-display.c:782
+#: ../mail/em-format-html-display.c:757
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Thư này có chữ ký và hợp lệ nên rất có thể là thư ấy do người ấy gửi."
 
-#: ../mail/em-format-html-display.c:783
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:758
+#: ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "Chữ ký không hợp lệ"
 
-#: ../mail/em-format-html-display.c:783
+#: ../mail/em-format-html-display.c:758
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Không thể xác minh chữ ký của thư này: có lẽ nó bị giả trong khi truyền."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid "Valid signature, cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html-display.c:784
+#: ../mail/em-format-html-display.c:759
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "Thư này có chữ ký hợp lệ, nhưng mà không thể xác minh người gửi thư."
 
-#: ../mail/em-format-html-display.c:790
-#: ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "Không mật mã"
 
-#: ../mail/em-format-html-display.c:790
+#: ../mail/em-format-html-display.c:765
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "Thư này không mật mã nên bất cứ người nào có xem được nội dung nó trong khi "
 "truyền qua Mạng."
 
-#: ../mail/em-format-html-display.c:791
-#: ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:766
+#: ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "Mật mã yếu"
 
-#: ../mail/em-format-html-display.c:791
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11854,23 +11807,23 @@ msgid ""
 msgstr "Thư này mật mã, nhưng mà dùng thuật toán mật mã yếu. Người khác sẽ gặp khó "
 "khăn đọc thư này được một thời gian hữu ích, nhưng mà có thể làm như thế."
 
-#: ../mail/em-format-html-display.c:792
-#: ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:767
+#: ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "Mật mã"
 
-#: ../mail/em-format-html-display.c:792
+#: ../mail/em-format-html-display.c:767
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr "Thư này mật mã. Người khác sẽ gặp khó khăn nhiều đọc nội dung thư."
 
-#: ../mail/em-format-html-display.c:793
-#: ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:768
+#: ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "Mật mã mạnh"
 
-#: ../mail/em-format-html-display.c:793
+#: ../mail/em-format-html-display.c:768
 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 "
@@ -11878,74 +11831,74 @@ msgid ""
 msgstr "Thư này mật mã dùng thuật toán mật mã mạnh. Người khác sẽ gặp khó khăn rất "
 "nhiều đọc nội dung thư được thời gian hữu ích. "
 
-#: ../mail/em-format-html-display.c:894
+#: ../mail/em-format-html-display.c:869
 #: ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Xem Chứng nhận"
 
-#: ../mail/em-format-html-display.c:909
+#: ../mail/em-format-html-display.c:884
 msgid "This certificate is not viewable"
 msgstr "Chứng nhận này không có khả năng xem"
 
-#: ../mail/em-format-html-display.c:1200
+#: ../mail/em-format-html-display.c:1174
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Hoàn tất vào %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1208
+#: ../mail/em-format-html-display.c:1182
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: ../mail/em-format-html-display.c:1211
+#: ../mail/em-format-html-display.c:1185
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "trước %d %B, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1271
+#: ../mail/em-format-html-display.c:1245
 msgid "_View Inline"
 msgstr "_Xem trực tiếp"
 
-#: ../mail/em-format-html-display.c:1272
+#: ../mail/em-format-html-display.c:1246
 msgid "_Hide"
 msgstr "Ẩ_n"
 
-#: ../mail/em-format-html-display.c:1273
+#: ../mail/em-format-html-display.c:1247
 msgid "_Fit to Width"
 msgstr "_Vừa khít độ rộng"
 
-#: ../mail/em-format-html-display.c:1274
+#: ../mail/em-format-html-display.c:1248
 msgid "Show _Original Size"
 msgstr "Hiển thị kích cỡ _gốc"
 
-#: ../mail/em-format-html-display.c:1693
+#: ../mail/em-format-html-display.c:1667
 #: ../mail/mail-config.glade.h:45
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đính kèm"
 
-#: ../mail/em-format-html-display.c:1900
+#: ../mail/em-format-html-display.c:1874
 msgid "Select folder to save all attachments..."
 msgstr "Chọn thư mục nơi cần lưu mọi đính kèm..."
 
-#: ../mail/em-format-html-display.c:1947
+#: ../mail/em-format-html-display.c:1921
 msgid "_Save Selected..."
 msgstr "_Lưu các điều chọn..."
 
 #.Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2014
+#: ../mail/em-format-html-display.c:1988
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d đính kèm"
 
-#: ../mail/em-format-html-display.c:2021
-#: ../mail/em-format-html-display.c:2097
+#: ../mail/em-format-html-display.c:1995
+#: ../mail/em-format-html-display.c:2071
 msgid "S_ave"
 msgstr "_Lưu"
 
-#: ../mail/em-format-html-display.c:2032
+#: ../mail/em-format-html-display.c:2006
 msgid "S_ave All"
 msgstr "L_ưu hết"
 
-#: ../mail/em-format-html-display.c:2093
+#: ../mail/em-format-html-display.c:2067
 msgid "No Attachment"
 msgstr "Không có đính kèm"
 
@@ -11960,44 +11913,44 @@ msgstr "Trang %d trên %d"
 msgid "Retrieving `%s'"
 msgstr "Đang nhận « %s »..."
 
-#: ../mail/em-format-html.c:620
+#: ../mail/em-format-html.c:610
 msgid "Valid signature but cannot verify sender"
 msgstr "Chữ ký hợp lệ nhưng mà không thể xác minh người gửi."
 
-#: ../mail/em-format-html.c:891
+#: ../mail/em-format-html.c:881
 msgid "Malformed external-body part."
 msgstr "Thân bên ngoại dạng sai."
 
-#: ../mail/em-format-html.c:921
+#: ../mail/em-format-html.c:911
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Trỏ tới địa chỉ FTP (%s)"
 
-#: ../mail/em-format-html.c:932
+#: ../mail/em-format-html.c:922
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Trỏ tới tập tin cục bộ (%s) hợp lệ tại nơi Mạng « %s »"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:924
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Trỏ tới tập tin cục bộ (%s)"
 
-#: ../mail/em-format-html.c:955
+#: ../mail/em-format-html.c:945
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Trỏ tới dữ liệu ở xa (%s)"
 
-#: ../mail/em-format-html.c:966
+#: ../mail/em-format-html.c:956
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu « %s »)"
 
-#: ../mail/em-format-html.c:1193
+#: ../mail/em-format-html.c:1183
 msgid "Formatting message"
 msgstr "Đang định dạng thư..."
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844
 #: ../mail/em-mailer-prefs.c:85
@@ -12006,29 +11959,29 @@ msgstr "Đang định dạng thư..."
 msgid "From"
 msgstr "Từ"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845
 #: ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "Trả lời cho"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Cho"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847
 #: ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "Cc"
 
-#: ../mail/em-format-html.c:1488
+#: ../mail/em-format-html.c:1476
 #: ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848
 #: ../mail/em-mailer-prefs.c:89
@@ -12036,23 +11989,23 @@ msgid "Bcc"
 msgstr "Bcc"
 
 #.pseudo-header
-#: ../mail/em-format-html.c:1663
+#: ../mail/em-format-html.c:1588
 #: ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1019
+#: ../mail/em-mailer-prefs.c:1001
 msgid "Mailer"
 msgstr "Trình thư"
 
 #.translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1690
+#: ../mail/em-format-html.c:1615
 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:1693
+#: ../mail/em-format-html.c:1618
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: ../mail/em-format-html.c:1703
+#: ../mail/em-format-html.c:1628
 #: ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850
 #: ../mail/em-mailer-prefs.c:91
@@ -12062,7 +12015,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Date"
 msgstr "Ngày"
 
-#: ../mail/em-format-html.c:1726
+#: ../mail/em-format-html.c:1651
 #: ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
@@ -12118,7 +12071,7 @@ msgstr "Một lần mỗi tuần"
 msgid "Once per month"
 msgstr "Một lần mỗi tháng"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-migrate.c:1209
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12129,48 +12082,48 @@ msgstr "Vị trí và cây của các thư mục hộp thư Evolution đã thay
 "\n"
 "Hãy kiên nhẫn trong khi Evolution chuyển đổi các thư mục của bạn..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1648
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Không thể tạo thư mục mới « %s »: %s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1674
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Không thể sao chép thư mục « %s » sang « %s »: %s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1859
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Không thể quét tìm hộp thư đã có tại « %s »: %s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2063
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Không thể mở dữ liệu giữ-trên-máy-chủ POP cũ « %s »: %s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2077
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Không thể tạo thư mục dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2106
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Không thể sao chép dữ liệu giữ-trên-máy-chủ POP3 « %s »: %s"
 
-#: ../mail/em-migrate.c:2578
-#: ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2577
+#: ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Việc tạo kho thư địa phương « %s » bị lỗi: %s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2712
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Không thể tạo những thư mục thư địa cục bộ « %s »: %s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2731
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -12188,6 +12141,10 @@ msgstr "T_rả lời người gửi"
 msgid "Reply to _List"
 msgstr "Trả lời _Hộp thư chung"
 
+#: ../mail/em-popup.c:620
+msgid "_Open Link in Browser"
+msgstr "_Mở liên kết bằng trình duyệt"
+
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "_Gửi thư mới cho..."
@@ -12217,29 +12174,29 @@ msgstr "Hãy chọn máy phục vụ."
 msgid "No server has been selected"
 msgstr "Chưa chọn máy phục vụ."
 
-#: ../mail/em-utils.c:141
+#: ../mail/em-utils.c:124
 msgid "Do not show this message again."
 msgstr "Đừng hiện thư này lần nữa."
 
-#: ../mail/em-utils.c:336
+#: ../mail/em-utils.c:319
 msgid "Message Filters"
 msgstr "Bộ lọc thư"
 
-#: ../mail/em-utils.c:516
-#: ../mail/em-utils.c:553
+#: ../mail/em-utils.c:496
+#: ../mail/em-utils.c:533
 msgid "message"
 msgstr "thư"
 
-#: ../mail/em-utils.c:688
+#: ../mail/em-utils.c:668
 msgid "Save Message..."
 msgstr "Lưu thư..."
 
-#: ../mail/em-utils.c:737
+#: ../mail/em-utils.c:717
 msgid "Add address"
 msgstr "Thêm địa chỉ"
 
 #.Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1221
+#: ../mail/em-utils.c:1201
 #, c-format
 msgid "Messages from %s"
 msgstr "Thừ từ %s"
@@ -12281,112 +12238,88 @@ msgid "Composer Window default width"
 msgstr "Độ rộng mặc định cửa sổ soạn"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
-msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Thu gọn ô hiển thị các địa chỉ trong Cho/CC/BCC"
-
-#: ../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 "Thu gọn ô hiển thị các địa chỉ trong trường Cho/CC/BCC thành số được xác định trong giá trị « address_count » (số đếm địa chỉ)"
-
-#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
 msgstr "Bộ ký tự mặc định để soạn thảo thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "Bộ ký tự mặc định để soạn thảo thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "Bộ ký tự mặc định để hiển thị thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "Bộ ký tự mặc định để hiển thị thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "Kiểu chuyển tiếp mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default height of the Composer Window"
 msgstr "Độ cao mặc định cửa Cửa sổ Soạn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
+#: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default height of the Message Window"
 msgstr "Độ cao mặc định cửa Cửa sổ Thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
+#: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Subscribe dialog"
 msgstr "Độ cao mặc định cửa hộp thoại Đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
+#: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "Kiểu trả lời mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default width of the Composer Window"
 msgstr "Độ rộng mặc định cửa Cửa sổ Soạn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
+#: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default width of the Message Window"
 msgstr "Độ rộng mặc định cửa Cửa sổ Thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
+#: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Subscribe dialog"
 msgstr "Độ rộng mặc định cửa hộp thoại Đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
+#: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Vẽ chỉ báo lỗi chính tả trên từ khi gõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
+#: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "Đổ các thư mục Rác khi thoát"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Đổ các thư mục Rác khi thoát trình Evolution."
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Hiệu lực chế độ con nháy, để bạn xem con chạy khi đọc thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
-msgid "Enable or disable type ahead search feature"
-msgstr "Bật/tắt tính năng tìm kiếm gõ trước"
-
-#: ../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 "Hiệu lực tính năng tìm kiếm khung lề để bắt đầu tìm kiếm tương tác bằng cách "
-"gõ vào đoạn. Có ích để tìm dễ dàng thư mục trong khung lề bằng cách đơn giản "
-"gõ tên thư mục thì phần chọn nhảy tự động tới thư mục đó."
-
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "Bật/tắt chế độ con nháy"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "Độ cao ô cửa sổ danh sách thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "Độ cao ô cửa sổ danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.in.h:27
 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 "Nếu người dùng cố mở hơn 9 thư cùng lúc thì hỏi nếu họ thật muốn làm như thế."
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.in.h:28
 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 "
@@ -12395,23 +12328,23 @@ msgstr "Nếu Evolution không có bộ xem có sẵn cho một kiểu MIME nào
 "bất cứ bộ xem tương thích với Bonobo nào sẵn sàng trong cơ sở dữ liệu kiểu "
 "MIME của GNOME."
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
 msgstr "Lần cuối cùng đã đổ Rác"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "List of Labels and their associated colors"
 msgstr "Danh sách Nhãn và màu sắc liên quan"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accepted licenses"
 msgstr "Danh sách các quyền phép đã chấp nhận"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.in.h:32
 msgid "List of accounts"
 msgstr "Danh sách các tài khoản"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12419,30 +12352,30 @@ msgstr "Danh sách các tài khoản mà thành phần thư của Evolution bi�
 "ấy chứa chuỗi lập tên của các thư mục con liên quan với /apps/evolution/mail/"
 "accounts."
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "Danh sách các dòng đầu tự chọn và nếu bật chưa."
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.in.h:35
 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 "Danh sách các nhãn mà thành phần thư của Evolution biết được. Danh sách ấy "
 "chứa chuỗi name:color (tên:màu) mà màu ấy dạng hệ thập lục phân HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Danh sách các kiểu MIME cần kiểm tra khớp với bộ xem thành phần Bonobo."
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of protocol names whose license has been accepted."
 msgstr "Danh sách các tên giao thức có quyền đã chấp nhận."
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "Load images for HTML messages over http"
 msgstr "Tải các ảnh cho thư HTML bằng giao thức HTTP"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.in.h:39
 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 "
@@ -12452,183 +12385,179 @@ msgstr "Tải các ảnh cho thư HTML bằng giao thức HTTP hay HTTPS. Giá t
 "1 - tải ảnh nếu người gửi có trong Sổ địa chỉ\n"
 "2 - luôn luôn tải ảnh từ Mạng (không an toàn)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
 msgstr "Ghi lưu các hành động lọc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.in.h:41
 msgid "Log filter actions to the specified log file."
 msgstr "Ghi lưu các hành động lọc vào tập tin bản ghi đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions"
 msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động lọc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:43
 msgid "Logfile to log filter actions."
 msgstr "Tập tin bản ghi nơi cần ghi lưu các hành động lọc."
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout"
 msgstr "Đánh dấu là Đã xem, sau thời hạn đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark as Seen after specified timeout."
 msgstr "Đánh dấu là Đã xem, sau thời hạn đã ghi rõ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\""
 msgstr "Đánh các trích dẫn trong thư « Xem thử »."
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.in.h:47
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Đánh các trích dẫn trong thư « Xem thử »."
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default height"
 msgstr "Độ cao mặc định của Cửa sổ thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.in.h:49
 msgid "Message Window default width"
 msgstr "Độ rộng mặc định của Cửa sổ thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.in.h:50
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Kiểu dáng hiển thị thư (chuẩn, dòng đầu đây đủ, mã nguồn)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Số ngày tối thiểu giữa hai lần đổ Rác khi thoát."
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Thời gian tối thiểu giữa hai lần sổ Rác khi thoát, theo ngày."
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify sound file"
 msgstr "Tập tin âm thanh Thông báo Thư Mới"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "New Mail Notify type"
 msgstr "Kiểu Thông báo Thư Mới"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
-msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Số địa chỉ cần hiển thị trong Cho/CC/BCC"
-
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt on empty subject"
 msgstr "Nhắc khi có chủ đề rỗng"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Nhắc người dùng khi họ cố xoá hẳn thư mục."
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
+#: ../mail/evolution-mail.schemas.in.in.h:57
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Nhắc người dùng khi họ cố gửi thư chưa có Chủ đề."
 
-#: ../mail/evolution-mail.schemas.in.in.h:63
+#: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user expunges"
 msgstr "Nhắc khi người dùng xoá hẳn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "Prompt when user only fills Bcc"
 msgstr "Nhắc khi người dùng chỉ nhập Bcc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Nhắc khi người dùng cố mở hơn 9 thư cùng lúc"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.in.h:61
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "Nhắc khi người dùng cố gửi thư HTML cho liên lạc không muốn nhận HTML."
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Nhắc khi người dùng cố gửi thư mà không có người nhận Cho (To) hay Chép Cho "
 "(CC)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.in.h:63
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Nhắc khi người dùng cố gửi thư dạng HTML không phải được muốn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.in.h:64
 msgid "Recognize links in text and replace them."
 msgstr "Nhận ra mọi liên kết trong văn bản và thay thế chúng."
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Nhận dạng biểu tượng xác cảm trong văn bản và thay thế bằng ảnh."
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.in.h:66
 msgid "Run junk test on incoming mail"
 msgstr "Chạy kiểm tra thư Rác khi mọi thư gửi Đến"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Send HTML mail by default"
 msgstr "Gửi thư dạng HTML theo mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.in.h:68
 msgid "Send HTML mail by default."
 msgstr "Gửi thư dạng HTML theo mặc định"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Show Animations"
 msgstr "Hiện hoạt cảnh"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Show animated images as animations."
 msgstr "Hiện ảnh đã hoạt cảnh kiểu hoạt cảnh."
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
+#: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Hiển thị mọi thư bị xoá bỏ (kiểu gạch xuyên qua) trong danh sách các thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
+#: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Show deleted messages in the message-list"
 msgstr "Hiển thị thư bị xoá bỏ trong danh sách các thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Sound file to play when new mail arrives."
 msgstr "Tập tin âm thanh cần phát khi nhận thư mới."
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "Ghi rõ kiểu Thông báo Thư Mới người dùng muốn dùng."
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Spell check inline"
 msgstr "Kiểm tra trực tiếp chính tả"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Subscribe dialog default height"
 msgstr "Độ cao mặc định của hộp thoại đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Subscribe dialog default width"
 msgstr "Độ rộng mặc định của hộp thoại đăng ký"
 
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Terminal font"
 msgstr "Phông chữ thiết bị cuối"
 
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Lần cuối cùng đã chạy đổ Rác, theo ngày từ kỷ nguyên bắt đầu."
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.in.h:82
 msgid "The terminal font for mail display"
 msgstr "Phông chữ thiết bị cuối để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.in.h:83
 msgid "The variable width font for mail display"
 msgstr "Phông chữ độ rộng thay đổi để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
+#: ../mail/evolution-mail.schemas.in.in.h:84
 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;"
@@ -12639,105 +12568,99 @@ msgstr "Khoá này nên chứa danh sách các cấu trúc XML ghi rõ dòng đ�
 "&lt;header enabled&gt;\n"
 "(lập đã bật dòng đầu, nếu sẽ hiển thị dòng đầu ấy trong khung xem thư)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid ""
-"This sets the number of addresses to show in default message list view, "
-"beyond which a '...' is shown."
-msgstr "Tùy chọn này đặt số địa chỉ cần hiển thị trong ô xem danh sách thư mặc định, ở ngoại đó hiển thị dấu chấm lửng (…)."
-
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message list."
 msgstr "Hiển thị nhánh trong danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Thread the message-list"
 msgstr "Hiển thị nhánh trong danh sách thư."
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Thread the message-list based on Subject"
 msgstr "Hiển thị nhánh trong danh sách thư, theo Chủ đề"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Timeout for marking message as Seen"
 msgstr "Thời hạn đánh dấu thư Đã xem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Timeout for marking message as Seen."
 msgstr "Thời hạn đánh dấu thư Đã xem."
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "UID string of the default account."
 msgstr "Chuỗi UID của tài khoản mặc định."
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
+#: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "Use Spamassassin daemon and client"
 msgstr "Dùng trình nền và ứng dụng khách Spamassassin"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
+#: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "Use Spamassassin daemon and client (spamc/spamd)"
 msgstr "Dùng trình nền và ứng dụng khách Spamassassin (spamc/spamd)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "Use custom fonts"
 msgstr "Dùng phông chữ tự chọn"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.in.h:94
 msgid "Use custom fonts for displaying mail"
 msgstr "Dùng phông chữ tự chọn để hiển thị thư"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.in.h:95
 msgid "Use only local spam tests."
 msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ."
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Dùng chỉ sự kiểm tra thư rác kiểu cục bộ (không có DNS)."
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Variable width font"
 msgstr "Phông chữ rộng biến"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Bcc menu item is checked"
 msgstr "Mục trình đơn Xem/Bcc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
+#: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Bcc menu item is checked."
 msgstr "Mục trình đơn Xem/Bcc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
+#: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "View/Cc menu item is checked"
 msgstr "Mục trình đơn Xem/Cc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "View/Cc menu item is checked."
 msgstr "Mục trình đơn Xem/Cc đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
+#: ../mail/evolution-mail.schemas.in.in.h:102
 msgid "View/From menu item is checked"
 msgstr "Mục trình đơn Xem/Từ đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
+#: ../mail/evolution-mail.schemas.in.in.h:103
 msgid "View/From menu item is checked."
 msgstr "Mục trình đơn Xem/Từ đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.in.h:104
 msgid "View/PostTo menu item is checked"
 msgstr "Mục trình đơn Xem/Gửi tới đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
+#: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "View/PostTo menu item is checked."
 msgstr "Mục trình đơn Xem/Gửi tới đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "View/ReplyTo menu item is checked"
 msgstr "Mục trình đơn Xem/Trả lời cho đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "View/ReplyTo menu item is checked."
 msgstr "Mục trình đơn Xem/Trả lời cho đã chọn."
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.in.h:108
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -12776,7 +12699,7 @@ msgstr "Bộ nhập thư mục dạng Berkeley Mailbox"
 
 #: ../mail/importers/evolution-outlook-importer.c:262
 #: ../mail/importers/mail-importer.c:233
-#: ../shell/e-shell-importer.c:529
+#: ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "Đang nhập « %s »..."
@@ -12784,7 +12707,7 @@ msgstr "Đang nhập « %s »..."
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
 #: ../plugins/startup-wizard/startup-wizard.c:237
-#: ../shell/e-shell-importer.c:536
+#: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "Vui lòng chờ..."
 
@@ -13600,26 +13523,18 @@ msgid "_Show image animations"
 msgstr "_Hiện hoạt cảnh ảnh"
 
 #: ../mail/mail-config.glade.h:174
-msgid "_Shrink To / Cc / Bcc headers to "
-msgstr "Th_u gọn dòng đầu Cho/CC/BCC thành "
-
-#: ../mail/mail-config.glade.h:175
 msgid "_Use Secure Connection:"
 msgstr "Dùng kết nối _bảo mật:"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:175
 msgid "_Use the same fonts as other applications"
 msgstr "_Dùng cùng những phông chữ với các ứng dụng khác"
 
-#: ../mail/mail-config.glade.h:177
-msgid "addresses"
-msgstr "địa chỉ"
-
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:176
 msgid "color"
 msgstr "màu"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:177
 msgid "description"
 msgstr "mô tả"
 
@@ -13734,22 +13649,22 @@ msgstr "với mọi thư mục cục bộ"
 msgid "Pinging %s"
 msgstr "Đang « ping » %s..."
 
-#: ../mail/mail-ops.c:105
+#: ../mail/mail-ops.c:104
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục..."
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:265
 msgid "Fetching Mail"
 msgstr "Đang lấy thư..."
 
 #.sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:565
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Việc áp dụng bộ lọc gửi đi bị lỗi: %s"
 
-#: ../mail/mail-ops.c:578
-#: ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:577
+#: ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13757,114 +13672,122 @@ msgid ""
 msgstr "Lỗi phụ thêm vào %s: %s\n"
 "Thì phụ thêm vào thư mục « Đã gửi » thay thế."
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:623
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Lỗi thêm vào thư mục « Đã gửi » cục bộ: %s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:735
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thư %d trên %d..."
 
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:760
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Việc gửi %d trên %d thư bị lỗi."
 
-#: ../mail/mail-ops.c:763
+#: ../mail/mail-ops.c:762
 #: ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "Bị thôi."
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:764
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:861
 msgid "Saving message to folder"
 msgstr "Đang lưu thư vào thư mục..."
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thư tới %s..."
 
-#: ../mail/mail-ops.c:947
+#: ../mail/mail-ops.c:946
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang sao chép thư vào %s..."
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1169
 msgid "Forwarded messages"
 msgstr "Thư đã chuyển tiếp"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s..."
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1284
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s..."
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1362
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s..."
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1456
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang cất giữ thư mục %s..."
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1521
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Đang xoá hẳn và cất giữ tài khoản %s..."
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1522
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Đang cất giữ tài khoản %s..."
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1577
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục..."
 
-#: ../mail/mail-ops.c:1614
-#: ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1613
+#: ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "Đang xoá hẳn thư mục..."
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1661
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang đổ rác trong « %s »..."
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1662
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1745
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang lấy thư %s..."
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1855
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Đang lấy %d thư..."
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1941
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Đang lưu %d thư..."
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1991
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Không thể tạo tập tin xuất: %s\n"
+" %s"
+
+#: ../mail/mail-ops.c:2019
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13872,12 +13795,12 @@ msgid ""
 msgstr "Gặp lỗi khi lưu thư vào: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2091
 msgid "Saving attachment"
 msgstr "Đang lưu đính kèm..."
 
-#: ../mail/mail-ops.c:2098
 #: ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2110
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13885,22 +13808,22 @@ msgid ""
 msgstr "Không thể tạo tập tin xuất: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2120
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu : %s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s..."
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2269
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s..."
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2385
 msgid "Checking Service"
 msgstr "Đang kiểm tra dịch vụ..."
 
@@ -13929,26 +13852,17 @@ msgstr "Đang chờ..."
 msgid "Checking for new mail"
 msgstr "Đang kiểm tra tìm thư mới..."
 
-#: ../mail/mail-session.c:205
-#, c-format
-msgid "Enter Passphrase for %s"
-msgstr "Hãy gõ cụm từ mật khẩu cho %s"
-
-#: ../mail/mail-session.c:207
-msgid "Enter Passphrase"
-msgstr "Gõ cụm từ mật khẩu"
-
-#: ../mail/mail-session.c:210
+#: ../mail/mail-session.c:204
 #: ../plugins/exchange-operations/exchange-config-listener.c:710
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Hãy gõ mật khẩu cho %s"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:206
 msgid "Enter Password"
 msgstr "Gõ mật khẩu"
 
-#: ../mail/mail-session.c:250
+#: ../mail/mail-session.c:241
 msgid "User canceled operation."
 msgstr "Người dùng đã thôi thao tác này."
 
@@ -14553,80 +14467,80 @@ msgstr "_Xoá hẳn"
 msgid "_Open Messages"
 msgstr "_Mở các thư"
 
-#: ../mail/message-list.c:1005
+#: ../mail/message-list.c:1000
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1001
 msgid "Seen"
 msgstr "Đã xem"
 
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1002
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1003
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thư chưa xem"
 
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1004
 msgid "Multiple Messages"
 msgstr "Nhiều thư"
 
-#: ../mail/message-list.c:1013
+#: ../mail/message-list.c:1008
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1009
 msgid "Lower"
 msgstr "Thấp hơn"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1013
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1014
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: ../mail/message-list.c:1359
+#: ../mail/message-list.c:1341
 #: ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #.strftime format of a time,
 #.in 12-hour format, without seconds.
-#: ../mail/message-list.c:1366
+#: ../mail/message-list.c:1348
 #: ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: ../mail/message-list.c:1375
+#: ../mail/message-list.c:1357
 #: ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: ../mail/message-list.c:1387
+#: ../mail/message-list.c:1369
 #: ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1395
+#: ../mail/message-list.c:1377
 #: ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: ../mail/message-list.c:1397
+#: ../mail/message-list.c:1379
 #: ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: ../mail/message-list.c:2081
+#: ../mail/message-list.c:2063
 msgid "Messages"
 msgstr "Thư"
 
-#: ../mail/message-list.c:3460
+#: ../mail/message-list.c:3442
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thư..."
 
@@ -14654,7 +14568,7 @@ msgstr "Địa điểm gốc"
 msgid "Received"
 msgstr "Đã nhận"
 
-#: ../mail/message-list.etspec.h:12
+#: ../mail/message-list.etspec.h:11
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "Cỡ"
@@ -14926,6 +14840,10 @@ msgid ""
 msgstr "Một bộ cầm phít thử ra mà biểu diễn một bộ cầm phít trình đơn bật lên cho "
 "phép bạn sao chép điều vào bảng tạm."
 
+#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+msgid "Copy _Email Address"
+msgstr "Chép _địa chỉ thư"
+
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
 msgstr "Công cụ chép"
@@ -15395,10 +15313,10 @@ msgstr "Không thể hiển thị thư mục."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr "Các thay đổi trong tùy chọn của tài khoản Evolution « {0} » sẽ có tác động "
-"chỉ sau khi bạn khởi chạy lại trình Evolution."
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
+msgstr "Các thay đổi trong cấu hình tài khoản Evolution sẽ có tác động sau khi bạn "
+"thoát rồi khởi chạy lại trình Evolution."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
 msgid "Could not authenticate to server."
@@ -15555,8 +15473,8 @@ msgid "Password successfully changed."
 msgstr "Mật khẩu đã được thay đổi."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "Please restart Evolution for changes to take effect"
-msgstr "Hãy khởi chạy lại Evolution để các thay đổi có tác động"
+msgid "Please restart Evolution"
+msgstr "Hãy khởi chạy lại Evolution"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Please select a user."
@@ -15931,12 +15849,12 @@ msgid "Select Calendar"
 msgstr "Chọn Lịch"
 
 #: ../plugins/import-ics-attachments/icsimporter.c:261
-#: ../shell/e-shell-importer.c:714
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "_Nhập"
 
 #: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:149
+#: ../plugins/save-calendar/ical-format.c:137
 msgid "iCalendar format (.ics)"
 msgstr "Tập tin iCalendar (.ics)"
 
@@ -16509,7 +16427,7 @@ msgstr "Bộ định dạng Itip"
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
 "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+"&quot;{1}&quot; ?"
 msgstr "« {0} » đã ủy nhiệm cuộc họp này. Bạn có muốn thêm người ủy nhiệm « {1} » "
 "không?"
 
@@ -17004,12 +16922,12 @@ msgstr "Lưu mọi đính kèm"
 msgid "Select save base name"
 msgstr "Chọn tên cơ bản khi lưu"
 
-#: ../plugins/save-attachments/save-attachments.c:357
+#: ../plugins/save-attachments/save-attachments.c:358
 msgid "MIME Type"
 msgstr "Kiểu MIME:"
 
-#: ../plugins/save-attachments/save-attachments.c:365
-#: ../ui/evolution-editor.xml.h:12
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11
 #: ../ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lưu"
@@ -17120,7 +17038,7 @@ msgid "RDF format (.rdf)"
 msgstr "Khuôn dạng RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "Chọn tập tin đích"
 
@@ -17169,18 +17087,18 @@ msgstr "Chào mừng dùng Evolution. Những màn hình kế tiếp\n"
 "Vui lòng nhấn nút « Tiếp » để tiếp tục."
 
 #: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:149
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "Hãy chọn thông tin bạn muốn nhập:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:155
-#: ../shell/e-shell-importer.c:411
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "Đang nhập dữ liệu."
 
@@ -17268,41 +17186,37 @@ msgid "Skip development warning dialog"
 msgstr "Bỏ qua hộp thoại cảnh báo phát triển"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
-#: ../shell/main.c:470
+#: ../shell/main.c:474
 msgid "Start in offline mode"
 msgstr "Khởi chạy trong chế độ ngoại tuyến"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Statusbar is visible"
-msgstr "Hiện khung lề"
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Phiên bản cấu hình của trình Evolution, với mức độ cấu hình lớn/nhỏ (v.d. « "
 "2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default height for the main window, in pixels."
 msgstr "Độ cao mặc định cửa của sổ chính, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the main window, in pixels."
 msgstr "Độ rộng mặc định cửa của sổ chính, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the sidebar, in pixels."
 msgstr "Độ rộng mặc định của thanh nách, theo điểm ảnh."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "Phiên bản cấu hình Evolution đã cập nhật cuối cùng, với mức độ cấu hình lớn/"
 "nhỏ (v.d. « 2.6.0 »)."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17311,46 +17225,42 @@ msgstr "Kiểu dạng mọi cái nút cửa sổ. Có thể là « chữ », «
 "thanh công cụ ». Nếu lập « thanh công cụ » thì thiết lập thanh công cụ GNOME "
 "sẽ quyết định kiểu dạng các cái nút này."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Toolbar is visible"
 msgstr "Hiện thanh công cụ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Có nên khỏi chạy trình Evolution trong chế độ ngoại tuyến thay vào chế độ "
 "trực tuyến hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether or not the window should be maximized."
 msgstr "Có nên phóng to cửa sổ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid "Whether the sidebar should be visible."
 msgstr "Có nên hiển thị khung lề hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
-msgid "Whether the status bar should be visible."
-msgstr "Hiện/ẩn thanh trạng thái."
-
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the toolbar should be visible."
 msgstr "Có nên hiển thị thanh công cụ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Có nên bỏ qua hộp thoại cảnh báo trong phiên bản phát triển Evolution hay "
 "không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Whether the window buttons should be visible."
 msgstr "Có nên hiển thị mọi cái nút trên cửa sổ hay không."
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.in.h:27
 msgid "Window button style"
 msgstr "Kiểu nút cửa sổ"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.in.h:28
 msgid "Window buttons are visible"
 msgstr "Hiển thị nút cửa sổ"
 
@@ -17371,11 +17281,11 @@ msgstr "Nhấn « Được » để đóng những kết nối này và chuyển
 msgid "(Untitled)"
 msgstr "(Không tên)"
 
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "Chọn kiểu bộ nhập cần chạy:"
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17388,11 +17298,11 @@ msgstr "Hãy chọn tập tin muốn nhập vào Evolution, và chọn kiểu t�
 "Bạn có thể chọn « Tự động » nếu bạn không biết, và Evolution sẽ thử tự tìm "
 "cách hoạt động."
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "Hãy chọn nhập vào đích nào"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17403,24 +17313,23 @@ msgstr "Trình Evolution đã kiểm tra có thiết lập để nhập từ\n"
 "Chưa tìm thiết lập có thể nhập. Nếu bạn muốn thử lại,\n"
 "hãy nhắp vào cái nút «Lùi».\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:285
 msgid "F_ilename:"
 msgstr "T_ên tập tin:"
 
-#: ../shell/e-shell-importer.c:297
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:290
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "_Kiểu tập tin:"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình _cũ"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "Nhập một tập tin _đơn"
 
@@ -17587,7 +17496,7 @@ msgstr "Chào mừng dùng Trợ tá nhập Evolution.\n"
 "nhập các tập tin bên ngoài vào Evolution."
 
 #.Preview/Alpha/Beta version warning message
-#: ../shell/main.c:233
+#: ../shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17622,46 +17531,42 @@ msgstr "Xin chào. Xin cám ơn đã mất thời gian để tải về bản d�
 "Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
 "và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
 
-#: ../shell/main.c:257
+#: ../shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr "Xin cám ơn\n"
 "Nhóm Evolution\n"
 
-#: ../shell/main.c:264
+#: ../shell/main.c:262
 msgid "Do not tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: ../shell/main.c:468
+#: ../shell/main.c:472
 msgid "Start Evolution activating the specified component"
 msgstr "Báo trình Evolution hoạt hoá thành phần đã ghi rõ"
 
-#: ../shell/main.c:472
+#: ../shell/main.c:476
 msgid "Start in online mode"
 msgstr "Khởi chạy trong chế độ trực tuyến"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:479
 msgid "Forcibly shut down all Evolution components"
 msgstr "Buộc kết thức mọi thành phần Evolution"
 
-#: ../shell/main.c:479
+#: ../shell/main.c:483
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Buộc tái nâng cấp từ Evolution 1.4"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:486
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin gỡ lỗi của mọi thành phần vào tập tin."
 
-#: ../shell/main.c:484
+#: ../shell/main.c:488
 msgid "Disable loading of any plugins."
 msgstr "Tắt tải bộ cầm phít nào."
 
-#: ../shell/main.c:515
-msgid "- The Evolution PIM and Email Client"
-msgstr "— Ứng dụng thư điện tử và quản lý thông tin cá nhân Evolution"
-
-#: ../shell/main.c:526
+#: ../shell/main.c:519
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18433,7 +18338,7 @@ msgstr "Chọn hết"
 
 #: ../ui/evolution-addressbook.xml.h:35
 #: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-editor.xml.h:12
 #: ../ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Chọn _hết"
@@ -18567,7 +18472,6 @@ msgstr "Tháng"
 
 #: ../ui/evolution-calendar.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "Kế"
 
@@ -18578,6 +18482,7 @@ msgstr "Xem thử lịch cần in"
 #: ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177
+#: ../widgets/misc/e-calendar.c:201
 msgid "Previous"
 msgstr "Lùi"
 
@@ -18669,12 +18574,12 @@ msgid "Paste from clipboard"
 msgstr "Dán bảng tạm"
 
 #: ../ui/evolution-composer-entries.xml.h:10
-#: ../ui/evolution-editor.xml.h:11
+#: ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "Dán đoạn từ bảng tạm"
 
 #: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:14
+#: ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "Chọn toàn bộ văn bản"
 
@@ -18711,25 +18616,19 @@ msgstr "Nhấn đây để xem trợ giúp có sẵn"
 msgid "Close"
 msgstr "Đóng"
 
-#: ../ui/evolution-editor.xml.h:10
-#: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
-msgid "I_nsert"
-msgstr "_Chèn"
-
-#: ../ui/evolution-editor.xml.h:15
+#: ../ui/evolution-editor.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "Đính _kèm..."
 
-#: ../ui/evolution-editor.xml.h:16
+#: ../ui/evolution-editor.xml.h:15
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "_Đóng"
 
-#: ../ui/evolution-editor.xml.h:19
+#: ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
@@ -18738,11 +18637,15 @@ msgstr "_Đóng"
 msgid "_File"
 msgstr "_Tập tin"
 
-#: ../ui/evolution-editor.xml.h:20
+#: ../ui/evolution-editor.xml.h:19
 #: ../ui/evolution.xml.h:43
 msgid "_Help"
 msgstr "Trợ _giúp"
 
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Chèn"
+
 #: ../ui/evolution-editor.xml.h:21
 msgid "_Options"
 msgstr "Tù_y chọn"
@@ -18853,12 +18756,6 @@ msgstr "Bật tắt hiển thị giờ là bận"
 msgid "_Alarms"
 msgstr "_Báo động"
 
-#: ../ui/evolution-event-editor.xml.h:27
-#: ../ui/evolution-memo-editor.xml.h:6
-#: ../ui/evolution-task-editor.xml.h:18
-msgid "_Categories"
-msgstr "_Loại"
-
 #: ../ui/evolution-event-editor.xml.h:28
 #: ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
@@ -19620,6 +19517,11 @@ msgstr "Chọn để nhận thông báo khi người nhận đã đọc thư b�
 msgid "HT_ML"
 msgstr "HT_ML"
 
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Chèn"
+
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "Mở tập tin"
@@ -20252,19 +20154,14 @@ msgstr "Kiểu khung xem"
 msgid "Type of view:"
 msgstr "Kiểu khung xem:"
 
-#: ../widgets/misc/e-attachment.glade.h:6
-msgid "Suggest automatic display of attachment"
-msgstr "Đề nghị tự động hiển thị đính kèm"
-
 #.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:418
+#: ../widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "234567C"
 
 #.This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1095
-#: ../widgets/misc/e-calendar-item.c:1748
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -20343,7 +20240,7 @@ msgstr "Rộng tối thiểu"
 
 #: ../widgets/misc/e-canvas-vbox.c:114
 #: ../widgets/misc/e-canvas-vbox.c:115
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-expander.c:205
 msgid "Spacing"
 msgstr "Dấu cách"
 
@@ -20491,55 +20388,55 @@ msgstr "%H:%M"
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: ../widgets/misc/e-expander.c:182
+#: ../widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Đã bung"
 
-#: ../widgets/misc/e-expander.c:183
+#: ../widgets/misc/e-expander.c:182
 msgid "Whether or not the expander is expanded"
 msgstr "Có bung mũi tên bung hay không"
 
-#: ../widgets/misc/e-expander.c:191
+#: ../widgets/misc/e-expander.c:190
 msgid "Text of the expander's label"
 msgstr "Chữ trong nhãn mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:198
+#: ../widgets/misc/e-expander.c:197
 msgid "Use underline"
 msgstr "Dùng gạch chân"
 
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-expander.c:198
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr "Nếu lập thì gạch chân ngú ý ký tự sau nó là phím tắt."
 
-#: ../widgets/misc/e-expander.c:207
+#: ../widgets/misc/e-expander.c:206
 msgid "Space to put between the label and the child"
 msgstr "Dấu cách giữa nhãn và con"
 
-#: ../widgets/misc/e-expander.c:216
+#: ../widgets/misc/e-expander.c:215
 msgid "Label widget"
 msgstr "Ô điều khiển nhãn"
 
-#: ../widgets/misc/e-expander.c:217
+#: ../widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
 msgstr "Một ô điều khiển cần hiển thị trong chỗ nhãn mũi tên bung thường"
 
-#: ../widgets/misc/e-expander.c:223
+#: ../widgets/misc/e-expander.c:222
 #: ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "Cỡ mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:224
+#: ../widgets/misc/e-expander.c:223
 #: ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "Cỡ mũi tên bung"
 
-#: ../widgets/misc/e-expander.c:232
+#: ../widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
 msgstr "Dấu cách chỉ báo"
 
-#: ../widgets/misc/e-expander.c:233
+#: ../widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
 msgstr "Dấu cách ở quanh mũi tên bung"
 
@@ -20624,32 +20521,32 @@ msgstr "Rộng cột"
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "Tìm _kiếm"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "Tìm n_gay"
 
-#: ../widgets/misc/e-search-bar.c:598
-#: ../widgets/misc/e-search-bar.c:990
+#: ../widgets/misc/e-search-bar.c:595
+#: ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "_Xoá"
 
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "Kiểu tìm kiếm"
 
-#: ../widgets/misc/e-search-bar.c:897
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "ID mục"
 
-#: ../widgets/misc/e-search-bar.c:904
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "ID mục con"
 
-#: ../widgets/misc/e-search-bar.c:911
+#: ../widgets/misc/e-search-bar.c:904
 #: ../widgets/text/e-entry.c:1249
 #: ../widgets/text/e-entry.c:1250
 #: ../widgets/text/e-text.c:3485
@@ -20657,8 +20554,8 @@ msgstr "ID mục con"
 msgid "Text"
 msgstr "Chữ"
 
-#: ../widgets/misc/e-search-bar.c:992
-msgid "Find No_w"
+#: ../widgets/misc/e-search-bar.c:984
+msgid "Find _Now"
 msgstr "Tìm _ngay"
 
 #: ../widgets/misc/e-selection-model-array.c:547
@@ -21415,4 +21312,4 @@ msgstr "Ngữ cảnh IM"
 #: ../widgets/text/e-text.c:3706
 #: ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
-msgstr "Bộ bật lên móc kéo"
\ No newline at end of file
+msgstr "Bộ bật lên móc kéo"
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f7ebfa58ce..959f9b862f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,53 +1,18 @@
-2006-05-15  Li Yuan <li.yuan@sun.com>
-
-	Fixes #341525
-
-	* e-sidebar.c: (button_toggled_callback):
-	If the button has been selected, it is no need to emit the signal.
-
-2006-04-30  Nancy Cai <nancy.cai@sun.com>
-
-	Fixes #323853
-
-	* e-shell-importer.c: (filename_changed), (item_selected),
-	(importer_file_page_new), (prepare_file_page):
-	replacing GnomeFileEntry by GtkFileButton, which can import task files
-	with none UTF-8 filenames.
-
-2006-04-27  Andre Klapper  <a9016009@gmx.de>
-
-	* main.c: update last stable version number from 2.4.2.1 to 2.6.1
-
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* main.c: (kill_dataserver): add eds-1.4 and eds-1.6
-	to the list of old instances.
-
-2006-04-24  Harish Krishnaswamy  <kharish@novell.com>
-
-	* e-shell-window-commands.c: Update credits for
-	the previous development series.
-
-2006-04-06  Alejandro Andres <fuzzy.alej@gmail.com>
-
-	* e-shell-view.c
-	* e-shell-window.c
-
-	Fixes #337258. Now Evolution is shown at the end of the title bar.
-
-2006-04-21  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Fixes bug #329731
-
-	* apps_evolution_shell.schemas.in.in: Added schema to maintain the
-	visibility of status bar.
-
 2006-04-18  Jeffrey Stedfast  <fejj@novell.com>
 
 	* e-shell-nm.c (e_shell_network_monitor): Intercept the
 	Disconnected signal and setup a timeout to try and reconnect when
 	the dbus daemon comes back up.
 
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* main.c (kill_dataserver): add evolution-data-server-1.4
+	to the list of old dataserver instances.
+
+2006-03-13  Harish Krishnaswamy  <kharish@novell.com>
+
+	* e-shell-window-commands.c: Update credits.
+
 2006-02-21  Tor Lillqvist  <tml@novell.com>
 
 	* main.c (main): On Win32, finally call link_shutdown() (from
@@ -124,9 +89,10 @@
 
 2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
 
-	* e-shell-nm-glib.c (e_shell_nm_glib_initialise): Remove
-	suspicious and possibly redundant register/unregister calls. Fixes
-	#325364 (critical warning crasher).
+	* e-shell-nm-glib.c: (e_shell_nm_glib_initialise):
+	Remove suspicious and possibly redundant 
+	register/unregister calls. Fixes #325364 (critical
+	warning crasher).
 
 2005-12-30  Andre Klapper <a9016009@gmx.de>
 
@@ -153,6 +119,7 @@
 	* shell.error.xml: fixed two dead links to "support.ximian.com" now to
 	the (yet to come) FAQ at go-evolution.org. (#315866)
 
+
 2005-12-22  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	* Evolution-Component.idl
@@ -196,44 +163,44 @@
 	e_shell_go_online.
 	
 2005-12-21  Not Zed  <NotZed@Ximian.com>
-
-	* e-shell-view.c (impl_ShellView_setTitle): take a component id
-	argument.
-
-	* e-shell-window.c (component_view_free): release the corba object
-	properly.
-	(e_shell_window_set_title): new helper to set the title for the
-	component.
-	(switch_view): use the component specific title if available or
-	fallback to the component name.
-
+ 
+ 	* e-shell-view.c (impl_ShellView_setTitle): take a component id
+ 	argument.
+ 
+ 	* e-shell-window.c (component_view_free): release the corba object
+ 	properly.
+ 	(e_shell_window_set_title): new helper to set the title for the
+ 	component.
+ 	(switch_view): use the component specific title if available or
+ 	fallback to the component name.
+ 
 2004-12-21  Not Zed  <NotZed@Ximian.com>
-
-	** See bug #60354.
-
-	* Evolution-Component.idl: createControls -> createView and
-	ComponentView to keep track of things.
-
-	* Evolution-Shell.idl: return a new type ShellView from
-	createNewWindow so other parts of the system can access it later.
-	ShellView so far just lets you set title or switch component, but
-	could be subclassed later.
-
-	* e-shell.c (impl_Shell_createNewWindow): return a shell view.
-
-	* e-shell-window.c (init_view): create the view from the compnent
-	first, then get the controls from it separately.
-	(init): setup the e-shell-view object for the create view
-	thing.
-
-	* e-shell-view.c (e_shell_view_new): simple bonobo object for
-	Evolution_ShellView, keep track of the EShellWindow.
-
-	* e-component-view.[ch]: simple bonobo object for
-	Evolution_ComponentView.  Just keep track of the controls.
+ 
+ 	** See bug #60354.
+ 
+ 	* Evolution-Component.idl: createControls -> createView and
+ 	ComponentView to keep track of things.
+ 
+ 	* Evolution-Shell.idl: return a new type ShellView from
+ 	createNewWindow so other parts of the system can access it later.
+ 	ShellView so far just lets you set title or switch component, but
+ 	could be subclassed later.
+ 
+ 	* e-shell.c (impl_Shell_createNewWindow): return a shell view.
+ 
+ 	* e-shell-window.c (init_view): create the view from the compnent
+ 	first, then get the controls from it separately.
+ 	(init): setup the e-shell-view object for the create view
+ 	thing.
+ 
+ 	* e-shell-view.c (e_shell_view_new): simple bonobo object for
+ 	Evolution_ShellView, keep track of the EShellWindow.
+ 
+ 	* e-component-view.[ch]: simple bonobo object for
+ 	Evolution_ComponentView.  Just keep track of the controls.
 
 	Committed on behalf of NotZed - partha
-
+ 
 2005-12-17  Tor Lillqvist  <tml@novell.com>
 
 	* e-config-upgrade.c: Use libedataserver's e_xml_parse_file()
@@ -281,16 +248,16 @@
 
 	solves bug # 307780
 
-	* e-shell-window.h: added the prototype for the function
+	* e-shell-window.h : added the prototype for the function
 	e_shell_window_peek_statusbar(..);
-
-	* e-shell-window.c: show/hide the status bar widget based on the saved
+	
+	* e-shell-window.c : show/hide the status bar widget based on the saved
 	property.
 	retreive the status bar's previous status and set in UI.
 	define the function e_shell_window_peek_statusbar() which retrieves
 	the status bar widget for e-shell-window-commands.c
-
-	* e-shell-window-commands.c: view_statusbar_item_toggled_handler()
+	
+	* e-shell-window-commands.c : view_statusbar_item_toggled_handler()
 	is the component listener for the "View Status Bar" menu item.it 
 	handles the click event in the menu item "View status Bar".The
 	state of the status bar is also saved every time an event occurs
diff --git a/shell/apps_evolution_shell.schemas.in.in b/shell/apps_evolution_shell.schemas.in.in
index 1a0ea854f3..5e2ce825cf 100644
--- a/shell/apps_evolution_shell.schemas.in.in
+++ b/shell/apps_evolution_shell.schemas.in.in
@@ -165,19 +165,7 @@
         <long>Whether the sidebar should be visible.</long>
       </locale>
     </schema>
-    
-     <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/statusbar_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/statusbar_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Statusbar is visible</short>
-        <long>Whether the status bar should be visible.</long>
-      </locale>
-    </schema>
-    
+
     <schema>
       <key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
       <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f0c5903936..0367b148c3 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -327,7 +327,7 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	}
 
 	if (component_view->title == NULL) {
-		title = g_strdup_printf ("%s - Evolution", info->button_label);
+		title = g_strdup_printf ("Evolution - %s", info->button_label);
 		gtk_window_set_title (GTK_WINDOW (window), title);
 		g_free (title);
 	} else
diff --git a/shell/main.c b/shell/main.c
index 428911d795..6e22b85fd0 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -103,7 +103,6 @@ static gint idle_cb (void *data);
 
 static char *default_component_id = NULL;
 static char *evolution_debug_log = NULL;
-static gchar **remaining_args;
 
 static void
 no_windows_left_cb (EShell *shell, gpointer data)
@@ -131,7 +130,6 @@ kill_dataserver (void)
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.0 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null");
-	system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null");
 
 	system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null");
 	system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null");
@@ -245,7 +243,7 @@ show_development_warning(void)
                   "\n"
 		  "We hope that you enjoy the results of our hard work, and we\n"
 		  "eagerly await your contributions!\n"),
-		"2.6.1");
+		"2.4.2.1");
 	label = gtk_label_new (text);
 	g_free(text);
 
@@ -463,45 +461,44 @@ setup_segv_redirect (void)
 #define setup_segv_redirect() 0
 #endif
 
-static const GOptionEntry options[] = {
-	{ "component", 'c', 0, G_OPTION_ARG_STRING, &default_component_id,
-	  N_("Start Evolution activating the specified component"), NULL },
-	{ "offline", '\0', 0, G_OPTION_ARG_NONE, &start_offline,
-	  N_("Start in offline mode"), NULL },
-	{ "online", '\0', 0, G_OPTION_ARG_NONE, &start_online,
-	  N_("Start in online mode"), NULL },
-#ifdef KILL_PROCESS_CMD
-	{ "force-shutdown", '\0', 0, G_OPTION_ARG_NONE, &killev, 
-	  N_("Forcibly shut down all Evolution components"), NULL },
-#endif
-#if DEVELOPMENT
-	{ "force-migrate", '\0', 0, G_OPTION_ARG_NONE, &force_migrate, 
-	  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
-#endif
-	{ "debug", '\0', 0, G_OPTION_ARG_STRING, &evolution_debug_log, 
-	  N_("Send the debugging output of all components to a file."), NULL },
-	{ "disable-eplugin", '\0', 0, G_OPTION_ARG_NONE, &disable_eplugin, 
-	  N_("Disable loading of any plugins."), NULL },
-	{ "setup-only", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE,
-	  &setup_only, NULL, NULL },
-	{ G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining_args, NULL, NULL },
-	{ NULL }
-};
-
 int
 main (int argc, char **argv)
 {
 #ifdef G_OS_WIN32
 	extern void link_shutdown (void);
 #endif
-
+	struct poptOption options[] = {
+		{ "component", 'c', POPT_ARG_STRING, &default_component_id, 0,
+		  N_("Start Evolution activating the specified component"), NULL },
+		{ "offline", '\0', POPT_ARG_NONE, &start_offline, 0, 
+		  N_("Start in offline mode"), NULL },
+		{ "online", '\0', POPT_ARG_NONE, &start_online, 0, 
+		  N_("Start in online mode"), NULL },
+#ifdef KILL_PROCESS_CMD
+		{ "force-shutdown", '\0', POPT_ARG_NONE, &killev, 0, 
+		  N_("Forcibly shut down all Evolution components"), NULL },
+#endif
+#if DEVELOPMENT
+		{ "force-migrate", '\0', POPT_ARG_NONE, &force_migrate, 0, 
+		  N_("Forcibly re-migrate from Evolution 1.4"), NULL },
+#endif
+		{ "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, 
+		  N_("Send the debugging output of all components to a file."), NULL },
+		{ "disable-eplugin", '\0', POPT_ARG_NONE, &disable_eplugin, 0, 
+		  N_("Disable loading of any plugins."), NULL },
+		{ "setup-only", '\0', POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN,
+		  &setup_only, 0, NULL, NULL },
+		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
+	};
 #if DEVELOPMENT
 	GConfClient *client;
 	gboolean skip_warning_dialog;
 #endif
 	GSList *uri_list;
+	GValue popt_context_value = { 0, };
 	GnomeProgram *program;
-	GOptionContext *context;
+	poptContext popt_context;
+	const char **args;
 	GList *icon_list;
 	char *filename;
 
@@ -512,13 +509,9 @@ main (int argc, char **argv)
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	context = g_option_context_new (_("- The Evolution PIM and Email Client"));
-
-	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-
 	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
-				      GNOME_PARAM_GOPTION_CONTEXT, context,
+				      GNOME_PARAM_POPT_TABLE, options,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),
 				      NULL);
 
@@ -578,14 +571,18 @@ main (int argc, char **argv)
 
 	uri_list = NULL;
 
-	if (remaining_args != NULL) {
+	g_value_init (&popt_context_value, G_TYPE_POINTER);
+	g_object_get_property (G_OBJECT (program), GNOME_PARAM_POPT_CONTEXT, &popt_context_value);
+	popt_context = g_value_get_pointer (&popt_context_value);
+	args = poptGetArgs (popt_context);
+	if (args != NULL) {
 		const char **p;
 
-		for (p = (const char**)remaining_args; *p != NULL; p++)
+		for (p = args; *p != NULL; p++)
 			uri_list = g_slist_prepend (uri_list, (char *) *p);
 	}
 	uri_list = g_slist_reverse (uri_list);
-	
+	g_value_unset (&popt_context_value);
 
 	gnome_sound_init ("localhost");
 
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 267361de95..acd5d887d8 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -8,21 +8,6 @@
 	Don't set an icon for MessageUndelete
 
 	Fixes #339626
-	
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Committing patch from PR Suman for adding missing icons to menus.
-
-	* evolution-addressbook.xml:
-	* evolution-event-editor.xml:
-	* evolution-mail-message.xml:
-	* evolution-message-composer.xml:
-	* evolution-tasks.xml:
-
-2006-02-26  Rakesh k.g <rakeysh_kg@yahoo.com>
-
-	* evolution-editor.xml: Insert menu changed its mnemonic.
-	Fixes bug #331975.
 
 2006-02-13  Karsten Bräckelmann  <guenther@rudersport.de>
 
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index e3003fa9d9..0ee5332278 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -318,7 +318,7 @@
         </placeholder>
 
         <placeholder name="MessageNavigation">
-          <submenu name="GoTo" _label="_Go To" pixtype="stock" pixname="gtk-jump-to">
+          <submenu name="GoTo" _label="_Go To">
             <menuitem name="MailNext" verb="" _label="_Next Message"/>
             <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
             <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
diff --git a/views/memos/Makefile.am b/views/memos/Makefile.am
deleted file mode 100644
index d11a8c7f08..0000000000
--- a/views/memos/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-memosviewsdir = $(viewsdir)/memos
-memosviews_DATA = Memos.galview galview.xml
-EXTRA_DIST = $(memosviews_DATA)
diff --git a/views/memos/Memos.galview b/views/memos/Memos.galview
deleted file mode 100644
index ac19a0daa4..0000000000
--- a/views/memos/Memos.galview
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<ETableState state-version="0.100000">
-  <column source="1"/>
-  <column source="0"/>
-  <column source="2"/>
-  <grouping></grouping>
-</ETableState>
diff --git a/views/memos/galview.xml b/views/memos/galview.xml
deleted file mode 100644
index b06be9c64a..0000000000
--- a/views/memos/galview.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<GalViewCollection default-view="Memos">
-  <GalView id="Memos" _title="_Memos" filename="Memos.galview" type="etable"/>
-</GalViewCollection>
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index e90f9b7375..0199f9cad3 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,142 +1,35 @@
-2006-05-26  Jeffrey Stedfast  <fejj@novell.com>
-
-	Fix for Novell bug #178631
-
-	* e-attachment-bar.c: Changed the EAttachmentBarPrivate struct, we
-	no longer use a linked list, instead we use a GPtrArray - faster,
-	simpler (plus all the code used indexes anyway, so it was really
-	bizarre).
-	(free_attachment_list): Removed.
-	(attachment_destroy): New GWeakNotify callback for when an
-	EAttachment object gets destroyed. Remove the attachment from the
-	attachments array.
-	(add_common): Updated to add to an array rather than a linked
-	list. Also weak_ref the attachment object.
-	(remove_attachment): Removed.
-	(update): Updated to use the array instead of linked list of
-	attachments.
-	(e_attachment_bar_remove_selected): Same.
-	(e_attachment_bar_set_width): Same.
-	(e_attachment_bar_edit_selected): Same.
-	(e_attachment_bar_get_selected): Same.
-	(e_attachment_bar_get_attachment): Same.
-	(e_attachment_bar_get_all_attachments): Same and also optimised
-	since we can cheat now without having to g_slist_reverse.
-	(e_attachment_bar_get_parts): Same.
-	(destroy): Same.
-	(eab_drag_data_get): Same.
-	(init): Init attachments to a g_ptr_array_new
-	(e_attachment_bar_to_multipart): Updated to use the attachments
-	array.
-	(e_attachment_bar_get_num_attachments): Updated to return the
-	attachments->len.
-	(e_attachment_bar_get_download_count): Updated to use the array.
-
-	* e-attachment.c (finalise): Close the editor dialog if it is
-	open.
-	(async_progress_update_cb): If the phase is COMPLETE but the
-	file_size is 0, then treat it as an error. In the error case,
-	unref the attachment object (this will magically remove it from
-	the EAttachmentBar).
-	(close_cb): Don't unref the attachment object here anymore.
-	(e_attachment_edit): Don't ref the EAttachment anymore.
-
-2006-05-25  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-attachment-bar.c (update, eab_icon_clicked_cb),
-	(e_attachment_bar_attach_remote_file):
-	
-	* e-attachment-bar.h:
-
-	* e-attachment.c (e_attachment_new_remote_file),
-	(e_attachment_build_remote_file): Added code to specify the
-	attachment type for remote files.  Also added code to save files
-	to CamelStreamVfs
-
-2006-05-04  Rajeev Ramanathan  <rajeevramanathan_2004@yahoo.co.in>
-
-	* e-calendar-item.c (e_calendar_item_draw),
-	(e_calendar_item_draw_month, e_calendar_item_draw_day_numbers),
-	(layout_set_day_text): enable build without cairo using
-	ENABLE_CAIRO macro. Also it fixes a bold issue, where entire
-	evolution appears with bold text.
-
-2006-04-27  Boby Wang <boby.wang@sun.com>
-
-	** Fixes bug #339138
-
-	* e-calendar.c (e_calendar_init): Correct the button's accessible
-	name.
-
-2006-04-27  Boby Wang  <boby.wang@sun.com>
-
-	** Fixes bug #332821
-
-	* e-expander.c (e_expander_class_init): Implement the
-	accessibility of EExpander.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-search-bar.c (append_xml_menu_item, setup_bonobo_menus): Added
-	icons to search menu.
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-search-bar.c (add_button, e_search_bar_construct): Adding
-	icons for find and clear buttons. (Patch from PR Suman)
-
-2006-04-26  Srinivasa Ragavan  <sragavan@novell.com>
-
-	** Patch from charu_jayaprakasam@yahoo.com fixes bug #335861
-
-	* e-search-bar.c (e_search_bar_construct): Change the mnemonics
-	for Find Now button.
-
-2006-04-24  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-calendar-item.c (e_calendar_item_draw),
-	(e_calendar_item_draw_month, e_calendar_item_draw_day_numbers):
-	Used Cairo to draw the Tag Calendar. (Rajeev)
-
-2006-04-22  Srinivasa Ragavan  <sragavan@novell.com>
-
-	* e-attachment-bar.c (e_attachment_bar_create_attachment_cache):
-	Added a new function that creates a attachment with a image cache.
-
 2006-03-28  Li Yuan  <li.yuan@sun.com>
 
 	**Fixes bug #335618
-
-	* e-selection-model-array.c (e_selection_model_array_delete_rows):
-	If the row being deleted is the last one, we should change the
+	* e-selection-model-array.c: (e_selection_model_array_delete_rows):
+	If the row being deleted is the last one, we should change the 
 	selection_start_row.
 
 2006-03-06  Simon Zheng  <simon.zheng@sun.com>
 
 	Fixes bug #332140
-
-	* e-attachment-bar.c (temp_save_part): Changed to transfer
-	filenames from utf-8 to glib encoding before really saving files.
+	* e-attachment-bar.c: (temp_save_part):
+	Changed to transfer filenames from utf-8 to glib encoding 
+	before really saving files.
 
 2006-03-06  Jeff Cai  <jeff.cai@sun.com>
 
 	** Fixes for 333235
-
-	* e-combo-button.c (paint): If width of a widget is 0, don't draw
-	it.
+	* e-combo-button.c: (paint): If width of a widget is 0, 
+	don't draw it.
 
 2006-02-28  Devashish Sharma  <sdevashish@novell.com>
 
-	* e-reflow.c (do_adjustment): Check and see if reflow->items and
-	reflow->items[row] are NULL or not.  Fixes Bug # 331998.
-
+	* e-reflow.c :(do_adjustment): Check and see if reflow->items 
+	and reflow->items[row] are NULL or not.
+	Fixes Bug # 331998.
 	Patch submitted by Irene Huang <Irene.Huang@sun.com>
 
 2006-02-24  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #322789
-
-	* e-image-chooser.c (set_image_from_data): Added code to get the
+	
+	* e-image-chooser.c: (set_image_from_data): Added code to get the
 	pixbuf after closing the loaded.
 
 2006-02-13  Andre Klapper  <a9016009@gmx.de>
@@ -155,16 +48,16 @@
 2006-01-16  Nancy Cai <nancy.cai@sun.com>
 
 	** Fixes bug #326649
-
-	* e-multi-config-dialog.c (set_page_timeout_callback): make the
-	preferences dialog's keyboard navigation more consistent.
+	
+	* e-multi-config-dialog.c: (set_page_timeout_callback):
+	make the preferences dialog's keyboard navigation more consistent.	
 
 2006-01-13  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #326265
 
-	* e-charset-picker.c (e_charset_picker_bonobo_ui_populate): Added
-	mnemonics to "Character Encoding" menu.
+	* e-charset-picker.c: (e_charset_picker_bonobo_ui_populate):
+	Added mnemonics to "Character Encoding" menu.
 
 2006-01-11  Chenthill Palanisamy  <pchenthill@novell.com>
 
@@ -188,29 +81,29 @@
 	*e-util-marshal.list: removed
 
 2006-01-06  Parthasarathi Susarla <sparthasarathi@novell.com>
-
-	* e-search-bar.c (clear_verb_cb): assign the data first before
-	accessing it.
+	
+	* e-search-bar.c:(clear_verb_cb): assign the data first
+	before accessing it.
 
 2006-01-02  Harish Krishnaswamy  <kharish@novell.com>
 
 	reviewed by: Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-canvas-background.c (ecb_style_set): Set the foreground only
-	if the widget has already been realized.  Fixes #309618.
+	* e-canvas-background.c: (ecb_style_set): Set the
+	foreground only if the widget has already been realized.
+	Fixes #309618.
 
 2005-12-21  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fixes bug #324590
 
-	* e-search-bar.c (search_now_verb_cb, clear_verb_cb): Added code
-	to clear search entry from menu.
+	* e-search-bar.c: (search_now_verb_cb), (clear_verb_cb): Added
+	code to clear search entry from menu.
 
 2005-12-20  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** See Bug #246233
-
-	* e-filter-bar.c (member_activated): Changed "Search Editor" to
+	* e-filter-bar.c: (member_activated) : Changed "Search Editor" to
 	"Searches"
 
 2005-12-18  Tor Lillqvist  <tml@novell.com>
@@ -232,46 +125,44 @@
 
 2005-12-15  Srinivasa Ragavan  <sragavan@novell.com>
 
-	* e-filter-bar.c (rule_advanced_response, option_changed)
-	(set_property): Added code to Show color in search widget.  *
-
-	* e-search-bar.c (entry_activated_cb),
-	(activate_button_clicked_cb, clear_button_clicked_cb): Added code
-	to show color in search widget, when the filter is active.
+	* e-filter-bar.c: (rule_advanced_response), (option_changed),
+	(set_property): Added code to Show color in search widget.
+	* e-search-bar.c: (entry_activated_cb),
+	(activate_button_clicked_cb), (clear_button_clicked_cb): Added
+	code to show color in search widget, when the filter is active.
 
 2005-11-24  Tor Lillqvist  <tml@novell.com>
 
-	* e-dateedit.c:
+	* e-dateedit.c
 	* e-cell-date-edit.c: Include e-time-utils.h from libedataserver
 	instead of using evolution's copy which is going away.
 
 2005-11-23  Johnny Jacob  <johnnyjacob@gmail.com>
 
-	* e-dateedit.c (on_date_entry_focus_out, on_time_entry_focus_out):
+	* e-dateedit.c: (on_date_entry_focus_out) (on_time_entry_focus_out) :
 	Validation for date and time during focus out event.
 
 2005-11-22  Johnny Jacob  <johnnyjacob@gmail.com>
 
 	** See Bug #303856
-
-	* e-dateedit.c (create_children): Added a signal handler for
-	date_entry's "key_release_event".
+	* e-dateedit.c: (create_children) : Added a signal handler
+	for date_entry's "key_release_event".
 
 2005-11-17  Harish Krishnaswamy  <kharish@novell.com>
 
-	* e-attachment-bar.c (update, e_attachment_bar_set_width): Fix a
-	division-by-zero error crasher.
+	* e-attachment-bar.c: (update), (e_attachment_bar_set_width):
+	Fix a division-by-zero error crasher.
 
 2005-11-15  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_get_all_attachments): Added
+	* e-attachment-bar.[ch] (e_attachment_bar_get_all_attachments): Added
 	a function to get all attachments of the attachment bar for plugin
 	purposes.
 
 2005-11-14  Chenthill Palanisamy  <pchenthill@novell.com>
 
-	* e-dateedit.c (create_children): Adjusted the size for the
-	dateedit widgets.
+	* e-dateedit.c: (create_children): Adjusted the size
+	for the dateedit widgets.
 
 2005-11-14  Srinivasa Ragavan <sragavan@novell.com>
 
@@ -285,8 +176,8 @@
 	
 2005-09-28  Tor Lillqvist  <tml@novell.com>
 
-	* e-charset-picker.c (e_charset_picker_new)
-	(e_charset_picker_bonobo_ui_populate): Use g_ascii_strcasecmp()
+	* e-charset-picker.c (e_charset_picker_new,
+	e_charset_picker_bonobo_ui_populate): Use g_ascii_strcasecmp()
 	instead of strcasecmp(). We are comparing to strings known to be
 	plain ASCII, so just casefolding ASCII is enough. Also better for
 	portability.
@@ -323,31 +214,29 @@
 
 2005-08-17  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (eab_drag_data_get): Use camel_url to
-	construct url
-	(eab_icon_clicked_cb, e_attachment_bar_new): Fixed part of bug
-	#312224. It handles double click on a attachment icon and calls
-	gnome_url_show.
+	* e-attachment-bar.c 
+	eab_drag_data_get: Use camel_url to construct url
+	(eab_icon_clicked_cb) (e_attachment_bar_new): 
+	Fixed part of bug #312224. It handles double click on a attachment
+	icon and calls gnome_url_show.
 
-	* e-attachment.c (finalise, init): Add a new member to preserve
+	* e-attachment.[ch] (finalise) (init): Add a new member to preserve
 	the stored location
-	(e_attachment_new)(e_attachment_build_remote_file): Camel_url to
+	(e_attachment_new)(e_attachment_build_remote_file): Camel_url to 
 	construct urls
 	
 2005-08-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (download_to_local_path, e_attachment_edit):
-	Fixed few warnings
+	* e-attachment.c (download_to_local_path) (e_attachment_edit): Fixed
+	few warnings
 
 2005-08-16  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (finalise, e_attachment_new)
-	(e_attachment_build_remote_file, e_attachment_new_from_mime_part)
-	(ok_cb): Maintain the filename of the attachment in the structure
-	and free it in finalize.
-
-	* e-attachment-bar.c (update): For display consider the filename
-	from the structure before from the part.
+	* e-attachment.c (finalise) (e_attachment_new) (e_attachment_build_remote_file)
+	(e_attachment_new_from_mime_part) (ok_cb): Maintain the filename of the 
+	attachment in the structure and free it in finalize.
+	* e-attachment-bar.c (update): For display consider the filename from the 
+	structure before from the part.
 
 2005-08-03  Not Zed  <NotZed@Ximian.com>
 
@@ -356,69 +245,59 @@
 
 2005-08-11  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_refresh): Added a function
+	* e-attachment-bar.[ch] (e_attachment_bar_refresh): Added a function
 	to force refresh/resize the icons.
 
 2005-08-02  David Malcolm  <dmalcolm@redhat.com>
 
-	* e-attachment-bar.c (update_remote_file): escape the "%"
-	character correctly.
+	* e-attachment-bar.c: (update_remote_file): escape the "%" character 
+	correctly.
 
 2005-07-29  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment.c (e_attachment_new_from_mime_part): used ref
-	instead of copying the entire mime part.
+	* e-attachment.c: (e_attachment_new_from_mime_part) used ref instead of 
+	copying the entire mime part.
 
 2005-07-15  Diego Gonzalez    <diego@pemas.net>
 
-	* e-image-chooser.c (image_drag_data_received_cb): modificatio to
+	* e-image-chooser.c(image_drag_data_received_cb): modificatio to
 	avoid getting into an infinite loop. Also remove some debug
 	output.
 	(set_image_from_data): substitute calls to gdk_pixbuf_unref and
 	gdk_pixbuf_ref and use g_object_ref/unref instead. The first ones
-	are deprecated API.  Fixes #310488
+	are deprecated API.
+	Fixes #310488
 
 2005-07-25  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (e_attachment_bar_remove_selected)
-	(e_attachment_bar_edit_selected)
-	(e_attachment_bar_get_attachment, e_attachment_bar_get_parts)
-	(e_attachment_bar_get_download_count)
-	(e_attachment_bar_attach_remote_file): Added checks for the
-	parameters.
+	* e-attachment-bar,c: (e_attachment_bar_remove_selected) (e_attachment_bar_edit_selected)
+	(e_attachment_bar_get_attachment) (e_attachment_bar_get_parts) 
+	(e_attachment_bar_get_download_count) (e_attachment_bar_attach_remote_file): Added 
+	checks for the parameters.
 	
 2005-07-20  Vivek Jain  <jvivek@novell.com>
-
-	* e-send-options.h: ESendOptionsDialogClass: has a member new
-	virtual method for default callback of "sod_response"
-
-	* e-send-options.c: introduced a new signal "sod_response"
-	captures the response for the child dialog and makes it available
-	at the object level (useful for the external members invoking the
-	dialog)
+	
+	* e-send-options.h : ESendOptionsDialogClass: has a member new virtual
+	method for default callback of "sod_response"
+	* e-send-options.c : introduced a new signal "sod_response"
+	captures the response for the child dialog and makes it available at the
+	object level (useful for the external members invoking the dialog)
 
 2005-07-20  Srinivasa Ragavan <sragavan@novell.com>
 
-	* e-attachment-bar.c (remove_attachment, update)
-	(e_attachment_bar_get_selector, e_attachment_bar_get_attachment)
-	(destroy, init, e_attachment_bar_new)
-	(e_attachment_bar_add_attachment)
-	(e_attachment_bar_attach_remote_file): Cleaned up most of
-	it. Added the DnD.
-
-	* e-attachment.c (real_changed, class_init, init)
-	(e_attachment_new, e_attachment_new_remote_file)
-	(e_attachment_build_remote_file): Moved the remote download code
-	from bar to here and few cleanups.
+	* e-attachment-bar.[ch]:(remove_attachment) (update) (e_attachment_bar_get_selector) 
+	(e_attachment_bar_get_attachment) (destroy) (init) (e_attachment_bar_new) 
+	(e_attachment_bar_add_attachment) (e_attachment_bar_attach_remote_file)
+	Cleaned up most of it. Added the DnD.
+	* e-attachment.[ch]: (real_changed) (class_init) (init) (e_attachment_new) 
+	(e_attachment_new_remote_file) (e_attachment_build_remote_file): Moved the
+	remote download code from bar to here and few cleanups.
 	
 2005-07-11  Srinivasa Ragavan <sragavan@novell.com>
 	
-	* Makefile.am: Added e-attachment-bar.[ch], e-attachment.[ch],
-	and e-attachment.glade.
-
-	* e-attachment.[ch]: Merge of em-attachment.[ch] and
-	cal-attachment.[ch]
-
+	* Makefile.am: Added e-attachment-bar.[ch] e-attachment.[ch]
+	e-attachment.glade.
+	* e-attachment.[ch]: Merge of em-attachment.[ch] and cal-attachment.[ch]
 	* e-attachment-bar.[ch]: Merge of em-attachment-bar.[ch] and
 	cal-attachment-bar.[ch].
 
@@ -430,8 +309,8 @@
 
 2005-05-31  Li Yuan  <li.yuan@sun.com>
 
-	* e-dateedit.c (e_date_edit_update_date_entry): add relation to
-	date_button.
+	* e-dateedit.c:(e_date_edit_update_date_entry):
+	add relation to date_button.
 
 	Fixes #302267
 
@@ -446,11 +325,11 @@
 
 2005-05-12  Shreyas Srinivasan	<sshreyas@novell.com>
 
-	* e-send-options.c: Fixed #272005
-
+	* e-send-options.c : Fixed #272005
+	
 2005-05-06  Sarfraaz Ahmed <asarfraaz@novell.com>
 
-	* e-send-options.glade: Fixed a typo. #273095
+	* e-send-options.glade : Fixed a typo. #273095
 
 2005-05-06  Harish Krishnaswamy  <kharish@novell.com>
 
@@ -472,7 +351,8 @@
 
 2005-02-02  Li Yuan  <li.yuan@sun.com>
 
-	* e-url-entry.c (init): add a11y name to url link button.
+	* e-url-entry.c: (init):
+	add a11y name to url link button.
 
 2005-01-26  Rodney Dawes  <dobey@novell.com>
 
@@ -486,7 +366,8 @@
 
 2005-01-24  Mengjie Yu  <meng-jie.yu@sun.com>
 
-	* e-search-bar.c (set_option): add a11y name for the option menu.
+	* e-search-bar.c: (set_option):
+	add a11y name for the option menu.
 
 2005-01-20  Not Zed  <NotZed@Ximian.com>
 
@@ -499,49 +380,47 @@
 
 2005-01-20  Harry Lu  <harry.lu@sun.com>
 
-	* e-search-bar.c (activate_by_subitems): add a translater note.
+	* e-search-bar.c: (activate_by_subitems): add a translater note.
 
 2005-01-19  Harry Lu  <harry.lu@sun.com>
 
 	Fix for 46359, enable "Alt+Down Arrow" to show the popup for
 	e-combo-cell-editable.c.
 
-	* e-combo-cell-editable.c (show_popup): rewrite it to a more
+	* e-combo-cell-editable.c: (show_popup): rewrite it to a more
 	generic function.
 	(button_clicked_cb): call the new show_popup function.
 	(entry_key_press_event_cb): show popup if "Alt+Down Arrow".
 	(ecce_grab_focus): new function.
-	(ecce_class_init): add grab_focus handler so that the entry can
-	get focus.
+	(ecce_class_init): add grab_focus handler so that the entry
+	can get focus.
 
 2005-01-17  Harry Lu  <harry.lu@sun.com>
 
 	Fix for 62831.
 
-	* e-search-bar.c (activate_by_subitems): add an a11y name for the
-	search entry.
+	* e-search-bar.c: (activate_by_subitems): add an a11y name for 
+	the search entry.
 
 2005-01-12 Chenthill Palanisamy <pchenthill@novell.com>
 
-	* e-send-options.c (e_send_options_get_widgets_data),
-	(e_send_options_fill_widgets_with_data): Get the value for the
-	autodelete toggle button
-	(page_changed_cb): Do not hide the classification label and its
-	combo box here.
+	* e-send-options.c: (e_send_options_get_widgets_data),
+	(e_send_options_fill_widgets_with_data): Get the value
+	for the autodelete toggle button
+	(page_changed_cb): Do not hide the classification label 
+	and its combo box here. 
 
 2005-01-10 Chenthill Palanisamy <pchenthill@novell.com>
 
-	* e-send-options.c (e_send_options_get_widgets_data),
-	(e_send_options_fill_widgets_with_data, page_changed_cb),
-	(init_widgets, get_widgets, setup_widgets),
-	(e_sendoptions_set_global, e_sendoptions_dialog_run),
-	(e_sendoptions_dialog_finalize, e_sendoptions_dialog_dispose),
-	(e_sendoptions_dialog_init, e_sendoptions_dialog_class_init),
-	(e_sendoptions_dialog_get_type): Added code to support global
-	options.  Filled the finalize and dispose functions.
-
+	* e-send-options.c: (e_send_options_get_widgets_data),
+	(e_send_options_fill_widgets_with_data), (page_changed_cb),
+	(init_widgets), (get_widgets), (setup_widgets),
+	(e_sendoptions_set_global), (e_sendoptions_dialog_run),
+	(e_sendoptions_dialog_finalize), (e_sendoptions_dialog_dispose),
+	(e_sendoptions_dialog_init), (e_sendoptions_dialog_class_init),
+	(e_sendoptions_dialog_get_type): Added code to support global options.
+	Filled the finalize and dispose functions.
 	* e-send-options.glade: Changed a label id.
-
 	* e-send-options.h: Added the set_global function.
 
 2005-01-06  JP Rosevear  <jpr@novell.com>
@@ -556,22 +435,18 @@
 2005-01-06 Chenthill Palanisamy <pchenthill@novell.com>
 	
 	merging send options
-
 	* Makefile.am:
-
 	* e-send-options.[ch]: Widgets for the send options dialog
-
 	* e-send-options.glade:	Contains interface for the dialog
 
 2005-01-04  Harry Lu  <harry.lu@sun.com>
 
-	* misc/e-combo-button.c (e_combo_button_popup): new internal
-	function to popup the menu.
+	* misc/e-combo-button.c: (e_combo_button_popup): new internal function
+	to popup the menu.
 	(impl_button_press_event): call the new function.
 	(e_combo_button_class_init): init a11y.
 	(e_combo_button_get_label): new function to return label.
 	(e_combo_button_popup_menu): new function to popup menu.
-
 	* misc/e-combo-button.h: add function declarations.
 
 2004-12-17  Not Zed  <NotZed@Ximian.com>
@@ -622,24 +497,24 @@
 
 2004-10-28  Li Yuan  <li.yuan@sun.com>
 
-	* e-calendar.c (e_calendar_init, e_calendar_new): Make
+	* e-calendar.c: (e_calendar_init), (e_calendar_new): Make
 	accessibility name and description translatable.  Add a atk name
 	for the two buttons so that they can be UI grabbed by GOK.
-
-	* e-dateedit.c (e_date_edit_new, create_children): Add a name for
-	atk object.  Make accessibility name and description translatable.
-	Add name and description for the date_entry, date_button and
-	time_combo.
+	
+	* e-dateedit.c: (e_date_edit_new), (create_children): Add a name
+	for atk object.  Make accessibility name and description
+	translatable.  Add name and description for the date_entry,
+	date_button and time_combo.
 	(e_date_edit_show_date_popup), (hide_date_popup): Grab and ungrab
 	keyboard.  add_relation(): New function to add labelled_by
 	relation for entry and combobox.
-
-	* e-map.c (e_map_new): Add a name for world map widget.  Make
+	
+	* e-map.c: (e_map_new): Add a name for world map widget.  Make
 	accessibility name and description translatable.  Set the atk role
 	to image.
-
-	* e-multi-config-dialog.c (e_multi_config_dialog_add_page): Add an
-	atk name for the page.
+	
+	* e-multi-config-dialog.c: (e_multi_config_dialog_add_page): Add
+	an atk name for the page.
 	
 2004-10-27  JP Rosevear  <jpr@novell.com>
 
@@ -656,16 +531,16 @@
 
 2004-10-08  Harry Lu  <harry.lu@sun.com>
 
-	* e-source-selector.c (e_source_selector_popup_menu),
-	(class_init): implement popup_menu so that popup menu can be shown
-	with Shift+F10.
+	* e-source-selector.c: (e_source_selector_popup_menu),
+	(class_init): implement popup_menu so that popup menu can
+	be shown with Shift+F10.
 
 2004-10-06  JP Rosevear  <jpr@novell.com>
  
  	Fixes #66164
  	
-	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): replicate
-	fix to e-cell-combo.c by NotZed
+ 	* e-cell-date-edit.c (e_cell_date_edit_get_popup_pos): replicate
+ 	fix to e-cell-combo.c by NotZed
 	
 2004-10-01  Not Zed  <NotZed@Ximian.com>
 
@@ -704,8 +579,8 @@
 
 2004-07-26  JP Rosevear  <jpr@novell.com>
  
-	* e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
-	search bar
+ 	* e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
+ 	search bar
 	
 2004-07-20  Not Zed  <NotZed@Ximian.com>
 
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog
index 8de153918c..01d6618e07 100644
--- a/widgets/table/ChangeLog
+++ b/widgets/table/ChangeLog
@@ -1,9 +1,3 @@
-2006-05-12  Hiroyuki Ikezoe  <poincare@ikezoe.net>
-
-	** Fixes bug #341530.
-	* e-table.h:
-	Removed duplicate delcaration of e_table_commi_click_to_add.
-
 2006-04-10  Jeff Cai <jeff.cai@sun.com>
 
 	** Fixes bug #327035
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
deleted file mode 100644
index 37ac85770f..0000000000
--- a/widgets/table/e-table-example-1.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-example-1.c
- * Copyright 2000, 2001, Ximian, Inc.
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License, version 2, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-/* This code is GPL. */
-#include <stdio.h>
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "gal/e-util/e-cursors.h"
-#include "e-table-simple.h"
-#include "e-table-header.h"
-#include "e-table-header-item.h"
-#include "e-table-item.h"
-#include "e-cell-text.h"
-#include "e-cell-checkbox.h"
-#include "e-table.h"
-
-#include "table-test.h"
-
-/*
- * One way in which we make it simpler to build an ETableModel is through
- * the ETableSimple class.  Instead of creating your own ETableModel
- * class, you simply create a new object of the ETableSimple class.  You
- * give it a bunch of functions that act as callbacks.
- * 
- * You also get to pass a void * to ETableSimple and it gets passed to
- * your callbacks.  This would be for having multiple models of the same
- * type.  This is just an example though, so we statically define all the
- * data and ignore the void *data parameter.
- * 
- * In our example we will be creating a table model with 6 columns and 10
- * rows.  This corresponds to having 6 different types of information and
- * 10 different sets of data in our database.
- * 
- * The headers will be hard coded, as will be the example data.
- *
- */
-
-/*
- * There are two different meanings to the word "column".  The first is
- * the model column.  A model column corresponds to a specific type of
- * data.  This is very much like the usage in a database table where a
- * column is a field in the database.
- *
- * The second type of column is a view column.  A view column
- * corresponds to a visually displayed column.  Each view column
- * corresponds to a specific model column, though a model column may
- * have any number of view columns associated with it, from zero to
- * greater than one.
- *
- * Also, a view column doesn't necessarily depend on only one model
- * column.  In some cases, the view column renderer can be given a
- * reference to another column to get extra information about its
- * display.
-*/
-
-#define ROWS 10
-#define COLS 4
-
-#define IMPORTANCE_COLUMN 4
-#define COLOR_COLUMN 5
-
-/*
- * Here we define the initial layout of the table.  This is an xml
- * format that allows you to change the initial ordering of the
- * columns or to do sorting or grouping initially.  This specification
- * shows all 5 columns, but moves the importance column nearer to the
- * front.  It also sorts by the "Full Name" column (ascending.)
- * Sorting and grouping take the model column as their arguments
- * (sorting is specified by the "column" argument to the leaf elemnt.
- */
-
-#define INITIAL_SPEC "<ETableSpecification>                    	       \
-	<columns-shown>                  			       \
-		<column> 0 </column>     			       \
-		<column> 4 </column>     			       \
-		<column> 1 </column>     			       \
-		<column> 2 </column>     			       \
-		<column> 3 </column>     			       \
-	</columns-shown>                 			       \
-	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>    \
-</ETableSpecification>"
-
-char *headers [COLS] = {
-  "Email",
-  "Full Name",
-  "Address",
-  "Phone"
-};
-
-/*
- * Virtual Column list:
- * 0   Email
- * 1   Full Name
- * 2   Address
- * 3   Phone
- */
-
-char *table_data [ROWS] [COLS];
-
-/*
- * ETableSimple callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-
-/*
- * Since our model is a constant size, we can just return its size in
- * the column and row count fields.
- */
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-my_col_count (ETableModel *etc, void *data)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-my_row_count (ETableModel *etc, void *data)
-{
-	return ROWS;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-my_value_at (ETableModel *etc, int col, int row, void *data)
-{
-	return (void *) table_data [row] [col];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data)
-{
-	g_free (table_data [row] [col]);
-	table_data [row] [col] = g_strdup (val);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-my_is_cell_editable (ETableModel *etc, int col, int row, void *data)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-my_duplicate_value (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup (value);
-}
-
-/* This function frees the value passed to it. */
-static void
-my_free_value (ETableModel *etc, int col, void *value, void *data)
-{
-	g_free (value);
-}
-
-/* This function creates an empty value. */
-static void *
-my_initialize_value (ETableModel *etc, int col, void *data)
-{
-	return g_strdup ("");
-}
-
-/* This function reports if a value is empty. */
-static gboolean
-my_value_is_empty (ETableModel *etc, int col, const void *value, void *data)
-{
-	return !(value && *(char *)value);
-}
-
-/* This function reports if a value is empty. */
-static char *
-my_value_to_string (ETableModel *etc, int col, const void *value, void *data)
-{
-	return g_strdup(value);
-}
-
-/* We create a window containing our new table. */
-static void
-create_table (void)
-{
-	GtkWidget *e_table, *window, *frame;
-	ECell *cell_left_just;
-	ETableHeader *e_table_header;
-	int i, j;
-	ETableModel *e_table_model = NULL;
-
-	/* First we fill in the simple data. */
-	for (i = 0; i < ROWS; i++){
-		for (j = 0; j < COLS; j++)
-			table_data [i] [j] = g_strdup ("");
-	}
-	/* Next we create our model.  This uses the functions we defined
-	   earlier. */
-	e_table_model = e_table_simple_new (
-					    my_col_count, my_row_count, my_value_at,
-					    my_set_value_at, my_is_cell_editable,
-					    my_duplicate_value, my_free_value, 
-					    my_initialize_value, my_value_is_empty,
-					    my_value_to_string,
-					    NULL);
-	/*
-	 * Next we create a header.  The ETableHeader is used in two
-	 * different way.  The first is the full_header.  This is the
-	 * list of possible columns in the view.  The second use is
-	 * completely internal.  Many of the ETableHeader functions are
-	 * for that purpose.  The only functions we really need are
-	 * e_table_header_new and e_table_header_add_col.
-	 *
-	 * First we create the header.
-	 */
-	e_table_header = e_table_header_new ();
-	
-	/*
-	 * Next we have to build renderers for all of the columns.
-	 * Since all our columns are text columns, we can simply use
-	 * the same renderer over and over again.  If we had different
-	 * types of columns, we could use a different renderer for
-	 * each column.
-	 */
-	cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT);
-		
-	/*
-	 * Next we create a column object for each view column and add
-	 * them to the header.  We don't create a column object for
-	 * the importance column since it will not be shown.
-	 */
-	for (i = 0; i < COLS; i++) {
-		/* Create the column. */
-		ETableCol *ecol = e_table_col_new (
-						   i, headers [i],
-						   1.0, 20, cell_left_just,
-						   g_str_compare, TRUE);
-		/* Add it to the header. */
-		e_table_header_add_column (e_table_header, ecol, i);
-	}
-
-	/*
-	 * Here we create a window for our new table.  This window
-	 * will get shown and the person will be able to test their
-	 * item.
-	 */
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	/* This frame is simply to get a bevel around our table. */
-	frame = gtk_frame_new (NULL);
-
-	/*
-	 * Here we create the table.  We give it the three pieces of
-	 * the table we've created, the header, the model, and the
-	 * initial layout.  It does the rest.
-	 */
-	e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC);
-
-	/* Build the gtk widget hierarchy. */
-	gtk_container_add (GTK_CONTAINER (frame), e_table);
-	gtk_container_add (GTK_CONTAINER (window), frame);
-
-	/* Size the initial window. */
-	gtk_widget_set_usize (window, 200, 200);
-
-	/* Show it all. */
-	gtk_widget_show_all (window);
-}
-
-/* This is the main function which just initializes gnome and call our create_table function */
-
-int
-main (int argc, char *argv [])
-{
-	gnome_init ("TableExample", "TableExample", argc, argv);
-	e_cursors_init ();
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	create_table ();
-	
-	gtk_main ();
-
-	e_cursors_shutdown ();
-	return 0;
-}
-