Merge branch 'master' into wip/gsettings

68 files changed, 7405 insertions, 7593 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index ea696f88b8..28b5b636fe 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2301,17 +2301,35 @@ set_address_label (EContact *contact,
                    EContactAddress *address)
 {
 	gchar *address_label = NULL;
+	gboolean format_address;
+	GConfClient *client;
+	GConfValue *value;
 
 	if (!address) {
 		e_contact_set (contact, field, NULL);
 		return;
 	}
 
-	address_label = eab_format_address (contact,
-				(field == E_CONTACT_ADDRESS_LABEL_WORK) ? E_CONTACT_ADDRESS_WORK :
-									  E_CONTACT_ADDRESS_HOME);
 
-	if (!address_label) {
+	client = gconf_client_get_default ();
+	value = gconf_client_get (client,
+		"/apps/evolution/addressbook/display/address_formatting", NULL);
+	g_object_unref (client);
+
+	if (value) {
+		format_address = gconf_value_get_bool (value);
+		gconf_value_free (value);
+	} else {
+		format_address = TRUE;
+	}
+
+	if (format_address) {
+		address_label = eab_format_address (contact,
+					(field == E_CONTACT_ADDRESS_LABEL_WORK) ? E_CONTACT_ADDRESS_WORK :
+										  E_CONTACT_ADDRESS_HOME);
+	}
+
+	if (!format_address || !address_label) {
 		address_label = append_to_address_label (
 			address_label, address->street, TRUE);
 		address_label = append_to_address_label (
@@ -3418,10 +3436,6 @@ image_clicked (GtkWidget *button,
 			GTK_DIALOG (editor->file_selector),
 			GTK_RESPONSE_ACCEPT);
 
-		gtk_file_chooser_set_current_folder (
-			GTK_FILE_CHOOSER (editor->file_selector),
-			g_get_home_dir ());
-
 		g_signal_connect (
 			editor->file_selector, "response",
 			G_CALLBACK (file_chooser_response), editor);
@@ -4097,7 +4111,9 @@ e_contact_editor_init (EContactEditor *e_contact_editor)
 	/* show window */
 	gtk_widget_show (e_contact_editor->app);
 
-	e_shell_watch_window (shell, GTK_WINDOW (e_contact_editor->app));
+	gtk_application_add_window (
+		GTK_APPLICATION (shell),
+		GTK_WINDOW (e_contact_editor->app));
 }
 
 static void
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 73bf421a65..d5eee61a87 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2113,17 +2113,14 @@ comp_editor_init (CompEditor *editor)
 		GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
 
 	widget = e_attachment_paned_new ();
+	e_attachment_paned_set_resize_toplevel (
+		E_ATTACHMENT_PANED (widget), TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (widget), 6);
 	gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
 	priv->attachment_view = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	if (express_mode) {
-		e_attachment_paned_set_expanded (
-			E_ATTACHMENT_PANED (widget), TRUE);
-		e_attachment_paned_set_expanded (
-			E_ATTACHMENT_PANED (widget), FALSE);
-
 		widget = e_attachment_paned_get_view_combo (
 			E_ATTACHMENT_PANED (widget));
 		gtk_widget_hide (widget);
@@ -2196,7 +2193,8 @@ comp_editor_init (CompEditor *editor)
 
 	comp_editor_bind_settings (editor);
 
-	e_shell_watch_window (shell, GTK_WINDOW (editor));
+	gtk_application_add_window (
+		GTK_APPLICATION (shell), GTK_WINDOW (editor));
 	e_shell_adapt_window_size (shell, GTK_WINDOW (editor));
 }
 
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 163270f24d..cd50f7a39b 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -218,8 +218,7 @@ action_save_as_cb (GtkAction *action,
 	gtk_window_set_icon_name (
 		GTK_WINDOW (dialog), "mail-message-new");
 
-	response = gtkhtml_editor_file_chooser_dialog_run (
-		GTKHTML_EDITOR (composer), dialog);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
 	if (response != GTK_RESPONSE_OK)
 		goto exit;
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 35eb26696b..69e3169de3 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -73,8 +73,6 @@
 	MAIL_GCONF_PREFIX "/composer"
 #define COMPOSER_GCONF_CHARSET_KEY \
 	COMPOSER_GCONF_PREFIX "/charset"
-#define COMPOSER_GCONF_CURRENT_FOLDER_KEY \
-	COMPOSER_GCONF_PREFIX "/current_folder"
 #define COMPOSER_GCONF_INLINE_SPELLING_KEY \
 	COMPOSER_GCONF_PREFIX "/inline_spelling"
 #define COMPOSER_GCONF_MAGIC_LINKS_KEY \
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index e58fd6fdf4..82bca68514 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -966,15 +966,13 @@ composer_build_message_thread (GSimpleAsyncResult *simple,
 	}
 
 	if (!composer_build_message_pgp (context, cancellable, &error)) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
+		g_simple_async_result_take_error (simple, error);
 		return;
 	}
 
 #if defined (HAVE_NSS)
 	if (!composer_build_message_smime (context, cancellable, &error)) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
+		g_simple_async_result_take_error (simple, error);
 		return;
 	}
 #endif /* HAVE_NSS */
@@ -1902,6 +1900,8 @@ static gboolean
 msg_composer_delete_event_cb (EMsgComposer *composer)
 {
 	EShell *shell;
+	GtkApplication *application;
+	GList *windows;
 
 	shell = e_msg_composer_get_shell (composer);
 
@@ -1910,7 +1910,10 @@ msg_composer_delete_event_cb (EMsgComposer *composer)
 	if (!gtk_action_group_get_sensitive (composer->priv->async_actions))
 		return TRUE;
 
-	if (g_list_length (e_shell_get_watched_windows (shell)) == 1) {
+	application = GTK_APPLICATION (shell);
+	windows = gtk_application_get_windows (application);
+
+	if (g_list_length (windows) == 1) {
 		/* This is the last watched window, use the quit
 		 * mechanism to have a draft saved properly */
 		e_shell_quit (shell, E_SHELL_QUIT_ACTION);
@@ -2092,8 +2095,10 @@ msg_composer_constructed (GObject *object)
 		object, "delete-event",
 		G_CALLBACK (msg_composer_delete_event_cb), NULL);
 
-	e_shell_adapt_window_size (shell, GTK_WINDOW (composer));
-	e_shell_watch_window (shell, GTK_WINDOW (object));
+	e_shell_adapt_window_size (shell, GTK_WINDOW (object));
+
+	gtk_application_add_window (
+		GTK_APPLICATION (shell), GTK_WINDOW (object));
 
 	g_signal_connect (
 		shell, "quit-requested",
@@ -2107,12 +2112,6 @@ msg_composer_constructed (GObject *object)
 
 	array = composer->priv->gconf_bridge_binding_ids;
 
-	binding_id = gconf_bridge_bind_property (
-		gconf_bridge_get (),
-		COMPOSER_GCONF_CURRENT_FOLDER_KEY,
-		G_OBJECT (composer), "current-folder");
-	g_array_append_val (array, binding_id);
-
 	binding_id = gconf_bridge_bind_window (
 		gconf_bridge_get (),
 		COMPOSER_GCONF_WINDOW_PREFIX,
@@ -4593,8 +4592,7 @@ composer_get_message_ready (EMsgComposer *composer,
 
 	if (error != NULL) {
 		g_warn_if_fail (message == NULL);
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
+		g_simple_async_result_take_error (simple, error);
 	}
 
 	g_simple_async_result_complete (simple);
diff --git a/configure.ac b/configure.ac
index 953c70e30b..b41b83e2ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Packages
 m4_define([glib_minimum_version], [2.30])
-m4_define([gtk_minimum_version], [3.0.2])
+m4_define([gtk_minimum_version], [3.2.0])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gtkhtml_minimum_version], [4.1.2])
 m4_define([gnome_desktop_minimum_version], [2.91.3])
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 131341980e..765bb28f8a 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -13,8 +13,6 @@ e_shell_get_gconf_client
 e_shell_create_shell_window
 e_shell_handle_uris
 e_shell_submit_alert
-e_shell_watch_window
-e_shell_get_watched_windows
 e_shell_get_active_window
 e_shell_get_meego_mode
 e_shell_get_express_mode
@@ -696,12 +694,9 @@ e_attachment_store_add_attachment
 e_attachment_store_remove_attachment
 e_attachment_store_add_to_multipart
 e_attachment_store_get_attachments
-e_attachment_store_get_current_folder_uri
-e_attachment_store_set_current_folder_uri
 e_attachment_store_get_num_attachments
 e_attachment_store_get_num_loading
 e_attachment_store_get_total_size
-e_attachment_store_run_file_chooser_dialog
 e_attachment_store_run_load_dialog
 e_attachment_store_run_save_dialog
 e_attachment_store_get_uris_async
diff --git a/doc/reference/shell/tmpl/e-attachment-store.sgml b/doc/reference/shell/tmpl/e-attachment-store.sgml
index 34884eacc5..e7d64e85b9 100644
--- a/doc/reference/shell/tmpl/e-attachment-store.sgml
+++ b/doc/reference/shell/tmpl/e-attachment-store.sgml
@@ -75,24 +75,6 @@ e-attachment-store
 @Returns: 
 
 
-<!-- ##### FUNCTION e_attachment_store_get_current_folder_uri ##### -->
-<para>
-
-</para>
-
-@store: 
-@Returns: 
-
-
-<!-- ##### FUNCTION e_attachment_store_set_current_folder_uri ##### -->
-<para>
-
-</para>
-
-@store: 
-@current_folder: 
-
-
 <!-- ##### FUNCTION e_attachment_store_get_num_attachments ##### -->
 <para>
 
@@ -120,16 +102,6 @@ e-attachment-store
 @Returns: 
 
 
-<!-- ##### FUNCTION e_attachment_store_run_file_chooser_dialog ##### -->
-<para>
-
-</para>
-
-@store: 
-@dialog: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_attachment_store_run_load_dialog ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 2badec4d7d..94c6e1169c 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -75,21 +75,6 @@ EShell
 @eshell: the object which received the signal.
 @Param2: 
 
-<!-- ##### SIGNAL EShell::window-created ##### -->
-<para>
-
-</para>
-
-@eshell: the object which received the signal.
-@arg1: 
-
-<!-- ##### SIGNAL EShell::window-destroyed ##### -->
-<para>
-
-</para>
-
-@eshell: the object which received the signal.
-
 <!-- ##### ARG EShell:express-mode ##### -->
 <para>
 
@@ -234,24 +219,6 @@ EShell
 @alert: 
 
 
-<!-- ##### FUNCTION e_shell_watch_window ##### -->
-<para>
-
-</para>
-
-@shell: 
-@window: 
-
-
-<!-- ##### FUNCTION e_shell_get_watched_windows ##### -->
-<para>
-
-</para>
-
-@shell: 
-@Returns: 
-
-
 <!-- ##### FUNCTION e_shell_get_active_window ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 21f8c4afcd..d8f54f7867 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -311,6 +311,21 @@ e-shell-window.sgml
 @eshell: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL EShell::window-created ##### -->
+<para>
+
+</para>
+
+@eshell: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EShell::window-destroyed ##### -->
+<para>
+
+</para>
+
+@eshell: the object which received the signal.
+
 <!-- ##### ARG EShellSearchbar:label-visible ##### -->
 <para>
 
@@ -500,6 +515,23 @@ e-shell-window.sgml
 @store: 
 @Returns: 
 
+<!-- ##### FUNCTION e_attachment_store_get_current_folder_uri ##### -->
+<para>
+
+</para>
+
+@store: 
+@Returns: 
+
+<!-- ##### FUNCTION e_attachment_store_run_file_chooser_dialog ##### -->
+<para>
+
+</para>
+
+@store: 
+@dialog: 
+@Returns: 
+
 <!-- ##### FUNCTION e_attachment_store_set_current_folder ##### -->
 <para>
 
@@ -508,6 +540,14 @@ e-shell-window.sgml
 @store: 
 @current_folder: 
 
+<!-- ##### FUNCTION e_attachment_store_set_current_folder_uri ##### -->
+<para>
+
+</para>
+
+@store: 
+@current_folder: 
+
 <!-- ##### FUNCTION e_binding_new ##### -->
 <para>
 
@@ -710,6 +750,14 @@ e-shell-window.sgml
 @shell_content: 
 @Returns: 
 
+<!-- ##### FUNCTION e_shell_get_watched_windows ##### -->
+<para>
+
+</para>
+
+@shell: 
+@Returns: 
+
 <!-- ##### FUNCTION e_shell_searchbar_get_label_visible ##### -->
 <para>
 
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index 3f5f85488a..ebb65f460e 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -93,8 +93,7 @@ file_replace_contents_cb (GFile *file,
 		context->new_etag = new_etag;
 	else {
 		g_warn_if_fail (new_etag == NULL);
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
+		g_simple_async_result_take_error (simple, error);
 	}
 
 	g_simple_async_result_complete (simple);
diff --git a/e-util/e-util.h b/e-util/e-util.h
index cb88a90644..1117781186 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -46,8 +46,6 @@ typedef enum {
 	E_FOCUS_END
 } EFocus;
 
-typedef void (*ETypeFunc) (GType type, gpointer user_data);
-
 const gchar *	e_get_accels_filename		(void);
 void		e_show_uri			(GtkWindow *parent,
 						 const gchar *uri);
diff --git a/help/C/minimize-to-system-tray.page b/help/C/minimize-to-system-tray.page
index 28e7d8d4b8..c8feccd41e 100644
--- a/help/C/minimize-to-system-tray.page
+++ b/help/C/minimize-to-system-tray.page
@@ -26,6 +26,6 @@
 
 <p>GNOME, by default, has a <link xref="mail-received-notification">notification area</link> which includes an applet that informs users of any system updates, changes, or events. This includes the arrival of email messages on Evolution. You can refer to this built-in feature of GNOME for any email notifications.</p>
 
-<p>In GNOME version 2 you may modify the notification area and set it up to become a system tray by using external software such as <link href="http://alltray.trausch.us/"> Alltray</link> that might be available for installation in the software management tool of your distribution. This is no longer possible in GNOME 3.</p>
+<p>In GNOME version 2 you may modify the notification area and set it up to become a system tray by using external software such as <link href="http://alltray.trausch.us/">Alltray</link> that might be available for installation in the software management tool of your distribution. This is no longer possible in GNOME 3.</p>
 </page>
 
diff --git a/help/es/es.po b/help/es/es.po
index 54fa12f50c..0cb8b76f19 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-help.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-28 01:15+0000\n"
-"PO-Revision-Date: 2011-09-28 15:55+0200\n"
+"POT-Creation-Date: 2011-10-07 15:03+0000\n"
+"PO-Revision-Date: 2011-10-08 15:42+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,6 +74,7 @@ msgstr "Usar y gestionar categorías para citas, contactos, notas y tareas."
 #: C/mail-receiving-options-imap-plus.page:11(name)
 #: C/mail-receiving-options-imap.page:11(name)
 #: C/mail-receiving-options-exchange-mapi.page:11(name)
+#: C/mail-receiving-options-exchange-ews.page:11(name)
 #: C/mail-receiving-options-evolution-exchange.page:11(name)
 #: C/mail-received-notification.page:11(name)
 #: C/mail-read-receipts.page:24(name)
@@ -85,8 +86,6 @@ msgstr "Usar y gestionar categorías para citas, contactos, notas y tareas."
 #: C/mail-filters.page:11(name) C/mail-filters-not-working.page:16(name)
 #: C/mail-filters-conditions.page:11(name)
 #: C/mail-filters-actions.page:11(name)
-#: C/mail-error-folder-mismatch.page:15(name)
-#: C/mail-error-failed-to-append-to-sent-folder.page:15(name)
 #: C/mail-encryption-s-mime-signing-encrypting.page:11(name)
 #: C/mail-encryption-s-mime-manage.page:11(name)
 #: C/mail-encryption.page:25(name)
@@ -162,10 +161,12 @@ msgstr "Usar y gestionar categorías para citas, contactos, notas y tareas."
 #: C/contacts-usage-delete-contact.page:11(name)
 #: C/contacts-usage-add-contact.page:11(name)
 #: C/contacts-searching.page:16(name) C/contacts-organizing.page:12(name)
-#: C/contacts-local.page:11(name) C/contacts-ldap.page:11(name)
-#: C/contacts-google.page:12(name) C/contacts-autocompletion.page:15(name)
+#: C/contacts-local.page:11(name) C/contacts-libreoffice.page:11(name)
+#: C/contacts-ldap.page:11(name) C/contacts-google.page:12(name)
+#: C/contacts-autocompletion.page:15(name)
 #: C/contacts-add-automatically.page:11(name)
-#: C/change-switcher-appearance.page:10(name) C/calendar-webdav.page:11(name)
+#: C/change-switcher-appearance.page:10(name)
+#: C/change-keyboard-shortcuts.page:9(name) C/calendar-webdav.page:11(name)
 #: C/calendar-weather.page:11(name)
 #: C/calendar-using-several-calendars.page:11(name)
 #: C/calendar-usage.page:12(name)
@@ -241,6 +242,7 @@ msgstr "Andre Klapper"
 #: C/mail-receiving-options-imap-plus.page:12(email)
 #: C/mail-receiving-options-imap.page:12(email)
 #: C/mail-receiving-options-exchange-mapi.page:12(email)
+#: C/mail-receiving-options-exchange-ews.page:12(email)
 #: C/mail-receiving-options-evolution-exchange.page:12(email)
 #: C/mail-received-notification.page:12(email)
 #: C/mail-read-receipts.page:25(email)
@@ -252,8 +254,6 @@ msgstr "Andre Klapper"
 #: C/mail-filters.page:12(email) C/mail-filters-not-working.page:17(email)
 #: C/mail-filters-conditions.page:12(email)
 #: C/mail-filters-actions.page:12(email)
-#: C/mail-error-folder-mismatch.page:16(email)
-#: C/mail-error-failed-to-append-to-sent-folder.page:16(email)
 #: C/mail-encryption-s-mime-signing-encrypting.page:12(email)
 #: C/mail-encryption-s-mime-manage.page:12(email)
 #: C/mail-encryption.page:26(email)
@@ -334,11 +334,13 @@ msgstr "Andre Klapper"
 #: C/contacts-usage-delete-contact.page:12(email)
 #: C/contacts-usage-add-contact.page:12(email)
 #: C/contacts-searching.page:17(email) C/contacts-organizing.page:13(email)
-#: C/contacts-local.page:12(email) C/contacts-ldap.page:12(email)
-#: C/contacts-google.page:13(email) C/contacts-autocompletion.page:16(email)
+#: C/contacts-local.page:12(email) C/contacts-libreoffice.page:12(email)
+#: C/contacts-ldap.page:12(email) C/contacts-google.page:13(email)
+#: C/contacts-autocompletion.page:16(email)
 #: C/contacts-add-automatically.page:12(email)
 #: C/change-switcher-appearance.page:11(email)
-#: C/calendar-webdav.page:12(email) C/calendar-weather.page:12(email)
+#: C/change-keyboard-shortcuts.page:10(email) C/calendar-webdav.page:12(email)
+#: C/calendar-weather.page:12(email)
 #: C/calendar-using-several-calendars.page:12(email)
 #: C/calendar-usage.page:13(email)
 #: C/calendar-usage-edit-appointment.page:12(email)
@@ -478,6 +480,7 @@ msgstr "Novell, Inc"
 #: C/mail-receiving-options-imap-plus.page:18(p)
 #: C/mail-receiving-options-imap.page:18(p)
 #: C/mail-receiving-options-exchange-mapi.page:15(p)
+#: C/mail-receiving-options-exchange-ews.page:15(p)
 #: C/mail-receiving-options-evolution-exchange.page:18(p)
 #: C/mail-received-notification.page:15(p) C/mail-read-receipts.page:28(p)
 #: C/mail-reading-keyboard-shortcuts.page:19(p) C/mail-organizing.page:16(p)
@@ -487,9 +490,6 @@ msgstr "Novell, Inc"
 #: C/mail-follow-up-flag.page:18(p) C/mail-folders.page:23(p)
 #: C/mail-filters.page:18(p) C/mail-filters-not-working.page:20(p)
 #: C/mail-filters-conditions.page:18(p) C/mail-filters-actions.page:18(p)
-#: C/mail-error-no-provider-available.page:15(p)
-#: C/mail-error-folder-mismatch.page:19(p)
-#: C/mail-error-failed-to-append-to-sent-folder.page:19(p)
 #: C/mail-encryption-s-mime-signing-encrypting.page:18(p)
 #: C/mail-encryption-s-mime-manage.page:18(p) C/mail-encryption.page:29(p)
 #: C/mail-encryption-gpg-signing-encrypting.page:18(p)
@@ -560,10 +560,11 @@ msgstr "Novell, Inc"
 #: C/contacts-usage-delete-contact.page:15(p)
 #: C/contacts-usage-add-contact.page:15(p) C/contacts-searching.page:23(p)
 #: C/contacts-organizing.page:16(p) C/contacts-local.page:15(p)
-#: C/contacts-ldap.page:18(p) C/contacts-google.page:16(p)
-#: C/contacts-autocompletion.page:22(p)
+#: C/contacts-libreoffice.page:15(p) C/contacts-ldap.page:18(p)
+#: C/contacts-google.page:16(p) C/contacts-autocompletion.page:22(p)
 #: C/contacts-add-automatically.page:19(p)
-#: C/change-switcher-appearance.page:14(p) C/calendar-webdav.page:15(p)
+#: C/change-switcher-appearance.page:14(p)
+#: C/change-keyboard-shortcuts.page:13(p) C/calendar-webdav.page:15(p)
 #: C/calendar-weather.page:15(p) C/calendar-using-several-calendars.page:18(p)
 #: C/calendar-usage.page:16(p) C/calendar-usage-edit-appointment.page:15(p)
 #: C/calendar-usage-delete-appointment.page:15(p)
@@ -759,11 +760,7 @@ msgid "Optionally choose a color that you prefer."
 msgstr "Opcionalmente, elija un color."
 
 #: C/tasks-webdav.page:30(p) C/tasks-caldav.page:28(p)
-#: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
-#: C/calendar-weather.page:30(p) C/calendar-google.page:32(p)
-#: C/calendar-caldav.page:31(p)
-msgid ""
-"Choose if you want to be able to view the content also when being offline."
+msgid "Choose if you want to be able to view the content also while offline."
 msgstr ""
 "Elija si quiere poder ver el contenido incluso cuando está desconectado."
 
@@ -810,13 +807,13 @@ msgstr "Usar varias listas de tareas o listas de notas"
 msgid ""
 "You can have multiple task or memo lists and choose which of your lists get "
 "displayed. For example, you might have tasks for work, tasks for home, and "
-"tasks for the singing club that you are a member of. The side bar lists "
-"those lists, and you can select or deselect any of the boxes next to them to "
+"tasks for the singing club of which you are a member. The side bar shows "
+"these lists, and you can select or deselect any of the boxes next to them to "
 "show and hide the corresponding tasks or memos in your view."
 msgstr ""
 "Puede tener múltiples listas de tareas o notas y elegir qué listas se "
-"muestran. Por ejemplo, puede tener una tarea para trabajo, tareas para casa "
-"y tareas para el club de canto al que pertenece. La barra lateral lista esas "
+"muestran. Por ejemplo, puede tener tareas para trabajo, tareas para casa y "
+"tareas para el club de canto al que pertenece. La barra lateral muestra esas "
 "listas y puede seleccionar o deseleccionar las cajas junto a ellas para "
 "mostrar y ocultar las tareas o notas correspondientes en la vista."
 
@@ -1542,7 +1539,7 @@ msgstr "Cómo informar de un error"
 msgid ""
 "If you do not need help for configuration but you are sure that you have "
 "found a mistake or wrong behavior in the Evolution software, or if you want "
-"to request a feature you can file a report in the <link href=\"http://"
+"to request a feature, you can file a report in the <link href=\"http://"
 "bugzilla.gnome.org\">GNOME bug tracking system</link>. Note that this "
 "requires registration first. Please try to avoid filing duplicates and check "
 "the <link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html"
@@ -1573,11 +1570,19 @@ msgstr ""
 "errores su distribución con GNOME</link> en su lugar."
 
 #: C/problems-reporting-bugs.page:25(p)
+#| msgid ""
+#| "When reporting bugs exact information is welcome as it makes it easier "
+#| "for others to reproduce and fix the issue. If possible please include "
+#| "information such as the Evolution version (under <guiseq><gui>Help</"
+#| "gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to "
+#| "reproduce the problem, click by click. See the <link href=\"https://"
+#| "bugzilla.gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</"
+#| "link> for more information."
 msgid ""
 "When reporting bugs exact information is welcome as it makes it easier for "
 "others to reproduce and fix the issue. If possible please include "
 "information such as the Evolution version (under <guiseq><gui>Help</"
-"gui><gui>Contents</gui></guiseq>), your distribution, and exact steps to "
+"gui><gui>About</gui></guiseq>), your distribution, and exact steps to "
 "reproduce the problem, click by click. See the <link href=\"https://bugzilla."
 "gnome.org/page.cgi?id=bug-writing.html\">Bug Writing Guidelines</link> for "
 "more information."
@@ -1585,7 +1590,7 @@ msgstr ""
 "La información exacta es bienvenida al informar de errores, ya que hace más "
 "sencillo a los demás reproducir el error y solucionarlo. Si es posible, "
 "incluya la información de la versión de Evolution (bajo <guiseq><gui>Ayuda</"
-"gui><gui>�ndice</gui></guiseq>), su distribución y los pasos exactos para "
+"gui><gui>Acerca de</gui></guiseq>), su distribución y los pasos exactos para "
 "reproducir el problema paso a paso. Para obtener más información consulte la "
 "<link href=\"https://bugzilla.gnome.org/page.cgi?id=bug-writing.html\">guía "
 "para informar de un error</link>."
@@ -1668,11 +1673,7 @@ msgstr "Acerca de minimizar Evolution al área de notificación."
 #: C/mail-recognized-thread-related-headers.page:11(name)
 #: C/mail-read-receipts.page:20(name) C/mail-not-sent.page:11(name)
 #: C/mail-moving-emails.page:11(name) C/mail-folders.page:16(name)
-#: C/mail-filters-not-working.page:12(name)
-#: C/mail-error-no-provider-available.page:11(name)
-#: C/mail-error-folder-mismatch.page:11(name)
-#: C/mail-error-failed-to-append-to-sent-folder.page:11(name)
-#: C/mail-duplicates.page:11(name)
+#: C/mail-filters-not-working.page:12(name) C/mail-duplicates.page:11(name)
 #: C/mail-displaying-images-in-html.page:16(name)
 #: C/mail-access-gmail-pop-account.page:13(name)
 #: C/deleting-emails.page:12(name)
@@ -1689,11 +1690,7 @@ msgstr "April Gonzales"
 #: C/mail-recognized-thread-related-headers.page:12(email)
 #: C/mail-read-receipts.page:21(email) C/mail-not-sent.page:12(email)
 #: C/mail-moving-emails.page:12(email) C/mail-folders.page:17(email)
-#: C/mail-filters-not-working.page:13(email)
-#: C/mail-error-no-provider-available.page:12(email)
-#: C/mail-error-folder-mismatch.page:12(email)
-#: C/mail-error-failed-to-append-to-sent-folder.page:12(email)
-#: C/mail-duplicates.page:12(email)
+#: C/mail-filters-not-working.page:13(email) C/mail-duplicates.page:12(email)
 #: C/mail-displaying-images-in-html.page:17(email)
 #: C/mail-access-gmail-pop-account.page:14(email)
 #: C/deleting-emails.page:13(email)
@@ -1719,15 +1716,21 @@ msgstr ""
 "usar esta característica de GNOME par acualquier notificación de correo."
 
 #: C/minimize-to-system-tray.page:29(p)
+#| msgid ""
+#| "In GNOME version 2 you may modify the notification area and set it up to "
+#| "become a system tray by using external software such as <link href="
+#| "\"http://alltray.trausch.us/\"> Alltray</link> that might be available "
+#| "for installation in the software management tool of your distribution. "
+#| "This is no longer possible in GNOME 3."
 msgid ""
 "In GNOME version 2 you may modify the notification area and set it up to "
 "become a system tray by using external software such as <link href=\"http://"
-"alltray.trausch.us/\"> Alltray</link> that might be available for "
+"alltray.trausch.us/\">Alltray</link> that might be available for "
 "installation in the software management tool of your distribution. This is "
-"not possible in GNOME 3 anymore."
+"no longer possible in GNOME 3."
 msgstr ""
 "En la versión 2 de GNOME podía modificar el área de notificación y "
-"configurarlo para que fuese una bandeja del sistema usando software externo "
+"configurarla para que fuese una bandeja del sistema usando software externo "
 "tal como <link href=\"http://alltray.trausch.us/\">Alltray</link>, que puede "
 "estar disponible para su instalación en la herramienta de gestión de "
 "software de su distribución. Esto ya no es posible en GNOME 3."
@@ -2055,7 +2058,7 @@ msgid ""
 "Evolution automatically understands the network state and acts accordingly. "
 "For instance, Evolution switches to offline mode when the network goes down "
 "and automatically switches on when the network is up again. Ensure that your "
-"system has Network Manager installed on to enable this feature."
+"system has Network Manager installed to enable this feature."
 msgstr ""
 "Evolution entiende automáticamente el estado de la red y actúa en "
 "concordancia. Por ejemplo, Evolution cambia a modo desconectado cuando la "
@@ -3007,21 +3010,26 @@ msgid "Force sending and receiving emails."
 msgstr "Forzar la recepción y envío de correos."
 
 #: C/mail-send-and-receive-manual.page:20(title)
-msgid "Manually send and receive message"
-msgstr "Enviar y recibir manualmente mensajes"
+msgid "Manually send and receive messages"
+msgstr "Enviar y recibir mensajes manualmente"
 
 #: C/mail-send-and-receive-manual.page:21(p)
+#| msgid ""
+#| "To receive new messages from the mail server and to send messages you "
+#| "have written that are in the local Outbox, click the <gui style=\"button"
+#| "\">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or "
+#| "choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from "
+#| "the main menu."
 msgid ""
 "To receive new messages from the mail server and to send messages you have "
 "written that are in the local Outbox, click the <gui style=\"button\">Send / "
 "Receive</gui> button in the toolbar, or press <key>F9</key>, or choose "
-"<guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main "
-"menu."
+"<guiseq><gui>File</gui><gui>Send / Receive</gui></guiseq> from the main menu."
 msgstr ""
 "Para recibir los mensajes nuevos del servidor y para enviar los mensajes que "
 "haya escrito en la Bandeja de salida local, pulse el botón <gui style="
 "\"button\">Enviar / Recibir</gui> en la barra de herramientas, pulse "
-"<key>F9</key>, o elija <guiseq><gui>Archivo</gui><gui>Enviar / Recibir</"
+"<key>F9</key>, o pulse <guiseq><gui>Archivo</gui><gui>Enviar / Recibir</"
 "gui></guiseq> en el menú principal."
 
 #: C/mail-send-and-receive-manual.page:22(p)
@@ -3753,6 +3761,7 @@ msgstr "Opciones de recepción de noticias de Usenet"
 #: C/mail-receiving-options-imap-plus.page:26(title)
 #: C/mail-receiving-options-imap.page:26(title)
 #: C/mail-receiving-options-exchange-mapi.page:23(title)
+#: C/mail-receiving-options-exchange-ews.page:23(title)
 #: C/mail-receiving-options-evolution-exchange.page:26(title)
 #: C/intro-first-run.page:36(title)
 msgid "Receiving Email"
@@ -3769,6 +3778,7 @@ msgstr "Recepción de correo"
 #: C/mail-receiving-options-imap-plus.page:28(p)
 #: C/mail-receiving-options-imap.page:28(p)
 #: C/mail-receiving-options-exchange-mapi.page:25(p)
+#: C/mail-receiving-options-exchange-ews.page:25(p)
 #: C/mail-receiving-options-evolution-exchange.page:28(p)
 msgid ""
 "On the <gui>Receiving Email</gui> page (accessible via <guiseq><gui>Edit</"
@@ -3816,6 +3826,7 @@ msgstr "Debería activar esta opción si su servidor la soporta."
 #: C/mail-receiving-options-imap-plus.page:34(p)
 #: C/mail-receiving-options-imap.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:31(p)
+#: C/mail-receiving-options-exchange-ews.page:31(p)
 #: C/mail-receiving-options-evolution-exchange.page:35(p)
 msgid ""
 "Select your authentication type in the Authentication list, or click <gui "
@@ -3849,6 +3860,7 @@ msgstr "Marque si quiere que Evolution recuerde su contraseña."
 #: C/mail-receiving-options-imap-plus.page:41(title)
 #: C/mail-receiving-options-imap.page:41(title)
 #: C/mail-receiving-options-exchange-mapi.page:39(title)
+#: C/mail-receiving-options-exchange-ews.page:37(title)
 #: C/mail-receiving-options-evolution-exchange.page:42(title)
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
@@ -3864,6 +3876,7 @@ msgstr "Opciones de recepción"
 #: C/mail-receiving-options-imap-plus.page:43(p)
 #: C/mail-receiving-options-imap.page:43(p)
 #: C/mail-receiving-options-exchange-mapi.page:41(p)
+#: C/mail-receiving-options-exchange-ews.page:39(p)
 #: C/mail-receiving-options-evolution-exchange.page:44(p)
 msgid ""
 "On the <gui>Receiving Options</gui> page (accessible via <guiseq><gui>Edit</"
@@ -3885,6 +3898,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:46(p)
 #: C/mail-receiving-options-imap.page:46(p)
 #: C/mail-receiving-options-exchange-mapi.page:44(p)
+#: C/mail-receiving-options-exchange-ews.page:42(p)
 #: C/mail-receiving-options-evolution-exchange.page:47(p)
 msgid ""
 "If you want Evolution to check automatically for new messages, click the "
@@ -3932,6 +3946,7 @@ msgstr ""
 #: C/mail-receiving-options-imap-plus.page:58(p)
 #: C/mail-receiving-options-imap.page:57(p)
 #: C/mail-receiving-options-exchange-mapi.page:52(p)
+#: C/mail-receiving-options-exchange-ews.page:52(p)
 #: C/mail-receiving-options-evolution-exchange.page:58(p)
 msgid ""
 "If you came to this page from the first-run wizard help page, click <link "
@@ -4061,6 +4076,7 @@ msgstr "Opciones de recepción para Novell Groupwise"
 
 #: C/mail-receiving-options-novell-groupwise.page:34(p)
 #: C/mail-receiving-options-exchange-mapi.page:30(p)
+#: C/mail-receiving-options-exchange-ews.page:30(p)
 #: C/mail-receiving-options-evolution-exchange.page:34(p)
 msgid ""
 "If you are in an organizational environment, you may want to contact your "
@@ -4189,6 +4205,7 @@ msgstr ""
 "Pulse <gui style=\"button\">Autenticar</gui> e introduzca su contraseña."
 
 #: C/mail-receiving-options-exchange-mapi.page:45(p)
+#: C/mail-receiving-options-exchange-ews.page:43(p)
 #: C/mail-receiving-options-evolution-exchange.page:48(p)
 msgid ""
 "You can also define if Evolution checks for new messages in all folders."
@@ -4196,6 +4213,54 @@ msgstr ""
 "También puede definir si quiere que Evolution compruebe si hay mensajes "
 "nuevos en todas las carpetas."
 
+#: C/mail-receiving-options-exchange-ews.page:5(desc)
+#| msgid "Receiving options for Exchange MAPI accounts."
+msgid "Receiving options for Exchange Web Services accounts."
+msgstr "Opciones de recepción para cuentas Exchange Web Services."
+
+#: C/mail-receiving-options-exchange-ews.page:20(title)
+#| msgid "Exchange MAPI receiving options"
+msgid "Exchange Web Services receiving options"
+msgstr "Opciones de recepción Exchange Web Services"
+
+#: C/mail-receiving-options-exchange-ews.page:28(p)
+#: C/mail-receiving-options-evolution-exchange.page:31(p)
+msgid "Enter your username for that server."
+msgstr "Introduzca su nombre de usuario para ese servidor."
+
+#: C/mail-receiving-options-exchange-ews.page:29(p)
+msgid ""
+"Either manually enter the Host URL and OAB URL, or click <gui style=\"button"
+"\">Fetch URL</gui> which will ask you for your password and then try to "
+"automatically fill in the values."
+msgstr ""
+"Introduzca el URL del servidor y el URL OAB o pulse <gui style=\"button"
+"\">Obtener URL</gui> que le preguntará una contraseña y después inententará "
+"rellenar automáticamente los valores."
+
+#: C/mail-receiving-options-exchange-ews.page:44(p)
+msgid ""
+"If you would like to have a copy of the address book on the server for "
+"offline access to it, enable <gui>Cache offline address book</gui> and click "
+"<gui style=\"button\">Fetch list</gui>. Afterwards, select the address book "
+"from the available options."
+msgstr ""
+"Si quiere tener una copia de su libreta de direcciones del el servidor, para "
+"acceder a ella cuento esté desconectado, active <gui>Cachear libreta de "
+"direcciones para uso desconectado</gui> y pulse <gui style=\"button"
+"\">Obtener lista</gui>. Después, seleccione la libreta de direcciones de las "
+"opciones dispobibles."
+
+#: C/mail-receiving-options-exchange-ews.page:45(p)
+msgid ""
+"If you want <link xref=\"mail-filters\">Filters</link> to be automatically "
+"used for new messages in your inbox, enable <gui>Apply filters to new "
+"messages in Inbox on this server</gui>."
+msgstr ""
+"Si quiere que los <link xref=\"mail-filters\">Filtros</link> se usen "
+"automáticamente para los correos nuevos en su Bandeja de entrada, active "
+"<gui>Aplicar filtros a los mensajes nuevos en la bandeja de entrada</gui>."
+
 #: C/mail-receiving-options-evolution-exchange.page:5(desc)
 msgid "Receiving options for Evolution Exchange accounts."
 msgstr "Opciones de recepción para cuentas de Evolution Exchange."
@@ -4204,10 +4269,6 @@ msgstr "Opciones de recepción para cuentas de Evolution Exchange."
 msgid "Evolution Exchange receiving options"
 msgstr "Opciones de recepción de Microsoft Exchange"
 
-#: C/mail-receiving-options-evolution-exchange.page:31(p)
-msgid "Enter your username for that server."
-msgstr "Introduzca su nombre de usuario para ese servidor."
-
 #: C/mail-receiving-options-evolution-exchange.page:32(p)
 msgid "Enter the OWA URL for that server."
 msgstr "Introduzca el URL del OWA para ese servidor."
@@ -4282,12 +4343,12 @@ msgstr "Notificar la recepción de correo nuevo"
 #: C/mail-received-notification.page:22(p)
 msgid ""
 "Evolution always notifies you of new messages by adding a yellow star to the "
-"mailer icon in the window <link xref=\"change-switcher-appearance.page"
+"mailer icon in the window <link xref=\"change-switcher-appearance"
 "\">switcher</link>."
 msgstr ""
 "Evolution siempre le notifica nuevos correos añadiendo una estrella amarilla "
-"al icono del correo en la ventana del <link xref=\"change-switcher-"
-"appearance.page\">selector</link>."
+"al icono del correo en la ventana del <link xref=\"change-switcher-appearance"
+"\">selector</link>."
 
 #: C/mail-received-notification.page:25(p)
 #: C/mail-received-notification.page:30(p)
@@ -4295,8 +4356,14 @@ msgid "Switcher layout when a new message has arrived"
 msgstr "Distribución del selector cuando llega un correo nuevo"
 
 #: C/mail-received-notification.page:28(p)
-msgid ""
-"In order to get also notified of new messages in the GNOME Notification area "
+#| msgid ""
+#| "In order to get also notified of new messages in the GNOME Notification "
+#| "area at the bottom of the screen, make sure that <guiseq><gui>Edit</"
+#| "gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled "
+#| "and that you have set your preferred options in the <gui>Configuration</"
+#| "gui> tab."
+msgid ""
+"In order to also be notified of new messages in the GNOME Notification area "
 "at the bottom of the screen, make sure that <guiseq><gui>Edit</"
 "gui><gui>Plugins</gui><gui>Mail Notification</gui></guiseq> is enabled and "
 "that you have set your preferred options in the <gui>Configuration</gui> tab."
@@ -4780,9 +4847,9 @@ msgstr "Cabeceras básicas y de listas de correo (predeterminadas):"
 msgid ""
 "Enable this option to have filters based on mailing list headers (like list "
 "ID) so that in addition to the basic headers, the headers that correspond to "
-"mailing-lists are also fetched. Mailing list headers will have the "
-"informations such as the mailinglist-ID, owner of the mailing list, and so "
-"on with which you can create mailing list filters."
+"mailing-lists are also fetched. Mailing list headers will have information "
+"such as the mailinglist-ID, owner of the mailing list, and so on with which "
+"you can create mailing list filters."
 msgstr ""
 "Active esta opción para tener filtros basados en las cabeceras de las listas "
 "de correo (como id-lista) además de las cabeceras básicas, se obtendrán "
@@ -5093,15 +5160,15 @@ msgstr ""
 #: C/mail-filters.page:27(p)
 msgid ""
 "Filters will be automatically applied to incoming messages for local "
-"accounts (such as POP). Mail serves for remote accounts (such as IMAP) often "
-"already filter mail directly on the server as this is faster. If you want to "
-"apply your Evolution filters to remote accounts, you can enable this under "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
+"accounts (such as POP). Mail servers for remote accounts (such as IMAP) "
+"often already filter mail directly on the server as this is faster. If you "
+"want to apply your Evolution filters to remote accounts, you can enable this "
+"under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</"
 "gui><gui>Edit</gui><gui>Receiving Options</gui><gui>Options</gui><gui>Apply "
 "filters to new messages in Inbox on this server</gui></guiseq>."
 msgstr ""
 "Los filtros se aplicarán automáticamente a los correos entrantes para las "
-"cuentas locales (tales como POP). A menudo el correo en cuuentas de "
+"cuentas locales (tales como POP). A menudo el correo en cuentas de "
 "servidores remotos (tales como IMAP) se filtra directamente en el servidor "
 "ya que es más rápido. Si quiere aplicar sus filtros de Evolution en cuentas "
 "remotas puede hacerlo bajo <guiseq><gui>Editar</gui><gui>Preferencias</"
@@ -5493,218 +5560,6 @@ msgstr "Reenviar a:"
 msgid "Forwards the message to another email address."
 msgstr "Reenvía el correo a otra dirección de correo-e."
 
-#: C/mail-error-no-provider-available.page:5(desc)
-#: C/mail-error-folder-mismatch.page:5(desc)
-#: C/mail-error-failed-to-append-to-sent-folder.page:5(desc)
-msgid "What to do when this error is shown."
-msgstr "Qué hacer cuando se muestra este error."
-
-#: C/mail-error-no-provider-available.page:20(title)
-msgid "Error message \"No provider available for protocol email\""
-msgstr ""
-"Mensaje de error «No hay proveedor disponible para el protocolo de correo»"
-
-#: C/mail-error-no-provider-available.page:22(p)
-msgid "This error message may be displayed for a number of reasons:"
-msgstr "Este mensaje se puede mostrar por cierto número de motivos:"
-
-#: C/mail-error-no-provider-available.page:26(p)
-msgid "The filters used do not match the account they are associated with."
-msgstr ""
-"Los filtros usados no coinciden con la cuenta a la que están asociados."
-
-#: C/mail-error-no-provider-available.page:27(p)
-msgid ""
-"This happens when the <file>filters.xml</file> file is copied and used on a "
-"fresh install of Evolution on a new machine."
-msgstr ""
-"Esto sucede cuando el archivo <file>filters.xml</file> se copia y usa en una "
-"instalación nueva de Evolution en un equipo nuevo."
-
-#: C/mail-error-no-provider-available.page:28(p)
-msgid ""
-"Accounts have unique ID numbers, and filters refer to these accounts "
-"directly. Simply copying the <file>filters.xml</file> file will cause a "
-"version mismatch with Evolution, affecting the filter rules."
-msgstr ""
-"Las cuentas tienen números de identificación (ID) únicos y los filtros se "
-"refieren a esas cuentas directamente. Copiar el archivo <file>filters.xml</"
-"file> hará que exista un error de versión en Evolution que afectará a las "
-"reglas."
-
-#: C/mail-error-no-provider-available.page:31(p)
-msgid "The account settings may not have been copied properly."
-msgstr ""
-"Puede que la configuración de la cuenta no se haya copiado correctamente."
-
-#: C/mail-error-no-provider-available.page:32(p)
-msgid "The account settings were modified."
-msgstr "Se modificó la configuración de la cuenta."
-
-#: C/mail-error-no-provider-available.page:35(p)
-msgid ""
-"To fix this problem, edit the email filters and re-select the folder for "
-"each Copy/Move filter. To do this:"
-msgstr ""
-"Para solucionar este problema edite los filtros de correo y vuelva a "
-"seleccionar la carpeta para cada filtro de Copiar/mover. Para ello:"
-
-#: C/mail-error-no-provider-available.page:37(p)
-msgid "Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
-msgstr ""
-"Vaya a <guiseq><gui>Editar</gui><gui>Filtros de mensajes</gui></guiseq>."
-
-#: C/mail-error-no-provider-available.page:38(p)
-msgid "Select the Copy/Move filter and click <gui>Edit</gui>."
-msgstr "Seleccione el filtro Copiar-Mover y pulse <gui>Editar</gui>."
-
-#: C/mail-error-no-provider-available.page:39(p)
-msgid ""
-"Refer to the list of folders associated with that particular filter. Click "
-"on the button that allows you to modify the folders assigned for that "
-"filter. Set the folders again."
-msgstr ""
-"Consulte la lista de las carpetas asociadas con ese filtro en particular. "
-"Pulse el botón que le permite modificar las carpetas asignadas para ese "
-"filtro. Configure de nuevo las carpetas."
-
-#: C/mail-error-no-provider-available.page:43(p)
-msgid ""
-"Advanced users may also be interested in this write up: <link href=\"https://"
-"thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep the Evolution "
-"filters in sync on multiple machines by Thomas Vander Stichele </link>"
-msgstr ""
-"Los usuarios avanzados tambień pueden estar interesados en este escrito: "
-"<link href=\"https://thomas.apestaart.org/thomas/trac/wiki/Evolution\">cómo "
-"mantener sincronizados los filtros de Evolution en varios equipos, por "
-"Thomas Vander Stichele</link>."
-
-#: C/mail-error-folder-mismatch.page:24(title)
-msgid ""
-"Error message \"Summary and folder mismatch\" after synchronizing folders"
-msgstr ""
-"Mensaje de error «El resumen y la carpeta no coinciden» después de "
-"sincronizar las carpetas"
-
-#: C/mail-error-folder-mismatch.page:26(p)
-msgid ""
-"If the error message: <gui>Error while Expunging folder. Error storing `~/."
-"local/share/evolution/mail/local/Inbox (mbox)': Summary and folder mismatch, "
-"even after a sync.</gui> pops up, perform the following steps:"
-msgstr ""
-"Si aparece el siguiente mensaje: <gui>Error while Expunging folder. Error "
-"storing `~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and "
-"folder mismatch, even after a sync.</gui>, realice los siguientes pasos:"
-
-#: C/mail-error-folder-mismatch.page:28(p)
-msgid ""
-"These steps apply to the versions 3.0 and 3.2. Note that Evolution's file "
-"locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</"
-"file> instead of <file>~/.local/share/evolution/mail/local/</file>)."
-msgstr ""
-"Estos pasos se aplican en las versiones 3.0 y 3.2. Tenga en cuenta que la "
-"ubicación de los archivos de Evolution en las versiones 2.30 y 2.32 son "
-"diferentes (<file>~/.evolution/mail/local/</file> en lugar de <file>~/.local/"
-"share/evolution/mail/local/</file>)."
-
-#: C/mail-error-folder-mismatch.page:31(p)
-msgid ""
-"Open the Terminal application (category <gui>System Tools</gui>) and type in "
-"the command <code>evolution --force-shutdown</code>. This command stops "
-"Evolution and all the processes related to it."
-msgstr ""
-"Abra la aplicación de la Terminal (categoría <gui>Herramientas del sistema) "
-"y escriba el comando <code>evolution --force-shutdown</code>. Este comando "
-"detiene Evolution y todos los procesos relacionados con él."
-
-#: C/mail-error-folder-mismatch.page:32(p)
-msgid "Remove the files ending in:"
-msgstr "Quite los archivos que terminan en:"
-
-#: C/mail-error-folder-mismatch.page:34(file)
-msgid ".ev-summary"
-msgstr ".ev-summary"
-
-#: C/mail-error-folder-mismatch.page:35(file)
-msgid ".ibex.index"
-msgstr ".ibex.index"
-
-#: C/mail-error-folder-mismatch.page:37(p)
-msgid ""
-"To do this, navigate to the hidden directory <file>~/.local/share/evolution/"
-"mail/local/</file> and locate the specified files. You can do this in the "
-"GNOME File Manager (Nautilus) by either showing hidden files, or by entering "
-"the directory via <guiseq><gui>Go</gui><gui>Location...</gui></guiseq> from "
-"the menu bar."
-msgstr ""
-"Para ello, navegue por la carpeta oculta <file>~/.local/share/evolution/mail/"
-"local/</file> y localice los archivos especificados. Puede hacerlo desde el "
-"Gestor de archivos de GNOME (Nautilus) mostrando los archivos ocultos o bien "
-"introduciendo la dirección usando <guiseq><gui>Ir</gui><gui>Ubicación...</"
-"gui></guiseq> desde la barra de menú."
-
-#: C/mail-error-folder-mismatch.page:40(p)
-msgid ""
-"Restart Evolution. Note that restarting the application may take some time "
-"since it will need to rebuild the indexes deleted in the previous step."
-msgstr ""
-"Reinicie Evolution. Note que reiniciar la aplicación puede llevar algún "
-"tiempo ya que se necesita reconstruir los índices eliminados en el paso "
-"anterior."
-
-#: C/mail-error-folder-mismatch.page:44(p)
-msgid "You may lose your mail labels when performing this operation."
-msgstr "Al realizar esta operación puede que pierda algunas de sus etiquetas."
-
-#: C/mail-error-folder-mismatch.page:48(p)
-msgid ""
-"This problem is expected to be fixed in version 3.0 according to the "
-"corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?"
-"id=550414\">bug report</link>. Please add a comment if this is not the case."
-msgstr ""
-"Se espera solucionar este problema en la versión 3.0 según el "
-"correspondiente <link href=\"https://bugzilla.gnome.org/show_bug.cgi?"
-"id=550414\">informe de error</link>. Si no es el caso, añada un comentario "
-"en él."
-
-#: C/mail-error-failed-to-append-to-sent-folder.page:24(title)
-msgid "Error message \"Failed to append to...\" after sending message"
-msgstr ""
-"Mensaje de error «No es posible anexar a ...» después de enviar un correo"
-
-#: C/mail-error-failed-to-append-to-sent-folder.page:26(p)
-msgid ""
-"If the error message \"Your message was sent, but an error occurred during "
-"post-processing. The reported error was \"Failed to append to mbox:///home/"
-"user/.local/share/evolution/mail/local#Sent: Cannot get folder 'Sent': "
-"folder does not exist. Appending to local 'Sent' folder instead.\".\" is "
-"shown, you can fix the problem by editing your default folder settings under "
-"<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui "
-"style=\"button\">Edit</gui><gui>Defaults</gui><gui>Folder for sent messages</"
-"gui></guiseq>."
-msgstr ""
-"Si se muestra el mensaje «Se envió su mensaje pero ocurrió un error en el "
-"posprocesado. El error devuelto fue «Falló al anexar a mbox:///home/user/."
-"local/share/evolution/mail/local#Sent: No se puede obtener la carpeta "
-"«Enviados»: la carpeta no existe. En su lugar se anexará a la carpeta local "
-"«Correo enviado».» puede solucionar el problema editando su carpeta "
-"predeterminada en <guiseq><gui>Editar</gui><gui>Preferencias</"
-"gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
-"gui><gui>Predeterminados</gui><gui>Carpeta de mensajes enviados</gui></"
-"guiseq>."
-
-#: C/mail-error-failed-to-append-to-sent-folder.page:27(p)
-msgid ""
-"This bug is fixed in Evolution versions higher than 3.0.2 (stable series) "
-"and 3.1.3 (unstable development series). If this is not the case, please add "
-"a comment to the corresponding <link href=\"https://bugzilla.gnome.org/"
-"show_bug.cgi?id=638307\">bug report</link>."
-msgstr ""
-"Este error está solucionado en las versiones de Evolution mayores que 3.0.2 "
-"(series estables) y mayor que 3.1.3 (versiones de desarrollo inestables). Si "
-"no es el caso, añada un comentario al correspondiente <link href=\"https://"
-"bugzilla.gnome.org/show_bug.cgi?id=638307\">informe de error</link>."
-
 #: C/mail-encryption-s-mime-signing-encrypting.page:5(desc)
 msgid "Signing or encrypting messages via S/MIME that you send."
 msgstr "Firmar o cifrar los mensajes que envía a través de S/MIME."
@@ -6501,12 +6356,17 @@ msgstr ""
 "ver el correo."
 
 #: C/mail-displaying-character-encodings.page:25(p)
+#| msgid ""
+#| "To constantly change this setting, go to <guiseq><gui>Edit</"
+#| "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
+#| "gui><gui>Message Display</gui><gui>Default character encoding</gui></"
+#| "guiseq>."
 msgid ""
-"To constantly change this setting, go to <guiseq><gui>Edit</"
+"To make this the default setting, go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</"
 "gui><gui>Message Display</gui><gui>Default character encoding</gui></guiseq>."
 msgstr ""
-"Para cambiar constantemente este ajuste vaya a <guiseq><gui>Editar</"
+"Para convertir este ajuste en predeterminado, vaya a <guiseq><gui>Editar</"
 "gui><gui>Preferencias</gui><gui>Opciones de correo</gui><gui>General</"
 "gui><gui>Mostrado de mensajes</gui><gui>Codificación de caracteres "
 "predeterminada</gui></guiseq>."
@@ -8716,21 +8576,22 @@ msgid "IMAP mail account settings"
 msgstr "Configuración de cuenta de correo IMAP"
 
 #: C/mail-access-gmail-pop-account.page:5(desc)
-msgid "How to set up a GMail POP Account."
+msgid "How to set up a Gmail POP Account."
 msgstr "Cómo configurar una cuenta POP de GMail."
 
 #: C/mail-access-gmail-pop-account.page:24(title)
-msgid "Access a GMail POP Account via Evolution"
+msgid "Access a Gmail POP Account via Evolution"
 msgstr "Acceder a una cuenta POP de GMail a través de Evolution"
 
 #: C/mail-access-gmail-pop-account.page:26(p)
-msgid "Follow these steps to set up your GMail POP Account in Evolution:"
+#| msgid "Follow these steps to set up your GMail POP Account in Evolution:"
+msgid "Follow these steps to set up your Gmail POP Account in Evolution:"
 msgstr ""
-"Siga estos pasos para configurar su cuenta de correo POP de GMail en "
+"Siga estos pasos para configurar su cuenta de correo POP de Gmail en "
 "Evolution:"
 
 #: C/mail-access-gmail-pop-account.page:29(p)
-msgid "Log in to your gmail account."
+msgid "Log in to your Gmail account."
 msgstr "Inicie sesión en su cuenta de GMail."
 
 #: C/mail-access-gmail-pop-account.page:30(p)
@@ -8789,12 +8650,12 @@ msgstr ""
 "vaya al paso 5."
 
 #: C/mail-access-gmail-imap-account.page:5(desc)
-msgid "How to set up a GMail IMAP Account."
+msgid "How to set up a Gmail IMAP Account."
 msgstr "Cómo configurar una cuenta IMAP de GMail."
 
 #. Page only exists for the <note>, apart from that nothing special.
 #: C/mail-access-gmail-imap-account.page:24(title)
-msgid "Access a GMail IMAP Account via Evolution"
+msgid "Access a Gmail IMAP Account via Evolution"
 msgstr "Acceder a una cuenta IMAP de GMail a través de Evolution"
 
 #: C/mail-access-gmail-imap-account.page:26(p)
@@ -8806,14 +8667,18 @@ msgstr ""
 "de correo IMAP</link>."
 
 #: C/mail-access-gmail-imap-account.page:28(p)
+#| msgid ""
+#| "To access GMail via IMAP you must turn on IMAP in your Google account. "
+#| "See the <link href=\"https://mail.google.com/support/bin/answer.py?"
+#| "answer=77695\">GMail Help</link> for more information."
 msgid ""
-"To access GMail via IMAP you must turn on IMAP in your Google account. See "
+"To access Gmail via IMAP you must turn on IMAP in your Google account. See "
 "the <link href=\"https://mail.google.com/support/bin/answer.py?"
-"answer=77695\">GMail Help</link> for more information."
+"answer=77695\">Gmail Help</link> for more information."
 msgstr ""
-"Para acceder a GMail mediante IMAP debe activar IMAP en su cuenta de Google. "
+"Para acceder a Gmail mediante IMAP debe activar IMAP en su cuenta de Google. "
 "Consulte la <link href=\"https://mail.google.com/support/bin/answer.py?"
-"answer=77695\">ayuda de GMail</link> para obtener más información."
+"answer=77695\">ayuda de Gmail</link> para obtener más información."
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
@@ -9266,18 +9131,22 @@ msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
 #: C/intro-first-run.page:32(p)
+#| msgid ""
+#| "You will get asked whether to restore from a backup of a previous "
+#| "version. If you have such a backup, continue <link xref=\"backup-"
+#| "restore#restore\">here</link>. Otherwise, go to the next page."
 msgid ""
-"You will get asked whether to restore from a backup of a previous version. "
-"If you have such a backup, continue <link xref=\"backup-restore#restore"
-"\">here</link>. Otherwise, go to the next page."
+"You will be asked whether to restore from a backup of a previous version. If "
+"you have such a backup, continue <link xref=\"backup-restore#restore\">here</"
+"link>. Otherwise, go to the next page."
 msgstr ""
-"Se le preguntará si quiere estaurar un respaldo de una versión anterior. Si "
+"Se le preguntará si quiere restaurar un respaldo de una versión anterior. Si "
 "tiene tal respaldo, continúe <link xref=\"backup-restore#restore\">aquí</"
 "link>. De lo contrario, continúe con la siguiente página."
 
 #: C/intro-first-run.page:37(p)
 msgid ""
-"First, choose the server type from the <gui>Server Type</gui> dropdown-list."
+"First, choose the server type from the <gui>Server Type</gui> drop-down list."
 msgstr ""
 "Primero, elija el tipo de servidor en la lista desplegable <gui>Tipo de "
 "servidor</gui>."
@@ -10011,7 +9880,7 @@ msgstr ""
 "Copie todos los archivos de correo en su carpeta personal o cualquier otro "
 "lugar conveniente."
 
-#: C/import-apps-outlook.page:57(p)
+#: C/import-apps-outlook.page:57(p) C/change-keyboard-shortcuts.page:24(p)
 msgid "Start Evolution."
 msgstr "Inicie Evolution."
 
@@ -10417,7 +10286,7 @@ msgstr ""
 "pero aún así no funciona correctamente, contacte con su distribución a "
 "través de su foto o web de seguimiento de errores."
 
-#: C/default-browser.page:26(p)
+#: C/default-browser.page:27(p)
 msgid ""
 "GNOME 3 users with a technical background can tweak these settings by "
 "defining scheme-handlers in <file>$HOME/.local/share/applications/mimeapps."
@@ -10427,6 +10296,20 @@ msgstr ""
 "configuraciones definiendo manejadores de esquemas en <file>$HOME/.local/"
 "share/applications/mimeapps.list</file>."
 
+#: C/default-browser.page:29(p)
+#| msgid ""
+#| "This requires having the evolution-mapi package installed. <link action="
+#| "\"install:evolution-mapi\" href=\"http://ftp.gnome.org/pub/gnome/sources/"
+#| "evolution-mapi/\">Install evolution-mapi now.</link>"
+msgid ""
+"If the error message \"Could not open the link: Operation not supported\" is "
+"shown, you need to install <link action=\"install:gvfs\" href=\"http://ftp."
+"gnome.org/pub/gnome/sources/gvfs/\">Install gvfs now.</link>."
+msgstr ""
+"Si se muestra el error «No se pudo abrir el enlace: no se soporta la "
+"operación», debe <link action=\"install:gvfs\" href=\"http://ftp.gnome.org/"
+"pub/gnome/sources/gvfs/\">instalar gvfs ahora</link>."
+
 #: C/data-storage.page:5(desc)
 msgid "Where does Evolution store my data on the harddisk?"
 msgstr "¿Dónde almacena Evolution mis datos en el disco duro?"
@@ -10436,8 +10319,9 @@ msgid "Data storage locations"
 msgstr "Ubicaciones de almacenamiento de datos"
 
 #: C/data-storage.page:23(p)
-msgid ""
-"This is only interesting for advanced users that want to debug problems."
+#| msgid ""
+#| "This is only interesting for advanced users that want to debug problems."
+msgid "This is only interesting for advanced users who want to debug problems."
 msgstr ""
 "Esto sólo es interesante para usuarios avanzados que quieren depurar "
 "problemas."
@@ -10457,7 +10341,7 @@ msgstr ""
 msgid "The user's data files"
 msgstr "Los archivos de datos del usuario"
 
-#: C/data-storage.page:31(p)
+#: C/data-storage.page:31(file)
 msgid "$HOME/.local/share/evolution"
 msgstr "$HOME/.local/share/evolution"
 
@@ -10465,7 +10349,7 @@ msgstr "$HOME/.local/share/evolution"
 msgid "Various configuration and state files"
 msgstr "Varios archivos de configuración y estado"
 
-#: C/data-storage.page:35(p)
+#: C/data-storage.page:35(file)
 msgid "$HOME/.config/evolution"
 msgstr "$HOME/.config/evolution"
 
@@ -10473,7 +10357,7 @@ msgstr "$HOME/.config/evolution"
 msgid "Disposable data caches"
 msgstr "Cachés de datos desechables"
 
-#: C/data-storage.page:39(p)
+#: C/data-storage.page:39(file)
 msgid "$HOME/.cache/evolution"
 msgstr "$HOME/.cache/evolution"
 
@@ -10481,7 +10365,7 @@ msgstr "$HOME/.cache/evolution"
 msgid "Configuration settings in GConf"
 msgstr "Ajustes de configuración en GConf"
 
-#: C/data-storage.page:43(p)
+#: C/data-storage.page:43(file)
 msgid "$HOME/.gconf/apps/evolution"
 msgstr "$HOME/.gconf/apps/evolution"
 
@@ -10772,15 +10656,20 @@ msgid "Adding a Contact"
 msgstr "Añadir un contacto"
 
 #: C/contacts-usage-add-contact.page:23(p)
+#| msgid ""
+#| "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, "
+#| "or right-click in a blank space in the list of contacts and click \"New "
+#| "Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
+#| "key></keyseq>."
 msgid ""
 "Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or "
-"right-click in a blank space in the list of contacts and click \"New "
-"Contact...\", or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></"
-"keyseq>."
+"right-click in a blank space in the list of contacts and click <gui>New "
+"Contact...</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</"
+"key></keyseq>."
 msgstr ""
-"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Contacto</gui></"
-"guiseq>, o pulse con el botón derecho en una zona vacía de la lista de "
-"contactos y elija \"Contacto nuevo...\", o pulse <keyseq><key>Mayús</"
+"Pulse <guiseq><gui>Archivo</gui><gui>Nuevo</gui><gui>Contacto</gui></guiseq> "
+"o pulse con el botón derecho en una zona vacía de la lista de contactos y "
+"elija <gui>Contacto nuevo...</gui> o pulse <keyseq><key>Mayús</"
 "key><key>Ctrl</key><key>C</key></keyseq>."
 
 #: C/contacts-usage-add-contact.page:25(p)
@@ -10873,9 +10762,11 @@ msgstr "Añadir otra libreta de direcciones local."
 msgid "Adding another local address book"
 msgstr "Añadir otra libreta de direcciones local"
 
-#: C/contacts-local.page:22(p) C/calendar-local.page:22(p)
+#: C/contacts-local.page:22(p)
+#| msgid ""
+#| "To add another local calendar to Evolution, perform the following steps:"
 msgid ""
-"To add another local calendar to Evolution, perform the following steps:"
+"To add another local address book to Evolution, perform the following steps:"
 msgstr ""
 "Para añadir otro calendario local a Evolition, realice los siguientes pasos:"
 
@@ -10894,6 +10785,91 @@ msgstr ""
 "La libreta de direcciones se añadirá a la lista de libretas de direcciones "
 "en Evolution."
 
+#: C/contacts-libreoffice.page:5(desc)
+msgid "Using data from Evolution address books in LibreOffice documents."
+msgstr ""
+"Usar datos de las libretas de direcciones de Evolution en documentos de "
+"LibreOffice."
+
+#: C/contacts-libreoffice.page:20(title)
+msgid "Contacts in LibreOffice"
+msgstr "Contactos en LibreOffice"
+
+#: C/contacts-libreoffice.page:22(p)
+msgid ""
+"You can use your Evolution address books in LibreOffice as a data source. "
+"The following steps refer to LibreOffice version 3.3.3."
+msgstr ""
+"Puede usar sus libretas de direcciones de Evolution en LibreOffice como "
+"fuentes de datos. Los siguientes pasos se conciernen a la versión 3.3.3 de "
+"LibreOffice."
+
+#: C/contacts-libreoffice.page:25(p)
+#| msgid ""
+#| "Click <guiseq><gui>Insert</gui><gui>Table...</gui></guiseq> in the "
+#| "menubar."
+msgid ""
+"Click <guiseq><gui>Edit</gui><gui>Exchange Database...</gui></guiseq> in the "
+"menu bar. This will bring up the <gui>Exchange databases</gui> dialog box."
+msgstr ""
+"En la barra de menú pulse <guiseq><gui>Editar</gui><gui>Intercambiar base de "
+"datos...</gui></guiseq>. Esto mostrará la caja de diálogo <gui>Intercambiar "
+"bases de datos</gui>."
+
+#: C/contacts-libreoffice.page:26(p)
+msgid ""
+"In the right pane under <gui>Available Databases</gui>, <gui>EvolutionLocal</"
+"gui> is available as a source. Click on the small triangle to get the list "
+"of your Evolution address books."
+msgstr ""
+"En el panel derecho, bajo <gui>Bases de datos disponibles</gui>, "
+"<gui>EvolutionLocal</gui> está disponible como fuente. Pulse el pequeño "
+"triángulo para obtener la lista de sus libretas de direcciones de Evolution."
+
+#: C/contacts-libreoffice.page:27(p)
+#| msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
+msgid "Choose an addressbook and click <gui style=\"button\">Define</gui>."
+msgstr ""
+"Seleccione una libreta de direcciones y pulse <gui style=\"button\">Definir</"
+"gui>."
+
+#: C/contacts-libreoffice.page:28(p)
+msgid ""
+"In case it is not listed already, click <gui style=\"button\">Browse...</"
+"gui>. A file chooser dialog opens."
+msgstr ""
+"En caso de que no se liste pulse <gui style=\"button\">Examinar...</gui>. Se "
+"abrirá un diálogo de selección de archivos."
+
+#: C/contacts-libreoffice.page:29(p)
+msgid ""
+"As Evolution stores its data in a hidden directory, press <keyseq><key>Ctrl</"
+"key><key>L</key></keyseq> to get the location bar displayed."
+msgstr ""
+"Ya que Evolution almacena sus datos en un directorio oculto, pulse "
+"<keyseq><key>Ctrl</key><key>L</key></keyseq> para mostrar la barra de "
+"direcciones."
+
+#: C/contacts-libreoffice.page:30(p)
+msgid ""
+"Go to <code>/home/username/.local/share/evolution/addressbook/system/"
+"addressbook.db</code> and click <gui style=\"button\">Open</gui>."
+msgstr ""
+"Vaya a <code>/home/nomre_de_usuario/.local/share/evolution/addressbook/"
+"system/addressbook.db</code> y pulse <gui style=\"button\">Abrir</gui>."
+
+#: C/contacts-libreoffice.page:33(p)
+msgid ""
+"This makes the Evolution address book the default data source for "
+"LibreOffice. You can now select a field to insert into an LibreOffice "
+"document via <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></"
+"guiseq>."
+msgstr ""
+"Esto hace que la libreta de direcciones de Evolution sea la fuente de datos "
+"predeterminada de LibreOffice. Ahora puede seleccionar un campo para "
+"insertar en un documento de libreoffice a través de <guiseq><gui>Insertar</"
+"gui><gui>Campos</gui><gui>Otro</gui></guiseq>."
+
 #: C/contacts-ldap.page:5(desc)
 msgid "Use shared address books on a local network."
 msgstr "Usar libretas de direcciones compartidas en una red local."
@@ -11100,6 +11076,14 @@ msgstr ""
 msgid "Select the type <gui>Google</gui>."
 msgstr "Seleccione el tipo <gui>Google</gui>."
 
+#: C/contacts-google.page:28(p) C/calendar-webdav.page:30(p)
+#: C/calendar-weather.page:30(p) C/calendar-google.page:32(p)
+#: C/calendar-caldav.page:31(p)
+msgid ""
+"Choose if you want to be able to view the content also when being offline."
+msgstr ""
+"Elija si quiere poder ver el contenido incluso cuando está desconectado."
+
 #: C/contacts-google.page:29(p) C/calendar-google.page:33(p)
 msgid "Enter your Google username."
 msgstr "Introduzca su nombre de usuario de Google."
@@ -11171,11 +11155,21 @@ msgid "Adding people automatically to my contacts"
 msgstr "Añadir personas automáticamente a mis contactos"
 
 #: C/contacts-add-automatically.page:27(p)
+#| msgid ""
+#| "You can add people automatically to your contacts when you reply to "
+#| "received email. Enable the plugin <gui>Automatic Contacts</gui> by going "
+#| "to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on "
+#| "\"Automatic Contacts\" so that it shows a check mark. Then go to "
+#| "<guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</"
+#| "gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create "
+#| "address book entries when sending emails</gui> option and select an "
+#| "address book in the drop-down field below that will receive the new "
+#| "contacts."
 msgid ""
 "You can add people automatically to your contacts when you reply to received "
 "email. Enable the plugin <gui>Automatic Contacts</gui> by going to "
-"<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on \"Automatic "
-"Contacts\" so that it shows a check mark. Then go to <guiseq><gui>Edit</"
+"<guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on <gui>Automatic "
+"Contacts</gui> so that it shows a check mark. Then go to <guiseq><gui>Edit</"
 "gui><gui>Preferences</gui><gui>Contacts</gui><gui>Automatic Contacts</gui></"
 "guiseq> and enable the <gui>Create address book entries when sending emails</"
 "gui> option and select an address book in the drop-down field below that "
@@ -11184,8 +11178,8 @@ msgstr ""
 "Puede añadir personas automáticamente a sus contactos al responder a correos "
 "recibidos. Actíve el complemento <gui>Contactos automáticos</gui> en "
 "<guiseq><gui>Editar</gui><gui>Complementos</gui></guiseq>; pulse en "
-"«Contactos automáticos» para que se muestre como marcado. Después vaya a "
-"<guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Contactos</"
+"<gui>Contactos automáticos</gui> para que se muestre como marcado. Después "
+"vaya a <guiseq><gui>Editar</gui><gui>Preferencias</gui><gui>Contactos</"
 "gui><gui>Contactos automáticos</gui></guiseq> y actíve la opción <gui>Crear "
 "entradas automáticamente en la libreta de direcciones al enviar correos</"
 "gui> y seleccione la libreta de direcciones a la que se añadirán los "
@@ -11245,6 +11239,47 @@ msgstr "Estilo de la barra de herramientas"
 msgid "Show Buttons"
 msgstr "Mostrar botones"
 
+#: C/change-keyboard-shortcuts.page:5(desc)
+msgid "Changing keyboard shortcuts."
+msgstr "Cambiar los atajos de teclado."
+
+#: C/change-keyboard-shortcuts.page:18(title)
+msgid "Changing keyboard shortcuts"
+msgstr "Cambiar los atajos de teclado"
+
+#: C/change-keyboard-shortcuts.page:21(p)
+msgid "Open the <gui>dconf-editor</gui> application."
+msgstr "Abra la aplicación <gui>dconf-editor</gui>."
+
+#: C/change-keyboard-shortcuts.page:22(p)
+msgid "Navigate to <code>/org/gnome/desktop/interface</code>."
+msgstr "Vaya a <code>/org/gnome/desktop/interface</code>."
+
+#: C/change-keyboard-shortcuts.page:23(p)
+#| msgid "Enable <gui>Attachment Reminder</gui>."
+msgid "Enable <gui>can-change-accels</gui>."
+msgstr "Actíve <gui>can-change-accels</gui>."
+
+#: C/change-keyboard-shortcuts.page:25(p)
+msgid ""
+"Hover your mouse cursor over the menu bar item for which you want to add or "
+"change the keyboard shortcut."
+msgstr ""
+"Pónga el cursor de su ratón se mueve sobre el elemento de la barra de menú "
+"para el que quiere añadir o cambiar la distribución de teclado."
+
+#: C/change-keyboard-shortcuts.page:26(p)
+msgid "Type the shortcut that you want on the keyboard."
+msgstr "Escriba el atajo que quiere en el teclado."
+
+#: C/change-keyboard-shortcuts.page:29(p)
+msgid ""
+"Note that this setting is desktop-wide and that you can disable it again in "
+"<gui>dconf-editor</gui> after your changes."
+msgstr ""
+"Note que este ajuste es para todo el escritorio y que puede desactivarlo de "
+"nuevo en <gui>dconf-editor</gui> después de cambiarlo."
+
 #: C/calendar-webdav.page:5(desc)
 msgid "Using an online Webcal/WebDAV calendar."
 msgstr "Usar un calendario en línea Webcal-WebDAV."
@@ -11927,6 +11962,12 @@ msgstr "Añadir otro calendario local."
 msgid "Adding another local calendar"
 msgstr "Añadir otro calendario local"
 
+#: C/calendar-local.page:22(p)
+msgid ""
+"To add another local calendar to Evolution, perform the following steps:"
+msgstr ""
+"Para añadir otro calendario local a Evolition, realice los siguientes pasos:"
+
 #: C/calendar-layout-views.page:5(desc)
 msgid "Using date ranges (day, week, month) to look at the calendar."
 msgstr "Usar rangos de datos (día, semana, mes) para ver el calendario."
@@ -12482,29 +12523,45 @@ msgstr ""
 "Elija un nombre de archivo y la carpeta donde quiere guardar el archivo de "
 "respaldo y pulse <gui style=\"button\">Guardar</gui>."
 
-#: C/backup-restore.page:30(p) C/backup-restore.page:39(p)
+#: C/backup-restore.page:30(p) C/backup-restore.page:40(p)
 msgid ""
-"You will get asked to close Evolution. Answer with <gui style=\"button"
-"\">Yes</gui>."
+"You will be asked to close Evolution. Answer with <gui style=\"button\">Yes</"
+"gui>."
 msgstr ""
 "Se le pedirá que cierre Evolution. Responda <gui style=\"button\">Sí</gui>."
 
-#: C/backup-restore.page:35(title)
+#: C/backup-restore.page:32(p)
+msgid ""
+"Note that your <link xref=\"mail-spam\">spam filtering</link> settings are "
+"not included in the backup file, as these settings are not controlled by "
+"Evolution and as developers of spam filtering tools might change "
+"implementation details. If you use Bogofilter you will need to back up "
+"<file>~/.bogofilter/</file>. If you use SpamAssassin you will need to back "
+"up <file>~/.spamassassin/</file>."
+msgstr ""
+"Note que su configuración de <link xref=\"mail-spam\">filtros de SPAM</link> "
+"no se incluyen en el archivo de respaldo, ya que estos ajustes no están "
+"controlados por Evolution y porque los desarrolladores de las herramientas "
+"de filtrado de SPAM pueden cambiar sus detalles de implementación. Si usa "
+"Bogofilter deberá respaltar <file>~/.bogofilter/</file>. Si usa SpamAssassin "
+"deberá respaldar <file>~/.spamassassin/</file>."
+
+#: C/backup-restore.page:36(title)
 msgid "Restoring"
 msgstr "Restaurar"
 
-#: C/backup-restore.page:37(p)
+#: C/backup-restore.page:38(p)
 msgid ""
 "Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>."
 msgstr ""
 "Seleccione <guiseq><gui>Archivo</gui><gui>Restaurar datos de Evolution…</"
 "gui></guiseq>."
 
-#: C/backup-restore.page:38(p)
+#: C/backup-restore.page:39(p)
 msgid "Choose the file, and click <gui style=\"button\">Open</gui>."
 msgstr "Seleccione el archivo y pulse <gui style=\"button\">Abrir</gui>."
 
-#: C/backup-restore.page:41(p)
+#: C/backup-restore.page:42(p)
 msgid ""
 "In the <link xref=\"intro-first-run\">first-run assistant</link>, you can "
 "restore Evolution data from a backup file."
@@ -12520,6 +12577,194 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2011\n"
 "Francisco Javier F. Serrador <serrador@openshine.com>, 2005, 2006"
 
+#~ msgid "What to do when this error is shown."
+#~ msgstr "Qué hacer cuando se muestra este error."
+
+#~ msgid "Error message \"No provider available for protocol email\""
+#~ msgstr ""
+#~ "Mensaje de error «No hay proveedor disponible para el protocolo de correo»"
+
+#~ msgid "This error message may be displayed for a number of reasons:"
+#~ msgstr "Este mensaje se puede mostrar por cierto número de motivos:"
+
+#~ msgid "The filters used do not match the account they are associated with."
+#~ msgstr ""
+#~ "Los filtros usados no coinciden con la cuenta a la que están asociados."
+
+#~ msgid ""
+#~ "This happens when the <file>filters.xml</file> file is copied and used on "
+#~ "a fresh install of Evolution on a new machine."
+#~ msgstr ""
+#~ "Esto sucede cuando el archivo <file>filters.xml</file> se copia y usa en "
+#~ "una instalación nueva de Evolution en un equipo nuevo."
+
+#~ msgid ""
+#~ "Accounts have unique ID numbers, and filters refer to these accounts "
+#~ "directly. Simply copying the <file>filters.xml</file> file will cause a "
+#~ "version mismatch with Evolution, affecting the filter rules."
+#~ msgstr ""
+#~ "Las cuentas tienen números de identificación (ID) únicos y los filtros se "
+#~ "refieren a esas cuentas directamente. Copiar el archivo <file>filters."
+#~ "xml</file> hará que exista un error de versión en Evolution que afectará "
+#~ "a las reglas."
+
+#~ msgid "The account settings may not have been copied properly."
+#~ msgstr ""
+#~ "Puede que la configuración de la cuenta no se haya copiado correctamente."
+
+#~ msgid "The account settings were modified."
+#~ msgstr "Se modificó la configuración de la cuenta."
+
+#~ msgid ""
+#~ "To fix this problem, edit the email filters and re-select the folder for "
+#~ "each Copy/Move filter. To do this:"
+#~ msgstr ""
+#~ "Para solucionar este problema edite los filtros de correo y vuelva a "
+#~ "seleccionar la carpeta para cada filtro de Copiar/mover. Para ello:"
+
+#~ msgid "Go to <guiseq><gui>Edit</gui><gui>Message Filters</gui></guiseq>."
+#~ msgstr ""
+#~ "Vaya a <guiseq><gui>Editar</gui><gui>Filtros de mensajes</gui></guiseq>."
+
+#~ msgid "Select the Copy/Move filter and click <gui>Edit</gui>."
+#~ msgstr "Seleccione el filtro Copiar-Mover y pulse <gui>Editar</gui>."
+
+#~ msgid ""
+#~ "Refer to the list of folders associated with that particular filter. "
+#~ "Click on the button that allows you to modify the folders assigned for "
+#~ "that filter. Set the folders again."
+#~ msgstr ""
+#~ "Consulte la lista de las carpetas asociadas con ese filtro en particular. "
+#~ "Pulse el botón que le permite modificar las carpetas asignadas para ese "
+#~ "filtro. Configure de nuevo las carpetas."
+
+#~ msgid ""
+#~ "Advanced users may also be interested in this write up: <link href="
+#~ "\"https://thomas.apestaart.org/thomas/trac/wiki/Evolution\">How to keep "
+#~ "the Evolution filters in sync on multiple machines by Thomas Vander "
+#~ "Stichele </link>"
+#~ msgstr ""
+#~ "Los usuarios avanzados tambień pueden estar interesados en este escrito: "
+#~ "<link href=\"https://thomas.apestaart.org/thomas/trac/wiki/Evolution"
+#~ "\">cómo mantener sincronizados los filtros de Evolution en varios "
+#~ "equipos, por Thomas Vander Stichele</link>."
+
+#~ msgid ""
+#~ "Error message \"Summary and folder mismatch\" after synchronizing folders"
+#~ msgstr ""
+#~ "Mensaje de error «El resumen y la carpeta no coinciden» después de "
+#~ "sincronizar las carpetas"
+
+#~ msgid ""
+#~ "If the error message: <gui>Error while Expunging folder. Error storing "
+#~ "`~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and folder "
+#~ "mismatch, even after a sync.</gui> pops up, perform the following steps:"
+#~ msgstr ""
+#~ "Si aparece el siguiente mensaje: <gui>Error while Expunging folder. Error "
+#~ "storing `~/.local/share/evolution/mail/local/Inbox (mbox)': Summary and "
+#~ "folder mismatch, even after a sync.</gui>, realice los siguientes pasos:"
+
+#~ msgid ""
+#~ "These steps apply to the versions 3.0 and 3.2. Note that Evolution's file "
+#~ "locations in 2.30 and 2.32 are different (<file>~/.evolution/mail/local/</"
+#~ "file> instead of <file>~/.local/share/evolution/mail/local/</file>)."
+#~ msgstr ""
+#~ "Estos pasos se aplican en las versiones 3.0 y 3.2. Tenga en cuenta que la "
+#~ "ubicación de los archivos de Evolution en las versiones 2.30 y 2.32 son "
+#~ "diferentes (<file>~/.evolution/mail/local/</file> en lugar de <file>~/."
+#~ "local/share/evolution/mail/local/</file>)."
+
+#~ msgid ""
+#~ "Open the Terminal application (category <gui>System Tools</gui>) and type "
+#~ "in the command <code>evolution --force-shutdown</code>. This command "
+#~ "stops Evolution and all the processes related to it."
+#~ msgstr ""
+#~ "Abra la aplicación de la Terminal (categoría <gui>Herramientas del "
+#~ "sistema) y escriba el comando <code>evolution --force-shutdown</code>. "
+#~ "Este comando detiene Evolution y todos los procesos relacionados con él."
+
+#~ msgid "Remove the files ending in:"
+#~ msgstr "Quite los archivos que terminan en:"
+
+#~ msgid ".ev-summary"
+#~ msgstr ".ev-summary"
+
+#~ msgid ".ibex.index"
+#~ msgstr ".ibex.index"
+
+#~ msgid ""
+#~ "To do this, navigate to the hidden directory <file>~/.local/share/"
+#~ "evolution/mail/local/</file> and locate the specified files. You can do "
+#~ "this in the GNOME File Manager (Nautilus) by either showing hidden files, "
+#~ "or by entering the directory via <guiseq><gui>Go</gui><gui>Location...</"
+#~ "gui></guiseq> from the menu bar."
+#~ msgstr ""
+#~ "Para ello, navegue por la carpeta oculta <file>~/.local/share/evolution/"
+#~ "mail/local/</file> y localice los archivos especificados. Puede hacerlo "
+#~ "desde el Gestor de archivos de GNOME (Nautilus) mostrando los archivos "
+#~ "ocultos o bien introduciendo la dirección usando <guiseq><gui>Ir</"
+#~ "gui><gui>Ubicación...</gui></guiseq> desde la barra de menú."
+
+#~ msgid ""
+#~ "Restart Evolution. Note that restarting the application may take some "
+#~ "time since it will need to rebuild the indexes deleted in the previous "
+#~ "step."
+#~ msgstr ""
+#~ "Reinicie Evolution. Note que reiniciar la aplicación puede llevar algún "
+#~ "tiempo ya que se necesita reconstruir los índices eliminados en el paso "
+#~ "anterior."
+
+#~ msgid "You may lose your mail labels when performing this operation."
+#~ msgstr ""
+#~ "Al realizar esta operación puede que pierda algunas de sus etiquetas."
+
+#~ msgid ""
+#~ "This problem is expected to be fixed in version 3.0 according to the "
+#~ "corresponding <link href=\"https://bugzilla.gnome.org/show_bug.cgi?"
+#~ "id=550414\">bug report</link>. Please add a comment if this is not the "
+#~ "case."
+#~ msgstr ""
+#~ "Se espera solucionar este problema en la versión 3.0 según el "
+#~ "correspondiente <link href=\"https://bugzilla.gnome.org/show_bug.cgi?"
+#~ "id=550414\">informe de error</link>. Si no es el caso, añada un "
+#~ "comentario en él."
+
+#~ msgid "Error message \"Failed to append to...\" after sending message"
+#~ msgstr ""
+#~ "Mensaje de error «No es posible anexar a ...» después de enviar un correo"
+
+#~ msgid ""
+#~ "If the error message \"Your message was sent, but an error occurred "
+#~ "during post-processing. The reported error was \"Failed to append to "
+#~ "mbox:///home/user/.local/share/evolution/mail/local#Sent: Cannot get "
+#~ "folder 'Sent': folder does not exist. Appending to local 'Sent' folder "
+#~ "instead.\".\" is shown, you can fix the problem by editing your default "
+#~ "folder settings under <guiseq><gui>Edit</gui><gui>Preferences</"
+#~ "gui><gui>Mail Accounts</gui><gui style=\"button\">Edit</"
+#~ "gui><gui>Defaults</gui><gui>Folder for sent messages</gui></guiseq>."
+#~ msgstr ""
+#~ "Si se muestra el mensaje «Se envió su mensaje pero ocurrió un error en el "
+#~ "posprocesado. El error devuelto fue «Falló al anexar a mbox:///home/user/."
+#~ "local/share/evolution/mail/local#Sent: No se puede obtener la carpeta "
+#~ "«Enviados»: la carpeta no existe. En su lugar se anexará a la carpeta "
+#~ "local «Correo enviado».» puede solucionar el problema editando su carpeta "
+#~ "predeterminada en <guiseq><gui>Editar</gui><gui>Preferencias</"
+#~ "gui><gui>Cuentas de correo</gui><gui style=\"button\">Editar</"
+#~ "gui><gui>Predeterminados</gui><gui>Carpeta de mensajes enviados</gui></"
+#~ "guiseq>."
+
+#~ msgid ""
+#~ "This bug is fixed in Evolution versions higher than 3.0.2 (stable series) "
+#~ "and 3.1.3 (unstable development series). If this is not the case, please "
+#~ "add a comment to the corresponding <link href=\"https://bugzilla.gnome."
+#~ "org/show_bug.cgi?id=638307\">bug report</link>."
+#~ msgstr ""
+#~ "Este error está solucionado en las versiones de Evolution mayores que "
+#~ "3.0.2 (series estables) y mayor que 3.1.3 (versiones de desarrollo "
+#~ "inestables). Si no es el caso, añada un comentario al correspondiente "
+#~ "<link href=\"https://bugzilla.gnome.org/show_bug.cgi?id=638307\">informe "
+#~ "de error</link>."
+
 #~ msgid ""
 #~ "This documentation section will be added once the currently developed "
 #~ "evolution-ews has become stable and mature."
@@ -13756,10 +14001,6 @@ msgstr ""
 #~ msgstr "Mostrar barra _lateral"
 
 #, fuzzy
-#~ msgid "Contact Preview"
-#~ msgstr "Vista _previa de contactos"
-
-#, fuzzy
 #~ msgid "Server Type"
 #~ msgstr "_Tipo de servidor:"
 
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 5768934b1a..cb91339503 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -349,7 +349,7 @@ mail_backend_quit_requested_cb (EShell *shell,
 	if (folder == NULL)
 		return;
 
-	if (folder->summary->visible_count == 0)
+	if (camel_folder_summary_get_visible_count (folder->summary) == 0)
 		return;
 
 	response = e_alert_run_dialog_for_args (
@@ -632,10 +632,13 @@ mail_backend_job_finished_cb (CamelSession *session,
 
 	} else if (error != NULL) {
 		EShell *shell;
+		GtkApplication *application;
 		GList *list, *iter;
 
 		shell = e_shell_backend_get_shell (shell_backend);
-		list = e_shell_get_watched_windows (shell);
+
+		application = GTK_APPLICATION (shell);
+		list = gtk_application_get_windows (application);
 
 		/* Submit the error to an appropriate EAlertSink. */
 		for (iter = list; iter != NULL; iter = g_list_next (iter)) {
@@ -917,6 +920,7 @@ e_mail_backend_submit_alert (EMailBackend *backend,
 	EShellContent *shell_content;
 	EShellWindow *shell_window = NULL;
 	EShellBackendClass *class;
+	GtkApplication *application;
 	GList *list, *iter;
 	va_list va;
 
@@ -931,8 +935,10 @@ e_mail_backend_submit_alert (EMailBackend *backend,
 	shell_backend = E_SHELL_BACKEND (backend);
 	shell = e_shell_backend_get_shell (shell_backend);
 
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
+
 	/* Find the most recently used EShellWindow. */
-	list = e_shell_get_watched_windows (shell);
 	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
 		if (E_IS_SHELL_WINDOW (iter->data)) {
 			shell_window = E_SHELL_WINDOW (iter->data);
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 95084c6d28..fe8b8984f3 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -580,9 +580,10 @@ mail_browser_constructed (GObject *object)
 	priv->ui_manager = ui_manager;
 	domain = GETTEXT_PACKAGE;
 
-	formatter = e_mail_reader_get_formatter (reader);
-	e_shell_watch_window (shell, GTK_WINDOW (object));
+	gtk_application_add_window (
+		GTK_APPLICATION (shell), GTK_WINDOW (object));
 
+	formatter = e_mail_reader_get_formatter (reader);
 	web_view = em_format_html_get_web_view (formatter);
 
 	/* The message list is a widget, but it is not shown in the browser.
diff --git a/mail/e-mail-folder-utils.c b/mail/e-mail-folder-utils.c
index 77a9708e5f..fe093adb21 100644
--- a/mail/e-mail-folder-utils.c
+++ b/mail/e-mail-folder-utils.c
@@ -84,10 +84,8 @@ mail_folder_append_message_thread (GSimpleAsyncResult *simple,
 		context->info, &context->message_uid,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 gboolean
@@ -199,10 +197,8 @@ mail_folder_build_attachment_thread (GSimpleAsyncResult *simple,
 		CAMEL_FOLDER (object), context->ptr_array,
 		&context->fwd_subject, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 CamelMimePart *
@@ -359,10 +355,8 @@ mail_folder_find_duplicate_messages_thread (GSimpleAsyncResult *simple,
 		CAMEL_FOLDER (object), context->ptr_array,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 GHashTable *
@@ -559,10 +553,8 @@ mail_folder_get_multiple_messages_thread (GSimpleAsyncResult *simple,
 		CAMEL_FOLDER (object), context->ptr_array,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 GHashTable *
@@ -685,10 +677,8 @@ mail_folder_remove_thread (GSimpleAsyncResult *simple,
 	e_mail_folder_remove_sync (
 		CAMEL_FOLDER (object), cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 static gboolean
@@ -912,10 +902,8 @@ mail_folder_remove_attachments_thread (GSimpleAsyncResult *simple,
 		CAMEL_FOLDER (object), context->ptr_array,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 /* Helper for e_mail_folder_remove_attachments_sync() */
@@ -1128,10 +1116,8 @@ mail_folder_save_messages_thread (GSimpleAsyncResult *simple,
 		CAMEL_FOLDER (object), context->ptr_array,
 		context->destination, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 /* Helper for e_mail_folder_save_messages_sync() */
diff --git a/mail/e-mail-session-utils.c b/mail/e-mail-session-utils.c
index 217e7e2e8e..eca58bcad0 100644
--- a/mail/e-mail-session-utils.c
+++ b/mail/e-mail-session-utils.c
@@ -131,10 +131,8 @@ mail_session_handle_draft_headers_thread (GSimpleAsyncResult *simple,
 	e_mail_session_handle_draft_headers_sync (
 		session, context->message, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 gboolean
@@ -249,10 +247,8 @@ mail_session_handle_source_headers_thread (GSimpleAsyncResult *simple,
 	e_mail_session_handle_source_headers_sync (
 		session, context->message, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 gboolean
@@ -426,8 +422,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 
 			/* XXX This API does not allow for cancellation. */
 			if (!em_utils_connect_service_sync (service, cancellable, &error)) {
-				g_simple_async_result_set_from_error (simple, error);
-				g_error_free (error);
+				g_simple_async_result_take_error (simple, error);
 				return;
 			}
 		}
@@ -448,8 +443,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 				cancellable, error ? NULL : &error);
 
 		if (error != NULL) {
-			g_simple_async_result_set_from_error (simple, error);
-			g_error_free (error);
+			g_simple_async_result_take_error (simple, error);
 			return;
 		}
 	}
@@ -466,8 +460,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 
 		if (error != NULL) {
 			g_warn_if_fail (folder == NULL);
-			g_simple_async_result_set_from_error (simple, error);
-			g_error_free (error);
+			g_simple_async_result_take_error (simple, error);
 			return;
 		}
 
@@ -480,8 +473,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
 		g_object_unref (folder);
 
 		if (error != NULL) {
-			g_simple_async_result_set_from_error (simple, error);
-			g_error_free (error);
+			g_simple_async_result_take_error (simple, error);
 			return;
 		}
 	}
@@ -615,8 +607,7 @@ exit:
 
 	/* If we were cancelled, disregard any other errors. */
 	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
+		g_simple_async_result_take_error (simple, error);
 
 	/* Stuff the accumulated error messages in a GError. */
 	} else if (error_messages->len > 0) {
@@ -843,10 +834,8 @@ mail_session_unsubscribe_folder_thread (GSimpleAsyncResult *simple,
 	e_mail_session_unsubscribe_folder_sync (
 		session, context->folder_uri, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 gboolean
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index 45c8e0209c..0687d7561f 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -1249,10 +1249,8 @@ mail_session_get_inbox_thread (GSimpleAsyncResult *simple,
 	context->folder = e_mail_session_get_inbox_sync (
 		session, context->uid, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 CamelFolder *
@@ -1348,10 +1346,8 @@ mail_session_get_trash_thread (GSimpleAsyncResult *simple,
 	context->folder = e_mail_session_get_trash_sync (
 		session, context->uid, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 CamelFolder *
@@ -1448,10 +1444,8 @@ mail_session_uri_to_folder_thread (GSimpleAsyncResult *simple,
 		session, context->uri, context->flags,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 CamelFolder *
diff --git a/mail/e-mail-store-utils.c b/mail/e-mail-store-utils.c
index 0bf70ae94d..7f978c8b7f 100644
--- a/mail/e-mail-store-utils.c
+++ b/mail/e-mail-store-utils.c
@@ -54,10 +54,8 @@ mail_store_create_folder_thread (GSimpleAsyncResult *simple,
 		CAMEL_STORE (object), context->full_name,
 		cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 }
 
 gboolean
@@ -191,10 +189,8 @@ mail_store_go_offline_thread (GSimpleAsyncResult *simple,
 	} else
 		em_utils_disconnect_service_sync (service, TRUE, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 
 	camel_operation_pop_message (cancellable);
 }
@@ -270,10 +266,8 @@ mail_store_go_online_thread (GSimpleAsyncResult *simple,
 			CAMEL_OFFLINE_STORE (store),
 			TRUE, cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 
 	camel_operation_pop_message (cancellable);
 }
@@ -343,10 +337,8 @@ mail_store_prepare_for_offline_thread (GSimpleAsyncResult *simple,
 		camel_offline_store_prepare_for_offline_sync (
 			CAMEL_OFFLINE_STORE (store), cancellable, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 
 	camel_operation_pop_message (cancellable);
 }
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 8ec881b1f0..b8510b8600 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1650,6 +1650,11 @@ emae_service_provider_changed (EMAccountEditorService *service)
 		gint enable;
 		GtkWidget *dwidget = NULL;
 
+		/* Remember the current port. Any following changes in SSL would overwrite it
+		   and we don't want that since user can be using a non-standard port and we
+		   would lost the value this way. */
+		old_port = e_port_entry_get_port (service->port);
+
 		emae_setup_settings (service);
 
 		camel_url_set_protocol (url, service->provider->protocol);
@@ -1666,9 +1671,6 @@ emae_service_provider_changed (EMAccountEditorService *service)
 		enable = e_account_writable (account, emae_service_info[service->type].save_passwd_key);
 		gtk_widget_set_sensitive ((GtkWidget *) service->remember, enable);
 
-		if (service->port && service->provider->port_entries)
-			e_port_entry_set_camel_entries (service->port, service->provider->port_entries);
-
 		for (i = 0; emae_service_info[service->type].host_info[i].flag; i++) {
 			GtkWidget *w;
 			gint hide;
@@ -1689,7 +1691,7 @@ emae_service_provider_changed (EMAccountEditorService *service)
 							if (GTK_IS_ENTRY (w))
 								info->setval (url, enable ? gtk_entry_get_text ((GtkEntry *) w) : NULL);
 							else if (E_IS_PORT_ENTRY (w))
-								info->setval (url, enable?g_strdup_printf("%i",
+								info->setval (url, enable ? g_strdup_printf ("%i",
 											e_port_entry_get_port (E_PORT_ENTRY (w))) : NULL);
 						}
 					}
@@ -1724,7 +1726,6 @@ emae_service_provider_changed (EMAccountEditorService *service)
 				gtk_widget_hide ((GtkWidget *) service->needs_auth);
 		}
 #ifdef HAVE_SSL
-		old_port = url->port;
 		gtk_widget_hide (service->no_ssl);
 		if (service->provider->flags & CAMEL_PROVIDER_SUPPORTS_SSL) {
 			camel_url_set_port (url, e_port_entry_get_port (service->port));
@@ -1739,9 +1740,7 @@ emae_service_provider_changed (EMAccountEditorService *service)
 		gtk_widget_show (service->no_ssl);
 #endif
 
-		/* This must be done AFTER use_ssl is set; changing use_ssl overwrites
-		 * the old port, which could be SSL port, but also could be some special
-		 * port and we would otherwise lost it */
+		/* When everything is set it is safe to put back user's original port. */
 		if (url->port && service->provider->port_entries)
 			e_port_entry_set_port (service->port, old_port);
 
@@ -2206,9 +2205,6 @@ emae_setup_service (EMAccountEditor *emae,
 
 	service->auth_changed_id = 0;
 
-	/* Do this first.  Otherwise subsequent changes get clobbered. */
-	emae_service_provider_changed (service);
-
 	g_signal_connect (service->hostname, "changed", G_CALLBACK (emae_hostname_changed), service);
 	g_signal_connect (service->port, "changed", G_CALLBACK (emae_port_changed), service);
 	g_signal_connect (service->username, "changed", G_CALLBACK (emae_username_changed), service);
@@ -2247,6 +2243,9 @@ emae_setup_service (EMAccountEditor *emae,
 	emae_refresh_providers (emae, service);
 	emae_refresh_authtype (emae, service);
 
+	if (service->port && service->provider->port_entries)
+		e_port_entry_set_camel_entries (service->port, service->provider->port_entries);
+
 	/* Set the port after SSL is set, because it would overwrite the
 	 * port value (through emae_ssl_changed signal) */
 	if (url->port && service->provider->port_entries) {
@@ -2264,6 +2263,8 @@ emae_setup_service (EMAccountEditor *emae,
 	else
 		gtk_widget_set_sensitive (service->container, TRUE);
 
+	emae_service_provider_changed (service);
+
 	camel_url_free (url);
 }
 
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index a89abcd036..6e8e04c26f 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -268,9 +268,9 @@ emfp_dialog_run (AsyncContext *context)
 	 * messages.  VISIBLE+DELETED gives the correct count that matches
 	 * the label below the Send & Receive button. */
 	name = camel_folder_get_display_name (context->folder);
-	context->total = context->folder->summary->visible_count;
-	context->unread = context->folder->summary->unread_count;
-	deleted = context->folder->summary->deleted_count;
+	context->total = camel_folder_summary_get_visible_count (context->folder->summary);
+	context->unread = camel_folder_summary_get_unread_count (context->folder->summary);
+	deleted = camel_folder_summary_get_deleted_count (context->folder->summary);
 
 	client = gconf_client_get_default ();
 	key = "/apps/evolution/mail/display/show_deleted";
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index de165073ce..158b647641 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -206,7 +206,7 @@ efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button,
 #endif
 
 static void
-efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox,
+efhd_xpkcs7mime_add_cert_table (GtkWidget *grid,
                                 CamelDList *certlist,
                                 struct _smime_pobject *po)
 {
@@ -260,7 +260,7 @@ efhd_xpkcs7mime_add_cert_table (GtkWidget *vbox,
 		info = info->next;
 	}
 
-	gtk_box_pack_start ((GtkBox *) vbox, (GtkWidget *) table, TRUE, TRUE, 6);
+	gtk_container_add (GTK_CONTAINER (grid), GTK_WIDGET (table));
 }
 
 static void
@@ -269,7 +269,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 {
 	struct _smime_pobject *po = (struct _smime_pobject *) pobject;
 	GtkBuilder *builder;
-	GtkWidget *vbox, *w;
+	GtkWidget *grid, *w;
 
 	if (po->widget)
 		/* FIXME: window raise? */
@@ -280,11 +280,11 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 
 	po->widget = e_builder_get_widget(builder, "message_security_dialog");
 
-	vbox = e_builder_get_widget(builder, "signature_vbox");
+	grid = e_builder_get_widget(builder, "signature_grid");
 	w = gtk_label_new (_(smime_sign_table[po->valid->sign.status].description));
 	gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6);
+	gtk_container_add (GTK_CONTAINER (grid), w);
 	if (po->valid->sign.description) {
 		GtkTextBuffer *buffer;
 
@@ -294,6 +294,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 				 "hscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "shadow_type", GTK_SHADOW_IN,
+				 "expand", TRUE,
 				 "child", g_object_new(gtk_text_view_get_type(),
 						       "buffer", buffer,
 						       "cursor_visible", FALSE,
@@ -304,19 +305,19 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 				 NULL);
 		g_object_unref (buffer);
 
-		gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6);
+		gtk_container_add (GTK_CONTAINER (grid), w);
 	}
 
 	if (!camel_dlist_empty (&po->valid->sign.signers))
-		efhd_xpkcs7mime_add_cert_table (vbox, &po->valid->sign.signers, po);
+		efhd_xpkcs7mime_add_cert_table (grid, &po->valid->sign.signers, po);
 
-	gtk_widget_show_all (vbox);
+	gtk_widget_show_all (grid);
 
-	vbox = e_builder_get_widget(builder, "encryption_vbox");
+	grid = e_builder_get_widget(builder, "encryption_grid");
 	w = gtk_label_new (_(smime_encrypt_table[po->valid->encrypt.status].description));
 	gtk_misc_set_alignment ((GtkMisc *) w, 0.0, 0.5);
 	gtk_label_set_line_wrap ((GtkLabel *) w, TRUE);
-	gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6);
+	gtk_container_add (GTK_CONTAINER (grid), w);
 	if (po->valid->encrypt.description) {
 		GtkTextBuffer *buffer;
 
@@ -326,6 +327,7 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 				 "hscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "vscrollbar_policy", GTK_POLICY_AUTOMATIC,
 				 "shadow_type", GTK_SHADOW_IN,
+				 "expand", TRUE,
 				 "child", g_object_new(gtk_text_view_get_type(),
 						       "buffer", buffer,
 						       "cursor_visible", FALSE,
@@ -336,13 +338,13 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button,
 				 NULL);
 		g_object_unref (buffer);
 
-		gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 6);
+		gtk_container_add (GTK_CONTAINER (grid), w);
 	}
 
 	if (!camel_dlist_empty (&po->valid->encrypt.encrypters))
-		efhd_xpkcs7mime_add_cert_table (vbox, &po->valid->encrypt.encrypters, po);
+		efhd_xpkcs7mime_add_cert_table (grid, &po->valid->encrypt.encrypters, po);
 
-	gtk_widget_show_all (vbox);
+	gtk_widget_show_all (grid);
 
 	g_object_unref (builder);
 
@@ -1137,7 +1139,7 @@ efhd_attachment_button (EMFormatHTML *efh,
 	if (emf->folder && emf->folder->summary && emf->uid) {
 		CamelMessageInfo *mi;
 
-		mi = camel_folder_summary_uid (emf->folder->summary, emf->uid);
+		mi = camel_folder_summary_get (emf->folder->summary, emf->uid);
 		if (mi) {
 			const CamelMessageContentInfo *ci;
 
diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index 82be1319c8..c26c0feb96 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -1588,20 +1588,6 @@
       </locale>
     </schema>
 
-    <schema>
-      <key>/schemas/apps/evolution/mail/composer/current_folder</key>
-      <applyto>/apps/evolution/mail/composer/current_folder</applyto>
-      <owner>evolution-mail</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-         <short>Composer load/attach directory</short>
-         <long>
-           Directory for loading/attaching files to composer.
-         </long>
-      </locale>
-    </schema>
-
     <!-- Widget States -->
 
     <schema>
diff --git a/mail/mail-dialogs.ui b/mail/mail-dialogs.ui
index 58a9f8c2aa..d3382dc18d 100644
--- a/mail/mail-dialogs.ui
+++ b/mail/mail-dialogs.ui
@@ -578,41 +578,13 @@ Please select a follow up action from the "Flag" menu.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox170">
+                  <object class="GtkGrid" id="signature_grid">
                     <property name="visible">True</property>
+                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                     <child>
-                      <object class="GtkLabel" id="label465">
-                        <property name="visible">True</property>
-                        <property name="xpad">12</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkTable" id="table10">
-                        <property name="visible">True</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">2</property>
-                        <child>
-                          <object class="GtkVBox" id="signature_vbox">
-                            <property name="visible">True</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
@@ -641,41 +613,13 @@ Please select a follow up action from the "Flag" menu.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox171">
+                  <object class="GtkGrid" id="encryption_grid">
                     <property name="visible">True</property>
+                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
                     <child>
-                      <object class="GtkLabel" id="label478">
-                        <property name="visible">True</property>
-                        <property name="xpad">12</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkTable" id="table11">
-                        <property name="visible">True</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">2</property>
-                        <child>
-                          <object class="GtkVBox" id="encryption_vbox">
-                            <property name="visible">True</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 30bbce6579..5dd215a156 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -287,7 +287,7 @@ update_1folder (MailFolderCache *self,
 				if ((deleted = camel_folder_get_deleted_message_count (folder)) > 0)
 					unread -= deleted;
 
-				junked = folder->summary->junk_count;
+				junked = camel_folder_summary_get_junk_count (folder->summary);
 				if (junked > 0)
 					unread -= junked;
 			}
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index d904eed546..0d05a21a86 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -200,6 +200,7 @@ mail_msg_check_error (gpointer msg)
 	EShellView *shell_view;
 	EShellWindow *shell_window = NULL;
 	EShellContent *shell_content;
+	GtkApplication *application;
 	MailMsg *m = msg;
 	gchar *what;
 	GList *list, *iter;
@@ -226,9 +227,10 @@ mail_msg_check_error (gpointer msg)
 		return;
 
 	shell = e_shell_get_default ();
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
 
 	/* Find the most recently used EShellWindow. */
-	list =  e_shell_get_watched_windows (shell);
 	for (iter = list; iter != NULL; iter = g_list_next (iter)) {
 		if (E_IS_SHELL_WINDOW (iter->data)) {
 			shell_window = E_SHELL_WINDOW (iter->data);
diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
index a6506d7a78..cf9f098e90 100644
--- a/modules/addressbook/apps_evolution_addressbook.schemas.in
+++ b/modules/addressbook/apps_evolution_addressbook.schemas.in
@@ -139,5 +139,17 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
+      <applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
+      <owner>evolution-addressbook</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Enable address formatting</short>
+        <long>Whether addresses should be formatted according to standard in their destination country.</long>
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 020ad1dc81..be9ddcc427 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -194,6 +194,18 @@ acc_get_general_page (EConfig *ec,
 		DTFormatKindDateTime, _("_Table column:"));
 	gtk_widget_show (widget);
 
+	itembox = add_section (vbox, _("Address formatting"), FALSE);
+
+	widget = gtk_check_button_new_with_label (
+		_("_Format address according to standard of its destination country"));
+	g_object_bind_property (
+		shell_settings, "enable-address-formatting",
+		widget, "active",
+		G_BINDING_BIDIRECTIONAL |
+		G_BINDING_SYNC_CREATE);
+	gtk_box_pack_start (GTK_BOX (itembox), widget, FALSE, FALSE, 0);
+	gtk_widget_show (widget);
+
 	itembox = add_section (vbox, _("Autocompletion"), TRUE);
 
 	widget = gtk_check_button_new_with_mnemonic (
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index c52b39b9fa..92341e4a3f 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -440,8 +440,8 @@ book_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
 }
 
 static void
-book_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                      GtkWindow *window)
+book_shell_backend_window_added_cb (EShellBackend *shell_backend,
+                                    GtkWindow *window)
 {
 	const gchar *backend_name;
 
@@ -525,8 +525,8 @@ book_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-created",
-		G_CALLBACK (book_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (book_shell_backend_window_added_cb),
 		shell_backend);
 
 	e_book_shell_backend_init_settings (shell);
diff --git a/modules/addressbook/e-book-shell-settings.c b/modules/addressbook/e-book-shell-settings.c
index 6be121d2c2..ae2e4f0adf 100644
--- a/modules/addressbook/e-book-shell-settings.c
+++ b/modules/addressbook/e-book-shell-settings.c
@@ -35,4 +35,8 @@ e_book_shell_backend_init_settings (EShell *shell)
 	e_shell_settings_install_property_for_key (
 		"book-primary-selection",
 		"/apps/evolution/addressbook/display/primary_addressbook");
+
+	e_shell_settings_install_property_for_key (
+		"enable-address-formatting",
+		"/apps/evolution/addressbook/display/address_formatting");
 }
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 36af9fd827..3ecb6bfb84 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -699,8 +699,8 @@ exit:
 }
 
 static void
-cal_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                     GtkWindow *window)
+cal_shell_backend_window_added_cb (EShellBackend *shell_backend,
+                                   GtkWindow *window)
 {
 	const gchar *backend_name;
 
@@ -770,8 +770,8 @@ cal_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-created",
-		G_CALLBACK (cal_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (cal_shell_backend_window_added_cb),
 		shell_backend);
 
 	cal_shell_backend_init_importers ();
@@ -953,18 +953,21 @@ e_cal_shell_backend_open_date_range (ECalShellBackend *cal_shell_backend,
 	EShellBackend *shell_backend;
 	EShellSidebar *shell_sidebar;
 	GtkWidget *shell_window = NULL;
+	GtkApplication *application;
 	ECalendar *navigator;
-	GList *watched_windows;
+	GList *list;
 
 	g_return_if_fail (E_IS_CAL_SHELL_BACKEND (cal_shell_backend));
 
 	shell_backend = E_SHELL_BACKEND (cal_shell_backend);
 	shell = e_shell_backend_get_shell (shell_backend);
-	watched_windows = e_shell_get_watched_windows (shell);
+
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
 
 	/* Try to find an EShellWindow already in calendar view. */
-	while (watched_windows != NULL) {
-		GtkWidget *window = GTK_WIDGET (watched_windows->data);
+	while (list != NULL) {
+		GtkWidget *window = GTK_WIDGET (list->data);
 
 		if (E_IS_SHELL_WINDOW (window)) {
 			const gchar *active_view;
@@ -978,7 +981,7 @@ e_cal_shell_backend_open_date_range (ECalShellBackend *cal_shell_backend,
 			}
 		}
 
-		watched_windows = g_list_next (watched_windows);
+		list = g_list_next (list);
 	}
 
 	/* Otherwise create a new EShellWindow in calendar view. */
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index 5e24425678..b374afdced 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -485,8 +485,8 @@ exit:
 }
 
 static void
-memo_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                      GtkWindow *window)
+memo_shell_backend_window_added_cb (EShellBackend *shell_backend,
+                                    GtkWindow *window)
 {
 	const gchar *module_name;
 
@@ -555,8 +555,8 @@ memo_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-created",
-		G_CALLBACK (memo_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (memo_shell_backend_window_added_cb),
 		shell_backend);
 
 	/* Chain up to parent's constructed() method. */
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 0236a1227e..19e84a6764 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -490,8 +490,8 @@ exit:
 }
 
 static void
-task_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                      GtkWindow *window)
+task_shell_backend_window_added_cb (EShellBackend *shell_backend,
+                                    GtkWindow *window)
 {
 	const gchar *module_name;
 
@@ -560,8 +560,8 @@ task_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-created",
-		G_CALLBACK (task_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (task_shell_backend_window_added_cb),
 		shell_backend);
 
 	/* Chain up to parent's constructed() method. */
diff --git a/modules/composer-autosave/e-autosave-utils.c b/modules/composer-autosave/e-autosave-utils.c
index 9c5eaa8236..8d03aaaecc 100644
--- a/modules/composer-autosave/e-autosave-utils.c
+++ b/modules/composer-autosave/e-autosave-utils.c
@@ -137,9 +137,8 @@ load_snapshot_loaded_cb (GFile *snapshot_file,
 
 	if (error != NULL) {
 		g_warn_if_fail (contents == NULL);
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
-		g_error_free (error);
 		return;
 	}
 
@@ -154,10 +153,9 @@ load_snapshot_loaded_cb (GFile *snapshot_file,
 	g_free (contents);
 
 	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 		g_object_unref (message);
-		g_error_free (error);
 		return;
 	}
 
@@ -192,10 +190,8 @@ save_snapshot_splice_cb (GOutputStream *output_stream,
 
 	g_output_stream_splice_finish (output_stream, result, &error);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
 	g_object_unref (simple);
@@ -220,10 +216,9 @@ save_snapshot_get_message_cb (EMsgComposer *composer,
 
 	if (error != NULL) {
 		g_warn_if_fail (message == NULL);
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 		g_object_unref (simple);
-		g_error_free (error);
 		return;
 	}
 
@@ -281,10 +276,9 @@ save_snapshot_replace_cb (GFile *snapshot_file,
 
 	if (error != NULL) {
 		g_warn_if_fail (output_stream == NULL);
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 		g_object_unref (simple);
-		g_error_free (error);
 		return;
 	}
 
@@ -480,10 +474,9 @@ e_composer_save_snapshot (EMsgComposer *composer,
 
 	if (error != NULL) {
 		g_warn_if_fail (snapshot_file == NULL);
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 		g_object_unref (simple);
-		g_error_free (error);
 		return;
 	}
 
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index 9fcba43ff9..3b69e166a7 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -149,9 +149,9 @@ composer_registry_notify_cb (EComposerRegistry *registry,
 }
 
 static void
-composer_registry_window_created_cb (EShell *shell,
-                                     GtkWindow *window,
-                                     EComposerRegistry *registry)
+composer_registry_window_added_cb (GtkApplication *application,
+                                   GtkWindow *window,
+                                   EComposerRegistry *registry)
 {
 	/* Offer to restore any orphaned auto-save files from the
 	 * previous session once the first EShellWindow is mapped. */
@@ -201,8 +201,8 @@ composer_registry_constructed (GObject *object)
 
 	/* Listen for new watched windows. */
 	g_signal_connect (
-		extensible, "window-created",
-		G_CALLBACK (composer_registry_window_created_cb),
+		extensible, "window-added",
+		G_CALLBACK (composer_registry_window_added_cb),
 		object);
 }
 
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index ad572f1421..9067437a71 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -303,10 +303,11 @@ mail_shell_backend_window_weak_notify_cb (EShell *shell,
 }
 
 static void
-mail_shell_backend_window_created_cb (EShell *shell,
-                                      GtkWindow *window,
-                                      EShellBackend *shell_backend)
+mail_shell_backend_window_added_cb (GtkApplication *application,
+                                    GtkWindow *window,
+                                    EShellBackend *shell_backend)
 {
+	EShell *shell = E_SHELL (application);
 	const gchar *backend_name;
 
 	/* This applies to both the composer and signature editor. */
@@ -397,8 +398,8 @@ mail_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect (
-		shell, "window-created",
-		G_CALLBACK (mail_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (mail_shell_backend_window_added_cb),
 		shell_backend);
 
 	e_mail_shell_settings_init (shell_backend);
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 30a6756ddf..50525c7c7f 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -983,11 +983,11 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 	folder_name = camel_folder_get_display_name (folder);
 	parent_store = camel_folder_get_parent_store (folder);
 
-	num_deleted = folder->summary->deleted_count;
-	num_junked = folder->summary->junk_count;
-	num_junked_not_deleted = folder->summary->junk_not_deleted_count;
-	num_unread = folder->summary->unread_count;
-	num_visible = folder->summary->visible_count;
+	num_deleted = camel_folder_summary_get_deleted_count (folder->summary);
+	num_junked = camel_folder_summary_get_junk_count (folder->summary);
+	num_junked_not_deleted = camel_folder_summary_get_junk_not_deleted_count (folder->summary);
+	num_unread = camel_folder_summary_get_unread_count (folder->summary);
+	num_visible = camel_folder_summary_get_visible_count (folder->summary);
 
 	buffer = g_string_sized_new (256);
 	uids = e_mail_reader_get_selected_uids (reader);
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 12a521b454..8453b88540 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -547,11 +547,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 	gtk_container_add (GTK_CONTAINER (container), widget);
 	gtk_widget_show (widget);
 
-	/* The mail shell backend responds to the "window-created" signal
+	/* The mail shell backend responds to the "window-added" signal
 	 * that this triggers and configures it with composer preferences. */
 	g_signal_connect_swapped (
 		widget, "editor-created",
-		G_CALLBACK (e_shell_watch_window), shell);
+		G_CALLBACK (gtk_application_add_window), shell);
 
 	/* Express mode does not honor this setting. */
 	if (!e_shell_get_express_mode (shell))
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index 9fb5d2a60c..c685815b17 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -97,10 +97,11 @@ offline_alert_network_available_cb (EShell *shell,
 }
 
 static void
-offline_alert_window_created_cb (EShell *shell,
-                                 GtkWindow *window,
-                                 EOfflineAlert *extension)
+offline_alert_window_added_cb (GtkApplication *application,
+                               GtkWindow *window,
+                               EOfflineAlert *extension)
 {
+	EShell *shell = E_SHELL (application);
 	GtkAction *action;
 
 	if (!E_IS_SHELL_WINDOW (window))
@@ -118,7 +119,7 @@ offline_alert_window_created_cb (EShell *shell,
 		G_CALLBACK (offline_alert_network_available_cb), extension);
 
 	g_signal_handlers_disconnect_by_func (
-		shell, offline_alert_window_created_cb, extension);
+		shell, offline_alert_window_added_cb, extension);
 
 	if (e_shell_get_online (shell))
 		return;
@@ -175,8 +176,8 @@ offline_alert_constructed (GObject *object)
 
 	/* Watch for the first EShellWindow. */
 	g_signal_connect (
-		shell, "window-created",
-		G_CALLBACK (offline_alert_window_created_cb), extension);
+		shell, "window-added",
+		G_CALLBACK (offline_alert_window_added_cb), extension);
 
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed (object);
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 9ab5895c3d..5c733b7d49 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2315,51 +2315,44 @@ view_response_cb (GtkWidget *widget,
 		CamelFolderChangeInfo *changes = NULL;
 		const gchar *tag = NULL;
 		CamelMessageInfo *mi;
-		mi = camel_folder_summary_uid (pitip->folder->summary, pitip->uid);
+		mi = camel_folder_summary_get (pitip->folder->summary, pitip->uid);
 		if (mi) {
 			changes = camel_folder_change_info_new ();
 
 			if (itip_view_get_recur_check_state (ITIP_VIEW (pitip->view))) {
 				/* Recurring appointment and "apply-to-all" is selected */
-				camel_message_info_ref (mi);
 				tag = camel_message_info_user_tag (mi, "recurrence-key");
-				camel_message_info_free (mi);
 				if (tag) {
-					CamelStore *parent_store;
-					GList *list = NULL;
-					const gchar *full_name;
-					gint i = 0, count;
-
-					count = camel_folder_summary_count (pitip->folder->summary);
-					for (i = 0; i < count; i++) {
-						mi = camel_folder_summary_index (pitip->folder->summary, i);
-						if (!mi)
+					gint i;
+					GPtrArray *known_uids;
+
+					known_uids = camel_folder_summary_get_array (pitip->folder->summary);
+					for (i = 0; known_uids && i < known_uids->len; i++) {
+						const gchar *uid = g_ptr_array_index (known_uids, i);
+						CamelMessageInfo *mi2;
+
+						mi2 = camel_folder_summary_get (pitip->folder->summary, uid);
+						if (!mi2)
 							continue;
-						camel_message_info_ref (mi);
-						if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) {
-							camel_folder_summary_remove_uid_fast (pitip->folder->summary, (gchar *)(mi->uid));
-							camel_folder_change_info_remove_uid (changes, (gchar *) mi->uid);
-							list = g_list_prepend (list, (gpointer) mi->uid);
-
-							/* step back once to have the right index */
-							count--;
-							i--;
+
+						if (camel_message_info_user_tag (mi2, "recurrence-key") &&
+						    g_str_equal (camel_message_info_user_tag (mi2, "recurrence-key"), tag)) {
+							camel_folder_summary_remove_uid (pitip->folder->summary, mi2->uid);
+							camel_folder_change_info_remove_uid (changes, mi2->uid);
 						}
-						camel_message_info_free (mi);
-					}
 
-					full_name = camel_folder_get_full_name (pitip->folder);
-					parent_store = camel_folder_get_parent_store (pitip->folder);
-					camel_db_delete_uids (parent_store->cdb_w, full_name, list, NULL);
-					g_list_free (list);
+						camel_message_info_free (mi2);
+					}
 				}
 			} else {
 				/* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
 				camel_folder_summary_remove_uid (pitip->folder->summary, pitip->uid);
 				camel_folder_change_info_remove_uid (changes, pitip->uid);
 			}
+
 			camel_folder_changed (pitip->folder, changes);
 			camel_folder_change_info_free (changes);
+			camel_message_info_free (mi);
 		}
 	}
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index d85987df55..d41f492292 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -308,11 +308,13 @@ notify_default_action_cb (NotifyNotification *notification,
 	EShellWindow *shell_window;
 	EShellSidebar *shell_sidebar;
 	EMFolderTree *folder_tree;
+	GtkApplication *application;
 	GtkAction *action;
 	GList *list;
 
 	shell = e_shell_get_default ();
-	list = e_shell_get_watched_windows (shell);
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
 
 	/* Find the first EShellWindow in the list. */
 	while (list != NULL && !E_IS_SHELL_WINDOW (list->data))
diff --git a/po/de.po b/po/de.po
index 474d886ec3..4b5146f81b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -20,14 +20,13 @@
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2010, 2011.
 # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
 # Hendrik Knackstedt <hendrik.knackstedt@t-online.de>, 2011.
-#: ../shell/main.c:570
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-09-20 14:31+0000\n"
-"PO-Revision-Date: 2011-09-20 20:15+0100\n"
+"POT-Creation-Date: 2011-10-07 14:28+0000\n"
+"PO-Revision-Date: 2011-10-08 21:33+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@freenet.de>\n"
 "Language-Team: Ubuntu German Translators\n"
 "MIME-Version: 1.0\n"
@@ -58,8 +57,8 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
-"A contact list named '{0}' is already in this contact list. Would you like "
-"to add it anyway?"
+"A contact list named '{0}' is already in this contact list. Would you like to "
+"add it anyway?"
 msgstr ""
 "Eine Kontaktliste namens »{0}« existiert bereits in diesem Ordner. Soll sie "
 "dennoch hinzugefügt werden?"
@@ -119,7 +118,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Adressbuch »{0}« löschen?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:37 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_Nicht löschen"
 
@@ -170,8 +169,8 @@ msgstr "Das Evolution-Adressbuch wurde unerwartet beendet."
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"Das ausgewählte Bild ist groß. Möchten Sie die Größe des Bildes ändern und "
-"es speichern?"
+"Das ausgewählte Bild ist groß. Möchten Sie die Größe des Bildes ändern und es "
+"speichern?"
 
 #: ../addressbook/addressbook.error.xml.h:27
 msgid ""
@@ -180,8 +179,8 @@ msgid ""
 "supported search bases."
 msgstr ""
 "Möglicherweise verwendet dieser Server eine ältere LDAP-Version, die diese "
-"Funktionen nicht unterstützt, oder er ist fehlerhaft konfiguriert. Fragen "
-"Sie Ihren Systemadministrator nach unterstützten Suchbasen."
+"Funktionen nicht unterstützt, oder er ist fehlerhaft konfiguriert. Fragen Sie "
+"Ihren Systemadministrator nach unterstützten Suchbasen."
 
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
@@ -236,8 +235,8 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:38
 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"
+"problems using Evolution. For best results the server should be upgraded to a "
+"supported version"
 msgstr ""
 "Sie verbinden sich mit einem nicht unterstützten GroupWise-Server und werden "
 "bei der Benutzung von Evolution unter Umständen Probleme feststellen. Für "
@@ -246,8 +245,8 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:39
 msgid ""
-"You are trying to add addresses that are part of this list already. Would "
-"you like to add them anyway?"
+"You are trying to add addresses that are part of this list already. Would you "
+"like to add them anyway?"
 msgstr ""
 "Sie versuchen Adressen hinzuzufügen, die bereits in dieser Liste enthalten "
 "sind. Sollen sie dennoch hinzugefügt werden?"
@@ -274,7 +273,7 @@ msgstr ""
 "Ihre Kontakte für {0} sind nicht verfügbar, solange Evolution nicht neu "
 "gestartet wurde."
 
-#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:618
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:594
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Hinzufügen"
@@ -297,7 +296,7 @@ msgstr "_Wie es ist benutzen"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:715
-#: ../calendar/gui/e-calendar-view.c:2104
+#: ../calendar/gui/e-calendar-view.c:2064
 msgid "Anniversary"
 msgstr "Jahrestag"
 
@@ -308,8 +307,8 @@ msgstr "Jahrestag"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:714
-#: ../calendar/gui/e-calendar-view.c:2103 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
+#: ../calendar/gui/e-calendar-view.c:2063 ../capplet/anjal-settings-main.c:79
+#: ../shell/main.c:138
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -329,24 +328,24 @@ msgid "Calendar:"
 msgstr "Kalender:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
+#: ../addressbook/importers/evolution-vcard-importer.c:990
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:654
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:386
+#: ../addressbook/gui/merging/eab-contact-merging.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:633
 #: ../addressbook/gui/widgets/eab-contact-display.c:641
 #: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "E-Mail"
 
@@ -403,7 +402,7 @@ msgstr "Notizen"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:79
 #: ../addressbook/gui/widgets/eab-contact-display.c:409
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-cal-model.c:3421
 msgid "Other"
 msgstr "Weitere"
 
@@ -578,7 +577,7 @@ msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:469
+#: ../addressbook/gui/widgets/eab-gui-util.c:473
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
@@ -591,20 +590,20 @@ msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontakteditor - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3416
 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:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3417
 msgid "_No image"
 msgstr "_Kein Bild"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3744
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -612,43 +611,43 @@ msgstr ""
 "Die Kontaktdaten sind ungültig:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3749
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3757
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s»%s« hat ein ungültiges Format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3756
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s»%s« ist leer"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3799
 msgid "Invalid contact."
 msgstr "Kontakt ungültig."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:437
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:440
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
 msgid "_Full name"
 msgstr "_Voller Name"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:499
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "E-_Mail"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:510
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
 msgid "_Select Address Book"
 msgstr "Adressbuch aus_wählen"
 
@@ -718,7 +717,7 @@ msgid "_Suffix:"
 msgstr "_Suffix:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:742
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
@@ -735,7 +734,7 @@ msgid "_List name:"
 msgstr "_Listenname:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "A_uswählen …"
 
@@ -745,26 +744,26 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "unten stehende Liste:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:865
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:869
 msgid "Contact List Members"
 msgstr "Kontaktlistenmitglieder"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1440
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
+msgid "_Members"
+msgstr "_Mitglieder"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1514
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1455
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1529
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1470
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1544
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1601
-msgid "_Members"
-msgstr "_Mitglieder"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Geänderter Kontakt:"
@@ -804,11 +803,11 @@ msgstr ""
 "bereits in diesem Ordner. Soll er dennoch hinzugefügt werden?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:332
+#: ../addressbook/gui/merging/eab-contact-merging.c:336
 msgid "_Merge"
 msgstr "_Zusammenführen"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:315
+#: ../addressbook/gui/merging/eab-contact-merging.c:319
 msgid "Merge Contact"
 msgstr "Kontakte zusammenführen"
 
@@ -816,7 +815,7 @@ msgstr "Kontakte zusammenführen"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
@@ -847,7 +846,7 @@ msgstr[1] "%d Kontakte"
 msgid "Error getting book view"
 msgstr "Fehler beim Abrufen der Buchansicht"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:771
+#: ../addressbook/gui/widgets/e-addressbook-model.c:774
 msgid "Search Interrupted"
 msgstr "Suche wurde unterbrochen"
 
@@ -1169,7 +1168,7 @@ msgstr "Weitere E-Mail-Adresse"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "Evolution-Adressbuch"
 
@@ -1181,7 +1180,7 @@ msgstr "Neuer Kontakt"
 msgid "New Contact List"
 msgstr "Neue Kontaktliste"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#: ../addressbook/gui/widgets/ea-minicard-view.c:172
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1252,7 +1251,7 @@ msgstr "Video-Chat"
 #: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:513
+#: ../modules/calendar/e-cal-shell-view.c:523
 #: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:528
@@ -1329,21 +1328,20 @@ msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
+"This address book cannot be opened. This either means this book is not marked "
+"for offline usage or not yet downloaded for offline usage. Please load the "
+"address book once in online mode to download its contents."
 msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
 "dieses Adressbuch nicht für die Offline-Benutzung markiert wurde oder bis "
-"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte "
-"laden Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte "
-"herunterzuladen."
+"jetzt noch nicht für die Offline-Benutzung heruntergeladen wurde. Bitte laden "
+"Sie das Adressbuch einmal im Online-Modus, um dessen Inhalte herunterzuladen."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
+"This address book cannot be opened.  Please check that the path %s exists and "
+"that permissions are set to access it."
 msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad %s existiert und Sie darauf zugreifen dürfen."
@@ -1426,23 +1424,23 @@ msgstr "card.vcf"
 msgid "Select Address Book"
 msgstr "Adressbuch auswählen"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
 msgid "list"
 msgstr "Liste"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:552
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:554
+#: ../addressbook/gui/widgets/eab-gui-util.c:561
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:557
+#: ../addressbook/gui/widgets/eab-gui-util.c:564
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:559
+#: ../addressbook/gui/widgets/eab-gui-util.c:566
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
@@ -1454,32 +1452,32 @@ msgstr "Kartenansicht"
 #: ../addressbook/importers/evolution-ldif-importer.c:546
 #: ../addressbook/importers/evolution-vcard-importer.c:280
 #: ../calendar/importers/icalendar-importer.c:413
-#: ../calendar/importers/icalendar-importer.c:902
-#: ../calendar/importers/icalendar-importer.c:941 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:903
+#: ../calendar/importers/icalendar-importer.c:942 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importieren …"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1072
+#: ../addressbook/importers/evolution-csv-importer.c:1075
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1073
+#: ../addressbook/importers/evolution-csv-importer.c:1076
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV- und Tab-Importeur"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV oder Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV- und Tab-Importeur"
 
@@ -1491,11 +1489,11 @@ msgstr "LDAP-Datenaustauschformat (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Evolution-LDIF-Importeur"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "Evolution vCard Importer"
 msgstr "Evolution-VCard-Importeur"
 
@@ -1519,13 +1517,11 @@ msgstr "Adressbuchliste konnte nicht abgerufen werden: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2923
-#: ../calendar/gui/dialogs/memo-page.c:938
-#: ../calendar/gui/dialogs/task-page.c:1759 ../em-format/em-format.c:2324
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:658
+#: ../calendar/gui/dialogs/memo-page.c:938 ../em-format/em-format.c:2324
+#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:662
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
+#: ../smime/gui/certificate-manager.c:313
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -1560,8 +1556,7 @@ msgstr "Im asynchronen Modus exportieren"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
-"The number of cards in one output file in asynchronous mode, default size "
-"100."
+"The number of cards in one output file in asynchronous mode, default size 100."
 msgstr ""
 "Die Anzahl der Karten pro Ausgabedatei im asynchronen Modus, Vorgabe: 100."
 
@@ -1570,8 +1565,7 @@ msgid "NUMBER"
 msgstr "ANZAHL"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:139
-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 ""
 "Argumentfehler in Befehlszeile, bitte übergeben Sie den »--help«-Parameter, "
 "um Hinweise zum Aufruf zu erhalten."
@@ -1595,6 +1589,14 @@ msgstr "Unbehandelter Fehler"
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
+"'{0}' does not support assigned tasks, please select a different task list."
+msgstr ""
+"»{0}« unterstützt keine zugwiesenen Aufgaben, bitte wählen Sie eine andere "
+"Aufgabenliste."
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
+msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
@@ -1602,7 +1604,7 @@ msgstr ""
 "und wählen Sie einen anderen Kalender aus."
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -1610,15 +1612,15 @@ msgstr ""
 "»{0}« ist ein schreibgeschützter Kalender. Wechseln Sie zur Kalenderansicht "
 "und wählen Sie einen Kalender aus, der Termine akzeptieren kann."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid ""
-"Adding a meaningful summary to your appointment will give you an idea of "
-"what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of what "
+"your appointment is about."
 msgstr ""
 "Das Hinzufügen einer aussagekräftigen Zusammenfassung zu Ihrem Termin "
 "verschafft Ihnen eine Vorstellung, worum es bei diesem Termin geht."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -1626,165 +1628,167 @@ msgstr ""
 "Das Hinzufügen einer aussagekräftigen Zusammenfassung zu Ihrer Aufgabe "
 "verschafft Ihnen eine Vorstellung, worum es sich bei dieser Aufgabe handelt."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu diesen Notizen werden gelöscht und können "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu diesen Notizen werden gelöscht und können nicht "
+"wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu dieser Notiz werden gelöscht und können nicht "
 "wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid ""
-"All information on these appointments will be deleted and can not be "
-"restored."
+"All information on these appointments will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu diesen Terminen werden gelöscht und können "
 "nicht wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu diesen Aufgaben werden gelöscht und können "
 "nicht wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu diesem Termin werden gelöscht und können nicht "
 "wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:14
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu dieser Besprechung werden gelöscht und können "
 "nicht wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr ""
 "Die gesamten Informationen zu dieser Notiz werden gelöscht und können nicht "
 "wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
-"Die gesamten Informationen zu dieser Aufgabe werden gelöscht und können "
-"nicht wiederhergestellt werden."
+"Die gesamten Informationen zu dieser Aufgabe werden gelöscht und können nicht "
+"wiederhergestellt werden."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Sind Sie sicher, dass Sie die Aufgabe »{0}« löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Sind Sie sicher, dass Sie den Termin »{0}« löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "Sind Sie sicher, dass Sie die Besprechung »{0}« löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Sind Sie sicher, dass Sie die Notiz »{0}« löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Sind Sie sicher, dass Sie diese {0} Termine löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Sind Sie sicher, dass Sie diese {0} Notizen löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Sind Sie sicher, dass Sie diese {0} Aufgaben löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Sind Sie sicher, dass Sie diesen Termin löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sind Sie sicher, dass Sie diese Besprechung löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sind Sie sicher, dass Sie diese Notiz löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sind Sie sicher, dass Sie diese Aufgabe löschen wollen?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr ""
 "Sind Sie sicher, dass Sie den Termin ohne eine Zusammenfassung speichern "
 "wollen?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr ""
 "Sind Sie sicher, dass Sie die Notiz ohne eine Zusammenfassung speichern "
 "wollen?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:30
 msgid "Are you sure you want to save the task without a summary?"
 msgstr ""
 "Sind Sie sicher, dass Sie die Aufgabe ohne eine Zusammenfassung speichern "
 "wollen?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "Anlegen eines neuen Ereignisses gescheitert"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "Ereignis kann nicht gespeichert werden"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+msgid "Cannot save task"
+msgstr "Aufgabe kann nicht gespeichert werden"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "Kalender »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "Notizliste »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "Aufgabenliste »{0}« löschen?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "_Nicht verschicken"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. Möchten Sie den Termin speichern?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Download in progress. Do you want to save the task?"
 msgstr ""
 "Das Herunterladen ist noch nicht beendet. Möchten Sie die Aufgabe speichern?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "Editor konnte nicht geladen werden."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
@@ -1792,32 +1796,32 @@ msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Aufgabe übernehmen können."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "Es werden E-Mail-Einladungen an alle Teilnehmer verschickt, damit diese die "
 "Einladungen akzeptieren können."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "Fehler beim Laden des Kalenders"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "Fehler beim Laden der Notizliste"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Error loading task list"
 msgstr "Fehler beim Laden der Aufgabenliste"
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Error on {0}: {1}"
 msgstr "Fehler bei {0}: {1}"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
@@ -1825,7 +1829,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Besprechung abgesagt wurde."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
@@ -1833,7 +1837,7 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Notiz gelöscht wurde."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
@@ -1841,32 +1845,31 @@ msgstr ""
 "Falls Sie keine Absagenachricht verschicken, wissen die anderen Teilnehmer "
 "möglicherweise nicht, dass die Aufgabe gelöscht wurde."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid ""
-"Sending updated information allows other participants to keep their "
-"calendars up to date."
+"Sending updated information allows other participants to keep their calendars "
+"up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
 "ihnen so zu ermöglichen, ihre Kalender auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
 "Es werden aktualisierte Informationen an andere Teilnehmer verschickt, um "
-"ihnen so zu ermöglichen, ihre Aufgabenlisten auf dem neuesten Stand zu "
-"halten."
+"ihnen so zu ermöglichen, ihre Aufgabenlisten auf dem neuesten Stand zu halten."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
-"Some attachments are being downloaded. Saving the appointment would result "
-"in the loss of these attachments."
+"Some attachments are being downloaded. Saving the appointment would result in "
+"the loss of these attachments."
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieses "
 "Termins würde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
@@ -1874,96 +1877,96 @@ msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
 "Aufgabe würde den Verlust dieser Anlagen zur Folge haben."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr ""
 "Einige Funktionen werden mit Ihrem Server möglicherweise nicht einwandfrei "
 "arbeiten."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Der Evolution-Kalender wurde unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Die Evolution-Kalender wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Die Evolution-Notizen wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Die Evolution-Aufgaben wurden unerwartet beendet."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Der Kalender ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Die Notizliste ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Die Aufgabenliste ist nicht für eine Offline-Benutzung markiert."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Dieser Kalender wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Diese Notizliste wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Diese Aufgabenliste wird unwiderruflich gelöscht."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Wollen Sie die an diesem Termin vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this meeting?"
 msgstr ""
 "Wollen Sie die an dieser Besprechung vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Wollen Sie die an dieser Notiz vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Wollen Sie die an dieser Aufgabe vorgenommenen Änderungen speichern?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Wollen Sie eine Absagenachricht für diese Notiz verschicken?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Wollen Sie allen Teilnehmern eine Absagenachricht schicken?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Wollen Sie Einladungen zur Besprechung an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Wollen Sie diese Aufgabe an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Besprechungsinformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr ""
 "Wollen Sie aktuelle Aufgabeninformationen an die Teilnehmer verschicken?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -1974,68 +1977,67 @@ msgstr ""
 "eine bestmögliche Zusammenarbeit sollte der Server auf eine unterstützte "
 "Version aktualisiert werden."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an diesem Termin vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this meeting, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an dieser Besprechung vorgenommen, diese jedoch noch "
 "nicht gespeichert."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have changed this task, but not yet saved it."
 msgstr ""
 "Sie haben Änderungen an dieser Aufgabe vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr ""
 "Sie haben Änderungen an dieser Notiz vorgenommen, diese jedoch noch nicht "
 "gespeichert."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Kalender sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Notizen sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 "Ihre Aufgaben sind nicht verfügbar, solange Evolution nicht neu gestartet "
 "wurde."
 
-#: ../calendar/calendar.error.xml.h:83
-#: ../composer/mail-composer.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:86 ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Save Changes"
 msgstr "Änderungen _speichern"
 
-#: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+#: ../calendar/calendar.error.xml.h:89 ../composer/mail-composer.error.xml.h:34
+#: ../mail/mail.error.xml.h:167
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "Ab_schicken"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:90
 msgid "_Send Notice"
 msgstr "Nachricht ver_schicken"
 
@@ -2055,7 +2057,7 @@ msgstr[1] "Stunden"
 #. * (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/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
@@ -2075,8 +2077,8 @@ msgstr "_Alle verwerfen"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 #: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Ort:"
@@ -2125,33 +2127,33 @@ msgstr "Ort des Termins"
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
 msgid "No summary available."
 msgstr "Keine Zusammenfassung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 msgid "No location information available."
 msgstr "Keine Ortsinformationen verfügbar."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Sie haben %d Erinnerung"
 msgstr[1] "Sie haben %d Erinnerungen"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2164,7 +2166,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1894
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1893
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2181,7 +2183,7 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
@@ -2191,7 +2193,7 @@ msgstr "ungültige Zeit"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2200,7 +2202,7 @@ msgstr[1] "%d Stunden"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2211,26 +2213,26 @@ msgstr[1] "%d Minuten"
 #. 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:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:111
 msgid "Day View"
 msgstr "Tagesansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:114
 msgid "Work Week View"
 msgstr "Arbeitswochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Week View"
 msgstr "Wochenansicht"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Month View"
 msgstr "Monatsansicht"
 
@@ -2260,14 +2262,14 @@ msgid "Classification"
 msgstr "Einstufung"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:243
-#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:504
+#: ../calendar/gui/e-cal-model.c:779 ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 #: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2283,97 +2285,110 @@ msgstr "Beschreibung enthält"
 msgid "Do Not Exist"
 msgstr "Existieren nicht"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:11
+msgid "Exactly"
+msgstr "Exakt"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
 #: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Existieren"
 
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:863
+#: ../calendar/gui/caltypes.xml.h:13
+msgid "Less Than"
+msgstr "Kleiner als"
+
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:855
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Ort"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:15
+msgid "More Than"
+msgstr "Mehr als"
+
+#: ../calendar/gui/caltypes.xml.h:16
+msgid "Occurs"
+msgstr ""
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organisator"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:503
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privat"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
 #: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Öffentlich"
 
-#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:317
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../calendar/gui/tasktypes.xml.h:22 ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Zusammenfassung"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
 #: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "enthält"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "ist"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "ist nicht"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:635
 msgid "Edit Reminder"
 msgstr "Erinnerung bearbeiten"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
 #: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Alarmeinblendung anzeigen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
 #: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
 #: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Ein Programm ausführen"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
 #: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Eine E-Mail verschicken"
@@ -2464,7 +2479,7 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -2483,11 +2498,11 @@ msgid "Type:"
 msgstr "Art:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
+#: ../modules/addressbook/addressbook-config.c:527
 msgid "_Type:"
 msgstr "A_rt:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2519,10 +2534,10 @@ msgstr "_Farbe:"
 #: ../calendar/gui/dialogs/calendar-setup.c:460
 #: ../calendar/gui/dialogs/calendar-setup.c:471
 #: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/addressbook/addressbook-config.c:1077
+#: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/itip-formatter/itip-formatter.c:3038
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2561,50 +2576,50 @@ msgstr "Notizlisteneigenschaften"
 msgid "New Memo List"
 msgstr "Neue Notizliste"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:61
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:65
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:69
 msgid "This memo has been deleted."
 msgstr "Diese Notiz wurde gelöscht."
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Diese Notiz wurde geändert."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
@@ -2614,101 +2629,99 @@ msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 msgid "Validation error: %s"
 msgstr "Validierungsfehler: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:273
+#: ../calendar/gui/dialogs/comp-editor.c:274
 msgid "Could not save attachments"
 msgstr "Die Anlagen konnten nicht gespeichert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:613
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:741
+#: ../calendar/gui/dialogs/comp-editor.c:748
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:755
 #, c-format
 msgid "Meeting - %s"
 msgstr "Besprechung - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:750
+#: ../calendar/gui/dialogs/comp-editor.c:757
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:756
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Zugewiesene Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:758
+#: ../calendar/gui/dialogs/comp-editor.c:765
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Memo - %s"
 msgstr "Notiz - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:779
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "No Summary"
 msgstr "Keine Zusammenfassung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:900
+#: ../calendar/gui/dialogs/comp-editor.c:907
 msgid "Keep original item?"
 msgstr "Originaleintrag behalten?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "Close the current window"
 msgstr "Das aktuelle Fenster schließen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1108 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1455
-#: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1127 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455 ../widgets/misc/e-focus-tracker.c:117
+#: ../widgets/misc/e-focus-tracker.c:555 ../widgets/misc/e-web-view.c:459
+#: ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1115 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1462
-#: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462 ../widgets/misc/e-focus-tracker.c:110
+#: ../widgets/misc/e-focus-tracker.c:550 ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../shell/e-shell-window-actions.c:1469
-#: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../shell/e-shell-window-actions.c:1469 ../widgets/misc/e-focus-tracker.c:131
+#: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Die Auswahl löschen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "View help"
 msgstr "Hilfe anzeigen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1136 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1497
-#: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:1155 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497 ../widgets/misc/e-focus-tracker.c:124
+#: ../widgets/misc/e-focus-tracker.c:560 ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
 msgstr "Den Inhalt der Zwischenablage einfügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Save current changes"
 msgstr "Aktuelle Änderungen speichern"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1574
-#: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574 ../widgets/misc/e-focus-tracker.c:138
+#: ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
 msgstr "Den gesamten Text markieren"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "_Classification"
 msgstr "E_instufung"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
@@ -2717,138 +2730,137 @@ msgstr "E_instufung"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185 ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1204 ../mail/e-mail-browser.c:169
 #: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Datei"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 #: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1199
+#: ../calendar/gui/dialogs/comp-editor.c:1218
 msgid "_Insert"
 msgstr "Ein_fügen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1206
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Optionen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213 ../mail/e-mail-browser.c:183
+#: ../calendar/gui/dialogs/comp-editor.c:1232 ../mail/e-mail-browser.c:183
 #: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Anlage …"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:290 ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "_Categories"
 msgstr "_Kategorien"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Toggles whether to display categories"
 msgstr "Kategorien anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "Time _Zone"
 msgstr "Zeit_zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Toggles whether the time zone is displayed"
 msgstr "Zeitzone anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1271
 msgid "Pu_blic"
 msgstr "Ö_ffentlich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1254
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Classify as public"
 msgstr "Als öffentlich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "_Private"
 msgstr "_Privat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Classify as private"
 msgstr "Als privat einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "_Confidential"
 msgstr "Ver_traulich"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1268
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Classify as confidential"
 msgstr "Als vertraulich einstufen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "R_ole Field"
 msgstr "_Positions-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1297
 msgid "Toggles whether the Role field is displayed"
 msgstr "Feld für die Position angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1303
 msgid "_RSVP"
 msgstr "_UAwg"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
+#: ../calendar/gui/dialogs/comp-editor.c:1305
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "UAwg-Feld angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "_Status Field"
 msgstr "_Statusfeld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294
+#: ../calendar/gui/dialogs/comp-editor.c:1313
 msgid "Toggles whether the Status field is displayed"
 msgstr "Statusfeld anzeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "_Type Field"
 msgstr "A_rt-Feld"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1302
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Feld für die Teilnehmerart angezeigen/verbergen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1345
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "_Zuletzt geöffnet"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2059
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2397
-#: ../calendar/gui/dialogs/comp-editor.c:2560
-#: ../calendar/gui/dialogs/comp-editor.c:3549
+#: ../calendar/gui/dialogs/comp-editor.c:2426
+#: ../calendar/gui/dialogs/comp-editor.c:2589
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3513
+#: ../calendar/gui/dialogs/comp-editor.c:3545
 #: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "Anlage"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3581
+#: ../calendar/gui/dialogs/comp-editor.c:3613
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
@@ -2868,84 +2880,84 @@ msgstr "Objekt kann nicht angelegt werden"
 msgid "Could not open source"
 msgstr "Quelle konnte nicht geöffnet werden"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Soll dieses Objekt von allen anderen Postfächern der Empfänger ge_löscht "
 "werden?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Retract comment"
 msgstr "Kommentar zur_ückziehen"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr ""
 "Das Ereignis konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:60
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr ""
 "Die Aufgabe konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr ""
 "Die Notiz konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr ""
 "Das Objekt konnte auf Grund eines D-Bus-Fehlers nicht gelöscht werden: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr ""
 "Diese Notiz konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:92
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:100
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "Die Notiz konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:104
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden: %s"
@@ -3012,7 +3024,7 @@ msgstr "_Verfügbarkeit"
 msgid "Query free / busy information for the attendees"
 msgstr "Verfügbarkeitsinformationen der Teilnehmer abfragen"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3308
 msgid "Appointment"
 msgstr "Termin"
 
@@ -3043,7 +3055,7 @@ msgstr ""
 "Organisator sind"
 
 #: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:3082
 msgid "This event has reminders"
 msgstr "Dieses Ereignis enthält Erinnerungen"
 
@@ -3063,7 +3075,7 @@ msgstr "Ereignis ohne Enddatum"
 
 #: ../calendar/gui/dialogs/event-page.c:1439
 #: ../calendar/gui/dialogs/memo-page.c:708
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -3081,12 +3093,12 @@ msgstr "Die Endzeit ist falsch"
 
 #: ../calendar/gui/dialogs/event-page.c:1644
 #: ../calendar/gui/dialogs/memo-page.c:749
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Es ist ein Organisator erforderlich."
 
 #: ../calendar/gui/dialogs/event-page.c:1678
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/task-page.c:913
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
@@ -3098,7 +3110,7 @@ msgstr "_Vertreter"
 msgid "Atte_ndees"
 msgstr "Teil_nehmer"
 
-#: ../calendar/gui/dialogs/event-page.c:2921
+#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden: %s"
@@ -3109,40 +3121,40 @@ msgstr "Der Kalender »%s« konnte nicht geöffnet werden: %s"
 #. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
 #. * on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/event-page.c:3000
 #: ../calendar/gui/dialogs/memo-page.c:1012
-#: ../calendar/gui/dialogs/task-page.c:1838
+#: ../calendar/gui/dialogs/task-page.c:1845
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Sie handeln im Namen von %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3325
+#: ../calendar/gui/dialogs/event-page.c:3327
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Tag vor dem Termin"
 msgstr[1] "%d Tage vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3331
+#: ../calendar/gui/dialogs/event-page.c:3333
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Stunde vor dem Termin"
 msgstr[1] "%d Stunden vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3337
+#: ../calendar/gui/dialogs/event-page.c:3339
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Minute vor dem Termin"
 msgstr[1] "%d Minuten vor dem Termin"
 
-#: ../calendar/gui/dialogs/event-page.c:3356
+#: ../calendar/gui/dialogs/event-page.c:3358
 msgid "Customize"
 msgstr "Anpassen"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3362
+#: ../calendar/gui/dialogs/event-page.c:3364
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Keine"
@@ -3277,7 +3289,7 @@ msgstr "_Heute wählen"
 msgid "September"
 msgstr "September"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3312
 msgid "Memo"
 msgstr "Notiz"
 
@@ -3307,8 +3319,8 @@ msgid "Unable to open memos in '%s': %s"
 msgstr "Notizen in »%s« konnten nicht geöffnet werden: %s"
 
 #: ../calendar/gui/dialogs/memo-page.c:1144 ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2592
-#: ../mail/em-format-html.c:2657 ../mail/em-format-html.c:2681
+#: ../em-format/em-format.c:1062 ../mail/em-format-html.c:2626
+#: ../mail/em-format-html.c:2691 ../mail/em-format-html.c:2715
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "An"
@@ -3328,70 +3340,70 @@ msgid "T_o:"
 msgstr "A_n:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:333
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Liste:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einem wiederkehrenden Ereignis vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr ""
 "Sie delegieren ein wiederkehrendes Ereignis. Was möchten Sie delegieren?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Aufgabe vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:65
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr ""
 "Sie nehmen Änderungen an einer wiederkehrenden Notiz vor. Was möchten Sie "
 "verändern?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Nur diese Instanz"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Diese und frühere Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Diese und zukünftige Instanzen"
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Alle Instanzen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Dieser Termin enthält Wiederholungen, die Evolution nicht bearbeiten kann."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "Recurrence date is invalid"
 msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "End time of the recurrence was before event's start"
 msgstr "Die Zeit der letzten Wiederholung lag vor dem Start des Termins"
 
 #. 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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "on"
 msgstr "am"
 
@@ -3399,7 +3411,7 @@ msgstr "am"
 #. * (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:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 msgid "first"
 msgstr "erster"
 
@@ -3408,7 +3420,7 @@ msgstr "erster"
 #. * (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:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1101
 msgid "second"
 msgstr "zweiter"
 
@@ -3416,7 +3428,7 @@ msgstr "zweiter"
 #. * (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:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "third"
 msgstr "dritter"
 
@@ -3424,7 +3436,7 @@ msgstr "dritter"
 #. * (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:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "fourth"
 msgstr "vierter"
 
@@ -3432,7 +3444,7 @@ msgstr "vierter"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "fifth"
 msgstr "fünfter"
 
@@ -3440,13 +3452,13 @@ msgstr "fünfter"
 #. * (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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "last"
 msgstr "letzter"
 
 #. 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:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1145
 msgid "Other Date"
 msgstr "Anderes Datum"
 
@@ -3454,7 +3466,7 @@ msgstr "Anderes Datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1151
 msgid "1st to 10th"
 msgstr "1. bis 10."
 
@@ -3462,7 +3474,7 @@ msgstr "1. bis 10."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1157
 msgid "11th to 20th"
 msgstr "11. bis 20."
 
@@ -3470,41 +3482,41 @@ msgstr "11. bis 20."
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1163
 msgid "21st to 31st"
 msgstr "21. bis 31."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Montag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Sonntag"
@@ -3512,32 +3524,32 @@ msgstr "Sonntag"
 #. 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:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1319
 msgid "on the"
 msgstr "am"
 
 # oder im Falle von Terminen: Wiederholungen ??
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1494
 msgid "occurrences"
 msgstr "Wiederholungen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Add exception"
 msgstr "Ausnahme hinzufügen"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Could not get a selection to modify."
 msgstr "Keine zu verändernde Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2257
 msgid "Modify exception"
 msgstr "Ausnahme verändern"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Could not get a selection to delete."
 msgstr "Keine zu löschende Auswahl vorhanden."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Date/Time"
 msgstr "Datum/Zeit"
 
@@ -3599,11 +3611,11 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:197
 msgid "Send my reminders with this event"
 msgstr "Meine Erinnerungen zusammen mit diesem Termin verschicken"
 
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:199
 msgid "Notify new attendees _only"
 msgstr "_Nur neue Teilnehmer benachrichtigen"
 
@@ -3622,7 +3634,7 @@ msgstr "Website"
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
 #: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3398 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3635,7 +3647,7 @@ msgstr "Abgebrochen"
 #: ../calendar/gui/e-cal-model-tasks.c:723
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3395
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "Abgeschlossen"
@@ -3655,7 +3667,7 @@ msgstr "Hoch"
 #: ../calendar/gui/e-cal-model-tasks.c:721
 #: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
+#: ../calendar/gui/print.c:3392
 msgid "In Progress"
 msgstr "In Bearbeitung"
 
@@ -3670,7 +3682,7 @@ msgstr "Niedrig"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1578 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/e-cal-model.c:1583 ../calendar/gui/e-task-table.c:527
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
@@ -3682,7 +3694,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:434
 #: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3389 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nicht begonnen"
 
@@ -3697,8 +3709,8 @@ msgstr "Stat_us:"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-cal-model.c:3472
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1854
 #: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
@@ -3739,7 +3751,7 @@ msgstr ""
 msgid "_Send Options"
 msgstr "_Versandoptionen"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3310
 #: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Aufgabe"
@@ -3763,8 +3775,8 @@ msgstr "Fälligkeit der Aufgabe liegt in der Vergangenheit"
 #: ../calendar/gui/dialogs/task-page.c:286
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr ""
-"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
-"nur gelesen werden darf"
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste nur "
+"gelesen werden darf"
 
 #: ../calendar/gui/dialogs/task-page.c:290
 msgid "Task cannot be fully edited, because you are not the organizer"
@@ -3772,16 +3784,24 @@ msgstr ""
 "Die Aufgabe kann nicht vollständig bearbeitet werden, weil Sie nicht der "
 "Organisator sind"
 
-#: ../calendar/gui/dialogs/task-page.c:341
+#: ../calendar/gui/dialogs/task-page.c:294
+msgid ""
+"Task cannot be edited, because the selected task list does not support "
+"assigned tasks"
+msgstr ""
+"Die Aufgabe kann nicht bearbeitet werden, weil die gewählte Aufgabenliste "
+"zugewiesene Aufgaben nicht unterstützt"
+
+#: ../calendar/gui/dialogs/task-page.c:347
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Or_ganisator:"
 
-#: ../calendar/gui/dialogs/task-page.c:801
+#: ../calendar/gui/dialogs/task-page.c:807
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: ../calendar/gui/dialogs/task-page.c:1757
+#: ../calendar/gui/dialogs/task-page.c:1764
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden: %s"
@@ -3961,43 +3981,71 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Keine"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "Ja"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1584
+#: ../calendar/gui/e-cal-model-tasks.c:1090 ../calendar/gui/e-cal-model.c:1589
 #: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Nein"
 
-#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
-#: ../modules/plugin-manager/evolution-plugin-manager.c:102
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
+#: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
+#: ../plugins/itip-formatter/itip-formatter.c:2690
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../calendar/gui/e-cal-model.c:1580
+#: ../calendar/gui/e-cal-model.c:1585
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../calendar/gui/e-cal-model.c:1582
+#: ../calendar/gui/e-cal-model.c:1587
 msgid "Assigned"
 msgstr "Zugewiesen"
 
-#: ../calendar/gui/e-cal-model.c:2937
+#: ../calendar/gui/e-cal-model.c:2971
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet …"
 
+#: ../calendar/gui/e-cal-model.c:3416 ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2678
+msgid "Accepted"
+msgstr "Angenommen"
+
+#: ../calendar/gui/e-cal-model.c:3417 ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2684
+msgid "Declined"
+msgstr "Abgelehnt"
+
+#: ../calendar/gui/e-cal-model.c:3418 ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
+msgid "Tentative"
+msgstr "Vorläufig"
+
+#: ../calendar/gui/e-cal-model.c:3419 ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2687
+msgid "Delegated"
+msgstr "Delegiert"
+
+#: ../calendar/gui/e-cal-model.c:3420
+msgid "Needs action"
+msgstr "Erfordert Maßnahme"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
@@ -4020,8 +4068,7 @@ msgid "Due date"
 msgstr "Fällig am"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../calendar/gui/tasktypes.xml.h:20 ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Priorität"
 
@@ -4037,69 +4084,37 @@ msgstr "Anfangsdatum"
 msgid "Type"
 msgstr "Art"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Copy selected events to the clipboard"
 msgstr "Die gewählten Ereignisse in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:435
 msgid "Paste events from the clipboard"
 msgstr "Die in der Zwischenablage befindlichen Ereignisse einfügen"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:441
 msgid "Delete selected events"
 msgstr "Die gewählten Ereignisse löschen"
 
-#: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-calendar-view.c:460 ../calendar/gui/e-memo-table.c:182
 #: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: ../calendar/gui/e-calendar-view.c:650 ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/e-task-table.c:1104
+#: ../calendar/gui/e-calendar-view.c:656 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1105
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
-#: ../calendar/gui/e-calendar-view.c:1801
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
-msgid "Accepted"
-msgstr "Angenommen"
-
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
-msgid "Declined"
-msgstr "Abgelehnt"
-
-#: ../calendar/gui/e-calendar-view.c:1803
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:546
-msgid "Tentative"
-msgstr "Vorläufig"
-
-#: ../calendar/gui/e-calendar-view.c:1804
-#: ../calendar/gui/e-meeting-list-view.c:217
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
-msgid "Delegated"
-msgstr "Delegiert"
-
-#: ../calendar/gui/e-calendar-view.c:1805
-msgid "Needs action"
-msgstr "Erfordert Maßnahme"
-
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1949 ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:770
+#: ../calendar/gui/e-calendar-view.c:1908 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:771
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organisator: %s <%s>"
@@ -4107,20 +4122,20 @@ msgstr "Organisator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1953 ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:774
+#: ../calendar/gui/e-calendar-view.c:1912 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:775
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organisator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1969 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/print.c:3344
 #, c-format
 msgid "Location: %s"
 msgstr "Ort: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2000
+#: ../calendar/gui/e-calendar-view.c:1959
 #, c-format
 msgid "Time: %s %s"
 msgstr "Zeit: %s %s"
@@ -4178,8 +4193,8 @@ msgstr "Auswählen …"
 #. * 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:848 ../calendar/gui/e-day-view.c:1819
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1821
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1966
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
@@ -4189,7 +4204,7 @@ msgstr "%A, %d. %B"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1836
+#: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1838
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../modules/calendar/e-cal-shell-view-private.c:1054
@@ -4201,7 +4216,7 @@ msgstr "%a, %d. %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1852
+#: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1854
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../modules/calendar/e-cal-shell-view-private.c:1090
@@ -4209,21 +4224,21 @@ msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1019 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
+#: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:975 ../calendar/gui/print.c:994
+#: ../calendar/gui/print.c:2482 ../calendar/gui/print.c:2502
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1022 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
+#: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:980 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2487 ../calendar/gui/print.c:2504
 msgid "pm"
 msgstr "PM"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2636
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "Woche %d"
@@ -4246,49 +4261,49 @@ msgstr "Ressourcen"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1145
 msgid "Individual"
 msgstr "Individuell"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1146 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Gruppe"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1147
 msgid "Resource"
 msgstr "Ressource"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/print.c:1148
 msgid "Room"
 msgstr "Raum"
 
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/print.c:1162
 msgid "Chair"
 msgstr "Vorsitzender"
 
 #: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1163
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/print.c:1164
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/print.c:1165
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
@@ -4328,8 +4343,8 @@ msgstr "Fehlergrund: %s"
 #: ../calendar/gui/e-meeting-store.c:1891
 #: ../plugins/caldav/caldav-browse-server.c:957
 #: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
-#: ../smime/gui/component.c:53
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
@@ -4448,17 +4463,17 @@ msgstr "Mitglied"
 msgid "Memos"
 msgstr "Notizen"
 
-#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:733
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:734
 msgid "* No Summary *"
 msgstr "* Keine Zusammenfassung *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:817
+#: ../calendar/gui/e-memo-table.c:588 ../calendar/gui/e-task-table.c:818
 msgid "Start: "
 msgstr "Anfang:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:835
+#: ../calendar/gui/e-memo-table.c:607 ../calendar/gui/e-task-table.c:836
 msgid "Due: "
 msgstr "Fälligkeit:"
 
@@ -4496,9 +4511,9 @@ msgstr "Klicken Sie hier, um eine Notiz hinzuzufügen"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2271
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1043
+#: ../calendar/importers/icalendar-importer.c:1044
 #: ../modules/calendar/e-calendar-preferences.ui.h:41
 #: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:254
@@ -4508,24 +4523,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: ../calendar/gui/e-task-table.c:968
+#: ../calendar/gui/e-task-table.c:969
 msgid "Cut selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage ausschneiden"
 
-#: ../calendar/gui/e-task-table.c:974
+#: ../calendar/gui/e-task-table.c:975
 msgid "Copy selected tasks to the clipboard"
 msgstr "Die gewählten Aufgaben in die Zwischenablage kopieren"
 
-#: ../calendar/gui/e-task-table.c:980
+#: ../calendar/gui/e-task-table.c:981
 msgid "Paste tasks from the clipboard"
 msgstr "Aufgaben aus der Zwischenablage einfügen"
 
-#: ../calendar/gui/e-task-table.c:986
+#: ../calendar/gui/e-task-table.c:987
 #: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Die gewählten Aufgaben löschen"
 
-#: ../calendar/gui/e-task-table.c:992
+#: ../calendar/gui/e-task-table.c:993
 msgid "Select all visible tasks"
 msgstr "Alle sichtbaren Aufgaben wählen"
 
@@ -4536,7 +4551,7 @@ msgstr "Zeitzone auswählen"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1947
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -4633,7 +4648,7 @@ msgstr "Kalenderansicht für einen oder mehrere Tage"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1077
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Gnome Calendar"
 msgstr "GNOME Calendar"
 
@@ -4688,7 +4703,7 @@ msgstr "Kalenderansicht für einen Monat"
 msgid "calendar view for one or more weeks"
 msgstr "Kalenderansicht für eine oder mehrere Wochen"
 
-#: ../calendar/gui/gnome-cal.c:2250
+#: ../calendar/gui/gnome-cal.c:2262
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -4805,8 +4820,8 @@ msgstr "iCalendar-Informationen"
 #: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet "
-"sich mit anderen."
+"Eine Ressource kann nicht belegt werden, das neue Ereignis überschneidet sich "
+"mit anderen."
 
 #: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
@@ -4816,226 +4831,226 @@ msgstr "Eine Ressource kann nicht belegt werden, Fehler:"
 msgid "You must be an attendee of the event."
 msgstr "Sie müssen ein Teilnehmer des Ereignisses sein."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:585
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Su"
 msgstr "So"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Mo"
 msgstr "Mo"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Tu"
 msgstr "Di"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Th"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Fr"
 msgstr "Fr"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3137
 msgid " to "
 msgstr " bis "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3149
+#: ../calendar/gui/print.c:3147
 msgid " (Completed "
 msgstr " (Abgeschlossen "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3153
 msgid "Completed "
 msgstr "Abgeschlossen "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3163
 msgid " (Due "
 msgstr " (Fällig am "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3170
 msgid "Due "
 msgstr "Fällig am "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3335
 #, c-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3362
 msgid "Attendees: "
 msgstr "Teilnehmer: "
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3405
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3420
 #, c-format
 msgid "Priority: %s"
 msgstr "Priorität: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3438
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prozent abgeschlossen: %i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3449
 #, c-format
 msgid "URL: %s"
 msgstr "Adresse: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3462
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorien: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3473
 msgid "Contacts: "
 msgstr "Kontakte: "
 
@@ -5090,155 +5105,155 @@ msgstr "vCalendar-Dateien (.vcs)"
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-vCalendar-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:1038
+#: ../calendar/importers/icalendar-importer.c:1039
 msgid "Calendar Events"
 msgstr "Kalender-Ereignisse"
 
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/importers/icalendar-importer.c:1079
 msgid "Evolution Calendar intelligent importer"
 msgstr "Intelligenter Evolution-Kalender-Importeur"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Besprechung"
 
-#: ../calendar/importers/icalendar-importer.c:1146
-#: ../calendar/importers/icalendar-importer.c:1464
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../calendar/importers/icalendar-importer.c:1149
-#: ../calendar/importers/icalendar-importer.c:1465
+#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Aufgabe"
 
-#: ../calendar/importers/icalendar-importer.c:1152
-#: ../calendar/importers/icalendar-importer.c:1466
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1467
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Notiz"
 
-#: ../calendar/importers/icalendar-importer.c:1161
+#: ../calendar/importers/icalendar-importer.c:1162
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "enthält Wiederholungen"
 
-#: ../calendar/importers/icalendar-importer.c:1166
+#: ../calendar/importers/icalendar-importer.c:1167
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "ist eine Instanz"
 
-#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1172
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "enthält Erinnerungen"
 
-#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1177
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "enthält Anlagen"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1189
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Öffentlich"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1192
+#: ../calendar/importers/icalendar-importer.c:1193
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Privat"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Vertraulich"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Einstufung"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1204
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Zusammenfassung"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Ort"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1218
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Anfang"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Fällig"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1241
+#: ../calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Ende"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorien"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1276
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Abgeschlossen"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresse"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1294
-#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1295
+#: ../calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organisator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1317
-#: ../calendar/importers/icalendar-importer.c:1320
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Teilnehmer"
 
-#: ../calendar/importers/icalendar-importer.c:1334
+#: ../calendar/importers/icalendar-importer.c:1335
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1497
+#: ../calendar/importers/icalendar-importer.c:1498
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Art"
@@ -6796,164 +6811,164 @@ msgstr "Pazifik/Yap"
 msgid "Save as..."
 msgstr "Speichern unter …"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:295
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "S_chließen"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "Die momentan geöffnete Datei schließen"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "Neue _Nachricht"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr "Neues Nachrichtenfenster öffnen"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Evolution konfigurieren"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "Die momentan geöffnete Datei speichern"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "Speichern _unter …"
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "Die momentan geöffnete Datei unter einem anderem Namen speichern"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr "Zeichen_kodierung"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "_Drucken …"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "Druck_vorschau"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "Als _Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "Als Entwurf speichern"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:353
 msgid "S_end"
 msgstr "A_bschicken"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
 msgstr "Diese Nachricht verschicken"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr "Mit P_GP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr "Diese Nachricht mit PGP verschlüsseln"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr "Mit _PGP signieren"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr "Diese Nachricht mit PGP signieren"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr "_Bildersammlung"
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:398
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 "Eine Bildersammlung anzeigen, die in Ihrer Nachricht abgelegt werden kann"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr "Nachricht _priorisieren"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr "Die Priorität der Nachricht auf hoch setzen"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr "_Lesebestätigung anfordern"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "Eine Zustellungsbestätigung erhalten, sobald Ihre Nachricht gelesen wurde"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "Mit S/_MIME verschlüsseln"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 "Diese Nachricht mit Ihrem S/MIME-Verschlüsselungszertifikat verschlüsseln"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "Mit _S/MIME signieren"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Diese Nachricht mit Ihrem S/MIME-Signaturzertifikat signieren"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "_Blindkopie-Feld"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Blindkopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "_Kopie-Feld"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "Kopie-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "An_twort-an-Feld"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Antwort-an-Feld anzeigen/verbergen"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Geben Sie die Empfänger der Nachricht ein"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie der Nachricht erhalten sollen"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6961,35 +6976,35 @@ msgstr ""
 "Geben Sie die Adressen ein, die eine Kopie erhalten, jedoch nicht in der "
 "Empfängerliste auftauchen sollen"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:1018
 msgid "Fr_om:"
 msgstr "V_on:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Reply-To:"
 msgstr "Antwo_rt an:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1031
 msgid "_To:"
 msgstr "A_n:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:1036
 msgid "_Cc:"
 msgstr "_Kopie an:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:1041
 msgid "_Bcc:"
 msgstr "Blindko_pie an:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:1046
 msgid "_Post To:"
 msgstr "_Veröffentlichen in:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:1050
 msgid "S_ubject:"
 msgstr "Be_treff:"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:1059
 msgid "Si_gnature:"
 msgstr "Si_gnatur:"
 
@@ -7001,27 +7016,27 @@ msgstr "Klicken Sie hier, um das Adressbuch zu öffnen"
 msgid "Click here to select folders to post to"
 msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:250
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rückgängig machen"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:254
 msgid "Redo the last undone action"
 msgstr "Die zuletzt rückgängig gemachte Aktion wiederholen"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:258
 msgid "Search for text"
 msgstr "Nach Text suchen"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:262
 msgid "Search for and replace text"
 msgstr "Nach Text suchen und diesen ersetzen"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:373
 msgid "Save draft"
 msgstr "Entwurf speichern"
 
-#: ../composer/e-msg-composer.c:812
+#: ../composer/e-msg-composer.c:815
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7029,7 +7044,7 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
 "für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:821
+#: ../composer/e-msg-composer.c:824
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7038,17 +7053,17 @@ msgstr ""
 "Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
 "Verschlüsselungszertifikat für dieses Konto festgelegt"
 
-#: ../composer/e-msg-composer.c:1699 ../composer/e-msg-composer.c:2083
+#: ../composer/e-msg-composer.c:1702 ../composer/e-msg-composer.c:2091
 msgid "Compose Message"
 msgstr "Nachricht verfassen"
 
-#: ../composer/e-msg-composer.c:4228
+#: ../composer/e-msg-composer.c:4260
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Der Editor enthält einen nicht-Text-Nachrichtenrumpf, der nicht bearbeitet "
 "werden kann."
 
-#: ../composer/e-msg-composer.c:4933
+#: ../composer/e-msg-composer.c:4964
 msgid "Untitled Message"
 msgstr "Namenlose Nachricht"
 
@@ -7058,8 +7073,8 @@ msgid ""
 "the mail to be sent without those pending attachments "
 msgstr ""
 "Einige Anlagen werden zurzeit noch heruntergeladen. Das Speichern dieser "
-"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch "
-"ausstehenden Anlagen gespeichert wird."
+"Nachricht wird zur Folge haben, dass die Nachricht ohne die noch ausstehenden "
+"Anlagen gespeichert wird."
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
@@ -7083,8 +7098,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"Are you sure you want to discard the message, titled '{0}', you are composing?"
 msgstr ""
 "Sind Sie sicher, dass Sie die soeben verfasste Nachricht namens »{0}« "
 "verwerfen wollen?"
@@ -7110,8 +7124,8 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:10
 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 "
+"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 ""
 "Wenn Sie dieses Editorfenster schließen, wird die Nachricht dauerhaft "
@@ -7168,7 +7182,7 @@ msgstr ""
 "Die Datei »{0}« ist keine gewöhnliche Datei und kann daher nicht in einer "
 "Nachricht verschickt werden."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:126
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Die Fehlermeldung war »{0}«."
 
@@ -7311,14 +7325,13 @@ msgstr "Verschicken läuft"
 #: ../capplet/settings/mail-account-view.c:607
 msgid ""
 "To use the email application you'll need to setup an account. Put your email "
-"address and password in below and we'll try and work out all the settings. "
-"If we can't do it automatically you'll need your server details as well."
+"address and password in below and we'll try and work out all the settings. If "
+"we can't do it automatically you'll need your server details as well."
 msgstr ""
 "Um die E-Mail-Anwendung nutzen zu können, müssen Sie ein Konto einrichten. "
 "Geben Sie Ihre E-Mail-Adresse und Ihr Passwort unten ein. Es wird dann "
 "versucht, die entsprechenden Einstellungen automatisch vorzunehmen. Falls "
-"dies nicht möglich sein sollte, werden Sie Ihre Servereinstellungen "
-"benötigen."
+"dies nicht möglich sein sollte, werden Sie Ihre Servereinstellungen benötigen."
 
 #: ../capplet/settings/mail-account-view.c:609
 msgid ""
@@ -7333,8 +7346,7 @@ msgstr ""
 
 #: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
-msgstr ""
-"Sie dürfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
+msgstr "Sie dürfen bei der Konfiguration Ihres Kontos weitere Optionen angeben."
 
 #: ../capplet/settings/mail-account-view.c:613
 msgid ""
@@ -7357,8 +7369,8 @@ msgstr ""
 "Nun ist Zeit, alles zu überprüfen, bevor versucht wird, eine Verbindung zum "
 "Server herzustellen und Ihre Nachrichten abzurufen."
 
-#: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+#: ../capplet/settings/mail-account-view.c:630 ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2426
 msgid "Identity"
 msgstr "Identität"
 
@@ -7409,8 +7421,7 @@ msgstr "Weiter - Vorgaben"
 msgid "Back - Receiving options"
 msgstr "Zurück - Empfangsoptionen"
 
-#: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
+#: ../capplet/settings/mail-account-view.c:635 ../mail/em-account-editor.c:3378
 msgid "Defaults"
 msgstr "Vorgaben"
 
@@ -7487,10 +7498,7 @@ msgstr "Evolution-Kontoassistent"
 
 #. create the local source group
 #: ../capplet/settings/mail-capplet-shell.c:377 ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:750 ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:159
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:168
-#: ../mail/em-folder-tree-model.c:170
+#: ../mail/e-mail-migrate.c:748 ../mail/em-folder-tree-model.c:167
 #: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7499,6 +7507,13 @@ msgstr "Evolution-Kontoassistent"
 #: ../modules/calendar/e-memo-shell-migrate.c:109
 #: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../widgets/misc/e-account-tree-view.c:99
+#: ../widgets/misc/e-account-tree-view.c:291
+#: ../widgets/misc/e-account-tree-view.c:922
+#: ../widgets/misc/e-account-tree-view.c:980
+#: ../widgets/misc/e-account-tree-view.c:1053
+#: ../widgets/misc/e-account-tree-view.c:1130
+#: ../widgets/misc/e-account-tree-view.c:1359
 msgid "On This Computer"
 msgstr "Auf diesem Rechner"
 
@@ -7527,7 +7542,7 @@ msgstr "Benachrichtigungen über Kalenderereignisse"
 msgid "Evolution Alarm Notify"
 msgstr "Evolution Alarm-Benachrichtigung"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1000
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
@@ -7668,7 +7683,7 @@ msgstr "Visuell"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7749,19 +7764,19 @@ msgstr "Lokale Vorgabe benutzen"
 msgid "Format:"
 msgstr "Format:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(Unbekannter Dateiname)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:154
 #, c-format
 msgid "Writing \"%s\""
 msgstr "»%s« wird geschrieben"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:160
+#: ../e-util/e-file-utils.c:159
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "»%s« wird nach »%s« geschrieben"
@@ -7811,7 +7826,7 @@ msgstr "Soll sie überschrieben werden?"
 msgid "File exists \"{0}\"."
 msgstr "Die Datei »{0}« existiert bereits."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:166
 msgid "_Overwrite"
 msgstr "Ü_berschreiben"
 
@@ -7844,31 +7859,31 @@ msgid "Reply-To"
 msgstr "Antwort an"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1063
-#: ../mail/em-format-html.c:2593 ../mail/em-format-html.c:2661
-#: ../mail/em-format-html.c:2684 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/em-format-html.c:2627 ../mail/em-format-html.c:2695
+#: ../mail/em-format-html.c:2718 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kopie"
 
 #: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1064
-#: ../mail/em-format-html.c:2594 ../mail/em-format-html.c:2665
-#: ../mail/em-format-html.c:2687 ../modules/mail/em-mailer-prefs.c:76
+#: ../mail/em-format-html.c:2628 ../mail/em-format-html.c:2699
+#: ../mail/em-format-html.c:2721 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Blindkopie"
 
 #: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
+#: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Betreff"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2786
+#: ../em-format/em-format-quote.c:475 ../mail/em-format-html.c:2820
 #: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "Mailer"
 
-#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1203
+#: ../em-format/em-format-quote.c:565 ../mail/em-composer-utils.c:1207
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
@@ -7915,8 +7930,8 @@ msgstr "Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden"
 #: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr ""
-"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: "
-"Unbekannter Fehler"
+"Die Syntax der PGP/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
+"Fehler"
 
 #: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
@@ -8109,11 +8124,11 @@ msgid "A_dd Condition"
 msgstr "Bedingung hin_zufügen"
 
 #: ../filter/e-filter-rule.c:1135 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:321
+#: ../mail/em-utils.c:323
 msgid "Incoming"
 msgstr "Eingang"
 
-#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:322
+#: ../filter/e-filter-rule.c:1135 ../mail/em-utils.c:324
 msgid "Outgoing"
 msgstr "Ausgehend"
 
@@ -8145,7 +8160,7 @@ msgstr "Datum fehlt."
 msgid "Missing file name."
 msgstr "Dateiname fehlt."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:91
 msgid "Missing name."
 msgstr "Name fehlt."
 
@@ -8259,24 +8274,24 @@ msgid "Ask for each message"
 msgstr "Bei jeder Nachricht nachfragen"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Keine"
 
-#: ../mail/em-account-editor.c:2237
+#: ../mail/em-account-editor.c:2233
 msgid "Fil_e:"
 msgstr "Dat_ei:"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: ../mail/em-account-editor.c:2286
+#: ../mail/em-account-editor.c:2287
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2288
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8286,30 +8301,30 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Vor«, um die Konfiguration zu beginnen."
 
-#: ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2291
 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."
+"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 ""
 "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse an. Die Felder "
 "unter »Optional« müssen nicht\n"
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: ../mail/em-account-editor.c:2293
+#: ../mail/em-account-editor.c:2294
 msgid "Please configure the following account settings."
 msgstr "Bitte konfigurieren Sie die folgenden Konteneinstellungen."
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
 msgid "Sending Email"
 msgstr "Verschicken von E-Mails"
 
-#: ../mail/em-account-editor.c:2296
+#: ../mail/em-account-editor.c:2297
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8318,11 +8333,11 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Konteninformation"
 
-#: ../mail/em-account-editor.c:2299
+#: ../mail/em-account-editor.c:2300
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8330,11 +8345,11 @@ msgstr ""
 "Bitte geben Sie unten einen bezeichnenden Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zum Anzeigen verwendet."
 
-#: ../mail/em-account-editor.c:2303
+#: ../mail/em-account-editor.c:2304
 msgid "Done"
 msgstr "Fertig"
 
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2305
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8351,44 +8366,42 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: ../mail/em-account-editor.c:2843
+#: ../mail/em-account-editor.c:2844
 msgid "Check for _new messages every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: ../mail/em-account-editor.c:2851
+#: ../mail/em-account-editor.c:2852
 msgid "minu_tes"
 msgstr "Minu_ten"
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
 msgid "Security"
 msgstr "Sicherheit"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
 msgid "Receiving Options"
 msgstr "Empfangsoptionen"
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
 msgid "Checking for New Messages"
 msgstr "Nach neuen E-Mails sehen"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
+#: ../widgets/misc/e-attachment-paned.c:179
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Anlage"
 msgstr[1] "Anlagen"
 
-#: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../mail/e-mail-attachment-bar.c:608 ../widgets/misc/e-attachment-paned.c:700
 msgid "Icon View"
 msgstr "Symbolansicht"
 
-#: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../mail/e-mail-attachment-bar.c:610 ../widgets/misc/e-attachment-paned.c:702
 msgid "List View"
 msgstr "Listenansicht"
 
@@ -8426,52 +8439,52 @@ msgstr "Eine Antwort an diese Adresse senden"
 msgid "Create Search _Folder"
 msgstr "_Suchordner anlegen"
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../mail/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Nachricht wird in Ordner »%s« gespeichert"
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../mail/e-mail-folder-utils.c:270
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: ../mail/e-mail-folder-utils.c:391
+#: ../mail/e-mail-folder-utils.c:385
 msgid "Scanning messages for duplicates"
 msgstr "Nachrichten werden auf Duplikate überprüft"
 
-#: ../mail/e-mail-folder-utils.c:584
+#: ../mail/e-mail-folder-utils.c:576
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht wird abgerufen"
 msgstr[1] "%d Nachrichten werden abgerufen"
 
-#: ../mail/e-mail-folder-utils.c:834
+#: ../mail/e-mail-folder-utils.c:824
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ordner »%s« wird entfernt"
 
-#: ../mail/e-mail-folder-utils.c:968
+#: ../mail/e-mail-folder-utils.c:956
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Die Datei »%s« wurde gelöscht."
 
-#: ../mail/e-mail-folder-utils.c:972
+#: ../mail/e-mail-folder-utils.c:960
 msgid "File has been removed."
 msgstr "Datei wurde gelöscht."
 
-#: ../mail/e-mail-folder-utils.c:1031
+#: ../mail/e-mail-folder-utils.c:1019
 msgid "Removing attachments"
 msgstr "Anlagen werden gelöscht"
 
-#: ../mail/e-mail-folder-utils.c:1195
+#: ../mail/e-mail-folder-utils.c:1181
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "%d Nachricht wird gespeichert"
 msgstr[1] "%d Nachrichten werden gespeichert"
 
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:613
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:628
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Ungültiger Ordneradresse »%s«"
@@ -8511,7 +8524,7 @@ msgid "_Later"
 msgstr "S_päter"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../modules/mail/e-mail-shell-view-actions.c:677
 msgid "Add Label"
 msgstr "Beschriftung hinzufügen"
 
@@ -8532,7 +8545,7 @@ msgid "Color"
 msgstr "Farbe"
 
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../plugins/caldav/caldav-browse-server.c:1358
 #: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
@@ -8540,28 +8553,28 @@ msgid "Name"
 msgstr "Name"
 
 #: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:312
-#: ../mail/em-folder-tree-model.c:720
+#: ../mail/em-folder-tree-model.c:916
 #: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Eingang"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:713
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:909
 #: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:724
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:920
 #: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Ausgang"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:728
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:924
 #: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Verschickt"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:716
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:912
 #: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1034 ../plugins/templates/templates.c:1312
@@ -8582,11 +8595,11 @@ msgstr "Migration"
 msgid "Migrating '%s':"
 msgstr "»%s« wird migriert:"
 
-#: ../mail/e-mail-migrate.c:728
+#: ../mail/e-mail-migrate.c:726
 msgid "Migrating Folders"
 msgstr "Ordner werden migriert"
 
-#: ../mail/e-mail-migrate.c:729
+#: ../mail/e-mail-migrate.c:727
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -8598,7 +8611,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner …"
 
-#: ../mail/e-mail-migrate.c:1527
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Lokale E-Mail-Ordner unter »%s« konnten nicht angelegt werden: %s"
@@ -8615,619 +8628,617 @@ msgstr "In Ordner kopieren"
 msgid "C_opy"
 msgstr "K_opieren"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:823 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:823 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1184 ../mail/e-mail-reader.c:1372
+#: ../mail/e-mail-reader.c:1412
 msgid "_Do not ask me again."
 msgstr "_Nicht mehr nachfragen."
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1418
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "»_Antwort an« bei Mailinglisten immer ignorieren"
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1784
 msgid "A_dd Sender to Address Book"
 msgstr "A_bsender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1786
 msgid "Add sender to address book"
 msgstr "Absender zum Adressbuch hinzufügen"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1791
 msgid "Check for _Junk"
 msgstr "Über_prüfung auf unerwünschte Nachrichten"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1793
 msgid "Filter the selected messages for junk status"
 msgstr "Die gewählten Nachrichten auf den Status »Unerwünscht« filtern"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1798
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren …"
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1800
 msgid "Copy selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner kopieren"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1805
 msgid "_Delete Message"
 msgstr "Nachricht _löschen"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1807
 msgid "Mark the selected messages for deletion"
 msgstr "Die gewählten Nachrichten zum Löschen markieren"
 
-#: ../mail/e-mail-reader.c:1803
+#: ../mail/e-mail-reader.c:1812
 msgid "Filter on Mailing _List..."
 msgstr "Filter über Mailing_liste …"
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1814
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Mailingliste zu filtern"
 
-#: ../mail/e-mail-reader.c:1810
+#: ../mail/e-mail-reader.c:1819
 msgid "Filter on _Recipients..."
 msgstr "Filter über _Empfänger …"
 
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1821
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Eine Regel anlegen, um Nachrichten an diese Empfänger zu filtern"
 
-#: ../mail/e-mail-reader.c:1817
+#: ../mail/e-mail-reader.c:1826
 msgid "Filter on Se_nder..."
 msgstr "Filter über _Absender …"
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1828
 msgid "Create a rule to filter messages from this sender"
 msgstr "Eine Regel anlegen, um Nachrichten von diesem Absender zu filtern"
 
-#: ../mail/e-mail-reader.c:1824
+#: ../mail/e-mail-reader.c:1833
 msgid "Filter on _Subject..."
 msgstr "Filter über _Betreff …"
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1835
 msgid "Create a rule to filter messages with this subject"
 msgstr "Eine Regel anlegen, um Nachrichten mit diesem Betreff zu filtern"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1840
 msgid "A_pply Filters"
 msgstr "Filter an_wenden"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1842
 msgid "Apply filter rules to the selected messages"
 msgstr "Filterregeln auf die gewählten Nachrichten anwenden"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1847
 msgid "_Find in Message..."
 msgstr "In Nachricht _suchen …"
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1849
 msgid "Search for text in the body of the displayed message"
 msgstr "Im Rumpf der angezeigten Nachricht nach Text suchen"
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1854
 msgid "_Clear Flag"
 msgstr "Markierung _löschen"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1856
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Die Folgemarkierung aus den gewählten Nachrichten entfernen"
 
-#: ../mail/e-mail-reader.c:1852
+#: ../mail/e-mail-reader.c:1861
 msgid "_Flag Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1863
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 "Für die gewählten Nachrichten die Folgenachricht-Markierung auf »vollständig« "
 "setzen"
 
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1868
 msgid "Follow _Up..."
 msgstr "_Folgenachricht …"
 
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1870
 msgid "Flag the selected messages for follow-up"
 msgstr "Die gewählten Nachrichten zur Nachverfolgung markieren"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1875
 msgid "_Attached"
 msgstr "_Anhang"
 
-#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1877 ../mail/e-mail-reader.c:1884
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Die gewählte Nachricht an jemanden als Anlage weiterleiten"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1882
 msgid "Forward As _Attached"
 msgstr "Als _Anhang weiterleiten"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1889
 msgid "_Inline"
 msgstr "_Eingebettet"
 
-#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1891 ../mail/e-mail-reader.c:1898
 msgid "Forward the selected message in the body of a new message"
 msgstr "Die gewählte Nachricht im Rumpf einer neuen Nachricht weiterleiten"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1896
 msgid "Forward As _Inline"
 msgstr "_Eingebettet weiterleiten"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1903
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1905 ../mail/e-mail-reader.c:1912
 msgid "Forward the selected message quoted like a reply"
 msgstr "Die gewählte Nachricht als Zitat wie in einer Antwort weiterleiten"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1910
 msgid "Forward As _Quoted"
 msgstr "_Zitiert weiterleiten"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1917
 msgid "_Load Images"
 msgstr "_Bilder laden"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1919
 msgid "Force images in HTML mail to be loaded"
 msgstr "Laden von Bildern in HTML-E-Mail erzwingen"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1924
 msgid "_Important"
 msgstr "_Wichtig"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1926
 msgid "Mark the selected messages as important"
 msgstr "Die gewählten Nachrichten als wichtig markieren"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1931
 msgid "_Junk"
 msgstr "Unerwü_nscht"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1933
 msgid "Mark the selected messages as junk"
 msgstr "Die gewählten Nachrichten als unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1938
 msgid "_Not Junk"
 msgstr "E_rwünscht"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1940
 msgid "Mark the selected messages as not being junk"
 msgstr "Die gewählten Nachrichten als nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1945
 msgid "_Read"
 msgstr "Ge_lesen"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark the selected messages as having been read"
 msgstr "Die gewählten Nachrichten als gelesen markieren"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1952
 msgid "Uni_mportant"
 msgstr "_Unwichtig"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1954
 msgid "Mark the selected messages as unimportant"
 msgstr "Die gewählten Nachrichten als unwichtig markieren"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:1959
 msgid "_Unread"
 msgstr "_Ungelesen"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1961
 msgid "Mark the selected messages as not having been read"
 msgstr "Die gewählten Nachrichten als ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1966
 msgid "_Edit as New Message..."
 msgstr "Als neue _Nachricht bearbeiten …"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1968
 msgid "Open the selected messages in the composer for editing"
 msgstr "Die gewählten Nachrichten zum Bearbeiten im Editor öffnen"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1973
 msgid "Compose _New Message"
 msgstr "_Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1975
 msgid "Open a window for composing a mail message"
 msgstr "Ein Fenster zum Verfassen einer E-Mail-Nachricht öffnen"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1980
 msgid "_Open in New Window"
 msgstr "In neuem _Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1982
 msgid "Open the selected messages in a new window"
 msgstr "Die gewählten Nachrichten in einem neuen Fenster öffnen"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1987
 msgid "_Move to Folder..."
 msgstr "In Ordner _verschieben …"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1989
 msgid "Move selected messages to another folder"
 msgstr "Die gewählten Nachrichten in einen anderen Ordner verschieben"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1994
 msgid "_Switch to Folder"
 msgstr "Zu Ordner _wechseln"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1996
 msgid "Display the parent folder"
 msgstr "Den Elternordner anzeigen"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to _next tab"
 msgstr "Zum _nächsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2003
 msgid "Switch to the next tab"
 msgstr "Zum nächsten Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2008
 msgid "Switch to _previous tab"
 msgstr "Zum _vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2010
 msgid "Switch to the previous tab"
 msgstr "Zum vorherigen Reiter wechseln"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2015
 msgid "Cl_ose current tab"
 msgstr "Den momentan geöffneten Reiter _schließen"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2017
 msgid "Close current tab"
 msgstr "Den momentan geöffneten Reiter schließen"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2022
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2024
 msgid "Display the next message"
 msgstr "Die nächste Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2029
 msgid "Next _Important Message"
 msgstr "Nächste _wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2031
 msgid "Display the next important message"
 msgstr "Die nächste wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2036
 msgid "Next _Thread"
 msgstr "Nächster _Thread"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2038
 msgid "Display the next thread"
 msgstr "Nächsten Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2043
 msgid "Next _Unread Message"
 msgstr "Nächste _ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2045
 msgid "Display the next unread message"
 msgstr "Die nächste ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2050
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2052
 msgid "Display the previous message"
 msgstr "Die vorhergehende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2057
 msgid "Pr_evious Important Message"
 msgstr "V_orherige wichtige Nachricht"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2059
 msgid "Display the previous important message"
 msgstr "Die vorhergehende wichtige Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2064
 msgid "Previous T_hread"
 msgstr "Vo_rheriger Thread"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2066
 msgid "Display the previous thread"
 msgstr "Den vorhergehenden Thread anzeigen"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2071
 msgid "P_revious Unread Message"
 msgstr "_Vorherige ungelesene Nachricht"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2073
 msgid "Display the previous unread message"
 msgstr "Die vorhergehende ungelesene Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2080
 msgid "Print this message"
 msgstr "Diese Nachricht drucken"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2087
 msgid "Preview the message to be printed"
 msgstr "Eine Vorschau auf die zu druckende Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2092
 msgid "Re_direct"
 msgstr "_Umleiten"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2094
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden umleiten"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2099
 msgid "Remo_ve Attachments"
 msgstr "Anlagen _löschen"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2101
 msgid "Remove attachments"
 msgstr "Anlagen löschen"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2106
 msgid "Remove Du_plicate Messages"
 msgstr "Do_ppelte Nachrichten löschen"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2108
 msgid "Checks selected messages for duplicates"
 msgstr "Die gewählten Nachrichten auf Duplikate überprüfen"
 
-#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Antw_ort an alle"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2115
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Eine Antwort an alle Empfänger der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
 msgid "Reply to _List"
 msgstr "Antwort an Lis_te"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2122
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Eine Antwort an die Mailingliste der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2118
-#: ../modules/mail/e-mail-attachment-handler.c:184
+#: ../mail/e-mail-reader.c:2127 ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2129
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Eine Antwort an den Absender der gewählten Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2134
 msgid "_Save as mbox..."
 msgstr "_Speichern als mbox …"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2136
 msgid "Save selected messages as an mbox file"
 msgstr "Die gewählten Nachrichten als mbox-Datei speichern"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2141
 msgid "_Message Source"
 msgstr "Nachrichten-_Quelltext"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2143
 msgid "Show the raw email source of the message"
 msgstr "Den zugrunde liegenden E-Mail-Quelltext dieser Nachricht anzeigen"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2155
 msgid "_Undelete Message"
 msgstr "Löschen der Nachricht _rückgängig"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2157
 msgid "Undelete the selected messages"
 msgstr "Löschen der gewählten Nachrichten rückgängig machen"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2162
 msgid "_Normal Size"
 msgstr "_Normale Größe"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2164
 msgid "Reset the text to its original size"
 msgstr "Den Text auf seine Originalgröße zurücksetzen"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2169
 msgid "_Zoom In"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2171
 msgid "Increase the text size"
 msgstr "Die Textgröße heraufsetzen"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2176
 msgid "Zoom _Out"
 msgstr "Ansicht ver_kleinern"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2178
 msgid "Decrease the text size"
 msgstr "Die Textgröße heruntersetzen"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2185
 msgid "Create R_ule"
 msgstr "_Regel anlegen"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2192
 msgid "Ch_aracter Encoding"
 msgstr "Zeichenko_dierung"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2199
 msgid "F_orward As"
 msgstr "_Weiterleiten als …"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2206
 msgid "_Group Reply"
 msgstr "Antwort an _Gruppe"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2213
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2220
 msgid "Mar_k As"
 msgstr "Mar_kieren als"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2227
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2234
 msgid "_Zoom"
 msgstr "Ansicht ver_größern"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2244
 msgid "Search Folder from Mailing _List..."
 msgstr "Suchordner über Mailing_liste …"
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2246
 msgid "Create a search folder for this mailing list"
 msgstr "Einen Suchordner für diese Mailingliste anlegen"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2251
 msgid "Search Folder from Recipien_ts..."
 msgstr "Suchordner über _Empfänger …"
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2253
 msgid "Create a search folder for these recipients"
 msgstr "Einen Suchordner für diese Empfänger anlegen"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2258
 msgid "Search Folder from Sen_der..."
 msgstr "Suchordner über _Absender …"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2260
 msgid "Create a search folder for this sender"
 msgstr "Einen Suchordner für diesen Absender anlegen"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2265
 msgid "Search Folder from S_ubject..."
 msgstr "Suchordner über _Betreff …"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2267
 msgid "Create a search folder for this subject"
 msgstr "Einen Suchordner für diesen Betreff anlegen"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2290
 msgid "Mark for Follo_w Up..."
 msgstr "Als _Folgenachricht markieren …"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2298
 msgid "Mark as _Important"
 msgstr "Als w_ichtig markieren"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as _Junk"
 msgstr "Als un_erwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Not Junk"
 msgstr "Als _nicht unerwünscht markieren"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2310
 msgid "Mar_k as Read"
 msgstr "Als _gelesen markieren"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2314
 msgid "Mark as Uni_mportant"
 msgstr "Als un_wichtig markieren"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2362
 msgid "_Caret Mode"
 msgstr "Cursor-_Modus"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2364
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Im Rumpf der angezeigten Nachricht einen blinkenden Cursor anzeigen"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2370
 msgid "All Message _Headers"
 msgstr "Alle Nachrichtenk_öpfe"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2372
 msgid "Show messages with all email headers"
 msgstr "Nachrichten mit allen E-Mail-Kopfzeilen anzeigen"
 
-#: ../mail/e-mail-reader.c:2659
+#: ../mail/e-mail-reader.c:2668
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Nachricht »%s« wird abgerufen"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../mail/e-mail-reader.c:3255 ../mail/mail-config.ui.h:32
 #: ../plugins/google-account-setup/google-source.c:316
 #: ../plugins/google-account-setup/google-source.c:565
 #: ../plugins/google-account-setup/google-source.c:704
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../widgets/misc/e-account-tree-view.c:414
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../mail/e-mail-reader.c:3415
-#: ../modules/mail/e-mail-attachment-handler.c:170
+#: ../mail/e-mail-reader.c:3424 ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3425
 msgid "Forward the selected message to someone"
 msgstr "Die gewählte Nachricht an jemanden weiterleiten"
 
-#: ../mail/e-mail-reader.c:3435
+#: ../mail/e-mail-reader.c:3444
 msgid "Group Reply"
 msgstr "Antwort an Gruppe"
 
-#: ../mail/e-mail-reader.c:3436
+#: ../mail/e-mail-reader.c:3445
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 "Eine Antwort an die Mailingliste oder an alle Empfänger der gewählten "
 "Nachricht verfassen"
 
-#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3498 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../mail/e-mail-reader.c:3522
+#: ../mail/e-mail-reader.c:3531
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mail/e-mail-reader.c:3526
+#: ../mail/e-mail-reader.c:3535
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Vorherige"
 
-#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
+#: ../mail/e-mail-reader.c:3544 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Antworten"
 
-#: ../mail/e-mail-reader.c:4205
+#: ../mail/e-mail-reader.c:4214
 #, c-format
 msgid "Folder '%s'"
 msgstr "Ordner »%s«"
@@ -9238,11 +9249,10 @@ msgstr "Nicht mehr nachfragen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:670
+#: ../mail/e-mail-reader-utils.c:667
 #, c-format
 msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
 msgid_plural ""
 "Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
 "them?"
@@ -9253,7 +9263,7 @@ msgstr[1] ""
 "Der Ordner »%s« enthält %u doppelte Nachrichten. Sollen diese wirklich "
 "gelöscht werden?"
 
-#: ../mail/e-mail-reader-utils.c:1047
+#: ../mail/e-mail-reader-utils.c:1044
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Nachricht speichern"
@@ -9264,36 +9274,36 @@ msgstr[1] "Nachrichten speichern"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1068
+#: ../mail/e-mail-reader-utils.c:1065
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Nachricht"
 msgstr[1] "Nachrichten"
 
-#: ../mail/e-mail-session.c:870
+#: ../mail/e-mail-session.c:798
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/e-mail-session.c:874
+#: ../mail/e-mail-session.c:802
 msgid "Enter Passphrase"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/e-mail-session.c:878
+#: ../mail/e-mail-session.c:806
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:810
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: ../mail/e-mail-session.c:933
+#: ../mail/e-mail-session.c:861
 #, c-format
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: ../mail/e-mail-session.c:1046
+#: ../mail/e-mail-session.c:974
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -9301,25 +9311,25 @@ msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da keine Zieladresse "
 "angegeben wurde."
 
-#: ../mail/e-mail-session.c:1055
+#: ../mail/e-mail-session.c:983
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "Das Weiterleiten der Nachricht wurde abgebrochen, da kein nutzbares Konto "
 "gefunden wurde."
 
-#: ../mail/e-mail-session-utils.c:419
+#: ../mail/e-mail-session-utils.c:415
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "Transport für Konto »%s« konnte nicht erhalten werden"
 
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
+#: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9328,32 +9338,32 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschickt«-Ordner anzuhängen."
 
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
+#: ../mail/mail-ops.c:928
 msgid "Sending message"
 msgstr "Nachricht wird verschickt"
 
-#: ../mail/e-mail-session-utils.c:873
+#: ../mail/e-mail-session-utils.c:862
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Ordners »%s« wird abbestellt"
 
-#: ../mail/e-mail-store-utils.c:168
+#: ../mail/e-mail-store-utils.c:166
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Verbindung mit »%s« wird getrennt"
 
-#: ../mail/e-mail-store-utils.c:259
+#: ../mail/e-mail-store-utils.c:255
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Verbindung mit »%s« wird erneut hergestellt"
 
-#: ../mail/e-mail-store-utils.c:334
+#: ../mail/e-mail-store-utils.c:328
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Konto »%s« wird für Offline-Betrieb vorbereitet"
@@ -9366,7 +9376,7 @@ msgstr "Als Folgenachricht markieren"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1197
+#: ../mail/em-composer-utils.c:1201
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9374,31 +9384,31 @@ msgstr ""
 "Am ${WeekdayName}, den ${Day}.${Month}.${Year}, ${24Hour}:${Minute} "
 "${TimeZone} schrieb ${Sender}:"
 
-#: ../mail/em-composer-utils.c:1208
+#: ../mail/em-composer-utils.c:1212
 msgid "-----Original Message-----"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1992
+#: ../mail/em-composer-utils.c:2001
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ihre Nachricht an %s mit dem Betreff »%s« am %s wurde gelesen."
 
-#: ../mail/em-composer-utils.c:2052
+#: ../mail/em-composer-utils.c:2061
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Zustellungsbestätigung für: »%s«"
 
-#: ../mail/em-composer-utils.c:2592
+#: ../mail/em-composer-utils.c:2600
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
-#: ../mail/em-composer-utils.c:2998
+#: ../mail/em-composer-utils.c:3006
 msgid "Posting destination"
 msgstr "Zielordner"
 
-#: ../mail/em-composer-utils.c:2999
+#: ../mail/em-composer-utils.c:3007
 msgid "Choose folders to post the message to."
 msgstr "Wählen Sie Ordner, in denen die Nachricht abgelegt werden soll."
 
@@ -9709,46 +9719,50 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "E-Mail-Ordnerbaum"
 
-#: ../mail/em-folder-tree.c:2069 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2067 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird verschoben"
 
-#: ../mail/em-folder-tree.c:2072 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2070 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird kopiert"
 
-#: ../mail/em-folder-tree.c:2079 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2077 ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s verschoben"
 
-#: ../mail/em-folder-tree.c:2083 ../mail/message-list.c:2305
+#: ../mail/em-folder-tree.c:2081 ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden in den Ordner %s kopiert"
 
-#: ../mail/em-folder-tree.c:2102
+#: ../mail/em-folder-tree.c:2100
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Sie können Nachrichten nicht im Speicher auf der obersten Ebene abgelegen"
 
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1125 ../mail/mail-vfolder.c:1239
+#: ../mail/em-folder-tree-model.c:168 ../mail/mail-vfolder.c:1125
+#: ../mail/mail-vfolder.c:1239 ../widgets/misc/e-account-tree-view.c:100
+#: ../widgets/misc/e-account-tree-view.c:301
+#: ../widgets/misc/e-account-tree-view.c:924
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1055
+#: ../widgets/misc/e-account-tree-view.c:1132
+#: ../widgets/misc/e-account-tree-view.c:1387
 msgid "Search Folders"
 msgstr "Suchordner"
 
 # CHECK
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179 ../mail/em-folder-tree-model.c:181
+#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "OHNE TREFFER"
 
-#: ../mail/em-folder-tree-model.c:790 ../mail/em-folder-tree-model.c:1075
+#: ../mail/em-folder-tree-model.c:986 ../mail/em-folder-tree-model.c:1278
 msgid "Loading..."
 msgstr "Ladevorgang …"
 
@@ -9760,109 +9774,109 @@ msgstr "Ordner verschieben nach"
 msgid "Copy Folder To"
 msgstr "Ordner kopieren nach"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:605
 msgid "Create Folder"
 msgstr "Ordner anlegen"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:606
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
 
-#: ../mail/em-format-html.c:166
+#: ../mail/em-format-html.c:167
 msgid "Formatting message"
 msgstr "Nachricht wird formatiert"
 
-#: ../mail/em-format-html.c:378
+#: ../mail/em-format-html.c:379
 msgid "Formatting Message..."
 msgstr "Nachricht wird formatiert  …"
 
-#: ../mail/em-format-html.c:1562 ../mail/em-format-html.c:1572
+#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1606
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "»%s« wird abgerufen"
 
-#: ../mail/em-format-html.c:1723 ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html.c:1757 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Unsigniert"
 
-#: ../mail/em-format-html.c:1724 ../mail/em-format-html-display.c:90
+#: ../mail/em-format-html.c:1758 ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Gültige Signatur"
 
-#: ../mail/em-format-html.c:1725 ../mail/em-format-html-display.c:91
+#: ../mail/em-format-html.c:1759 ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Ungültige Signatur"
 
-#: ../mail/em-format-html.c:1726 ../mail/em-format-html-display.c:92
+#: ../mail/em-format-html.c:1760 ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte jedoch nicht verifiziert werden"
 
-#: ../mail/em-format-html.c:1727 ../mail/em-format-html-display.c:93
+#: ../mail/em-format-html.c:1761 ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "Signatur existiert, jedoch wird der öffentliche Schlüssel benötigt"
 
-#: ../mail/em-format-html.c:1733 ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html.c:1767 ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Nicht verschlüsselt"
 
-#: ../mail/em-format-html.c:1734 ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html.c:1768 ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Schwach verschlüsselt"
 
-#: ../mail/em-format-html.c:1735 ../mail/em-format-html-display.c:102
+#: ../mail/em-format-html.c:1769 ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: ../mail/em-format-html.c:1736 ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html.c:1770 ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Stark verschlüsselt"
 
-#: ../mail/em-format-html.c:2136
+#: ../mail/em-format-html.c:2170
 msgid "Unknown external-body part."
 msgstr "Unbekannter external-body-Teil."
 
-#: ../mail/em-format-html.c:2146
+#: ../mail/em-format-html.c:2180
 msgid "Malformed external-body part."
 msgstr "Fehlerhaft formatierter external-body-Teil."
 
-#: ../mail/em-format-html.c:2177
+#: ../mail/em-format-html.c:2211
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: ../mail/em-format-html.c:2188
+#: ../mail/em-format-html.c:2222
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
 
-#: ../mail/em-format-html.c:2190
+#: ../mail/em-format-html.c:2224
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: ../mail/em-format-html.c:2211
+#: ../mail/em-format-html.c:2245
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Zeiger auf ferne Daten (%s)"
 
-#: ../mail/em-format-html.c:2226
+#: ../mail/em-format-html.c:2260
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:2934
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../mail/em-format-html.c:2968
+#: ../plugins/mail-notification/mail-notification.c:403
 #, c-format
 msgid "From: %s"
 msgstr "Von: %s"
 
-#: ../mail/em-format-html.c:2956
+#: ../mail/em-format-html.c:2990
 msgid "(no subject)"
 msgstr "(Kein Betreff)"
 
-#: ../mail/em-format-html.c:3032
+#: ../mail/em-format-html.c:3066
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Diese Nachricht wurde von %s im Namen von %s gesendet"
@@ -9872,8 +9886,8 @@ msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
-"Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
-"daher nicht sichergestellt."
+"Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist daher "
+"nicht sichergestellt."
 
 # CHECK
 #: ../mail/em-format-html-display.c:90
@@ -9886,11 +9900,11 @@ msgstr ""
 
 #: ../mail/em-format-html-display.c:91
 msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+"The signature of this message cannot be verified, it may have been altered in "
+"transit."
 msgstr ""
-"Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
-"Möglicherweise wurde sie bei der Übertragung verändert."
+"Die Signatur dieser Nachricht konnte nicht verifiziert werden. Möglicherweise "
+"wurde sie bei der Übertragung verändert."
 
 #: ../mail/em-format-html-display.c:92
 msgid ""
@@ -9902,8 +9916,8 @@ msgstr ""
 
 #: ../mail/em-format-html-display.c:93
 msgid ""
-"This message is signed with a signature, but there is no corresponding "
-"public key."
+"This message is signed with a signature, but there is no corresponding public "
+"key."
 msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, jedoch ist kein "
 "passender öffentlicher Schlüssel vorhanden."
@@ -9922,14 +9936,14 @@ msgid ""
 "difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 msgstr ""
-"Diese Nachricht ist verschlüsselt, der Verschlüsselungsalgorithmus ist "
-"jedoch schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch "
-"nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
+"Diese Nachricht ist verschlüsselt, der Verschlüsselungsalgorithmus ist jedoch "
+"schwach. Daher können Dritte ihren Inhalt zwar nur schwerlich, jedoch nicht "
+"unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
 #: ../mail/em-format-html-display.c:102
 msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+"This message is encrypted.  It would be difficult for an outsider to view the "
+"content of this message."
 msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können Dritte ihren Inhalt nur "
 "schwerlich ausspähen."
@@ -9941,8 +9955,8 @@ msgid ""
 "practical amount of time."
 msgstr ""
 "Diese Nachricht ist mit einem starken Verschlüsselungsalgorithmus "
-"verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich "
-"innerhalb eines praktikablen Zeitraums ausspähen."
+"verschlüsselt. Daher können Dritte ihren Inhalt nur sehr schwerlich innerhalb "
+"eines praktikablen Zeitraums ausspähen."
 
 #: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
@@ -9952,7 +9966,7 @@ msgstr "_Zertifikat anzeigen"
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
-#: ../mail/em-format-html-display.c:566
+#: ../mail/em-format-html-display.c:568
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9960,39 +9974,39 @@ msgstr ""
 "Evolution kann diese E-Mail nicht wiedergeben, da sie zu groß ist um sie zu "
 "verarbeiten. Sie können Sie unformatiert oder in einem Texteditor betrachten."
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:758
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:806
 msgid "Save _Image..."
 msgstr "Bild spe_ichern …"
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-format-html-display.c:808
 msgid "Save the image to a file"
 msgstr "Das Bild in einer Datei speichern"
 
-#: ../mail/em-format-html-display.c:1034
+#: ../mail/em-format-html-display.c:1036
 msgid "Completed on"
 msgstr "Abgeschlossen am"
 
-#: ../mail/em-format-html-display.c:1046
+#: ../mail/em-format-html-display.c:1048
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1056
 msgid "by"
 msgstr "am"
 
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+#: ../mail/em-format-html-display.c:1337 ../mail/em-format-html-display.c:1388
 msgid "View _Unformatted"
 msgstr "_Unformatierte ansehen"
 
-#: ../mail/em-format-html-display.c:1337
+#: ../mail/em-format-html-display.c:1339
 msgid "Hide _Unformatted"
 msgstr "_Unformatierte verstecken"
 
-#: ../mail/em-format-html-display.c:1408
+#: ../mail/em-format-html-display.c:1410
 msgid "O_pen With"
 msgstr "Ö_ffnen mit"
 
@@ -10007,61 +10021,61 @@ msgstr "Seite %d von %d"
 msgid "No HTML stream available"
 msgstr "Kein HTML-Datenstrom verfügbar"
 
-#: ../mail/em-subscription-editor.c:1162
+#: ../mail/em-subscription-editor.c:1165
 msgid "Folder Subscriptions"
 msgstr "Ordnerabonnements"
 
-#: ../mail/em-subscription-editor.c:1201
+#: ../mail/em-subscription-editor.c:1204
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../mail/em-subscription-editor.c:1216
+#: ../mail/em-subscription-editor.c:1219
 msgid "Clear Search"
 msgstr "Suchfeld leeren"
 
-#: ../mail/em-subscription-editor.c:1234
+#: ../mail/em-subscription-editor.c:1237
 msgid "Sho_w items that contain:"
 msgstr "Nur Einträge anzeigen, die Folgendes ent_halten:"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1276
 msgid "Subscribe to the selected folder"
 msgstr "Den gewählten Ordner abonnieren"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1277
 msgid "Su_bscribe"
 msgstr "A_bonnieren"
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Unsubscribe from the selected folder"
 msgstr "Den gewählten Ordner abbestellen"
 
-#: ../mail/em-subscription-editor.c:1286
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../mail/em-subscription-editor.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: ../mail/em-subscription-editor.c:1297
+#: ../mail/em-subscription-editor.c:1300
 msgid "Collapse all folders"
 msgstr "Alle Ordner einklappen"
 
-#: ../mail/em-subscription-editor.c:1298
+#: ../mail/em-subscription-editor.c:1301
 msgid "C_ollapse All"
 msgstr "Alle _einklappen"
 
-#: ../mail/em-subscription-editor.c:1308
+#: ../mail/em-subscription-editor.c:1311
 msgid "Expand all folders"
 msgstr "Alle Ordner aufklappen"
 
-#: ../mail/em-subscription-editor.c:1309
+#: ../mail/em-subscription-editor.c:1312
 msgid "E_xpand All"
 msgstr "Alle _aufklappen"
 
-#: ../mail/em-subscription-editor.c:1319
+#: ../mail/em-subscription-editor.c:1322
 msgid "Refresh the folder list"
 msgstr "Die Ordnerliste auffrischen"
 
-#: ../mail/em-subscription-editor.c:1331
+#: ../mail/em-subscription-editor.c:1334
 msgid "Stop the current operation"
 msgstr "Den momentan ausgeführten Vorgang abbrechen"
 
@@ -10070,23 +10084,23 @@ msgstr "Den momentan ausgeführten Vorgang abbrechen"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:102
+#: ../mail/em-utils.c:104
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Sind Sie sicher, dass Sie %d Nachricht auf einmal öffnen wollen?"
 msgstr[1] "Sind Sie sicher, dass Sie %d Nachrichten auf einmal öffnen wollen?"
 
-#: ../mail/em-utils.c:158
+#: ../mail/em-utils.c:160
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "Diese _Meldung nicht mehr anzeigen"
 
-#: ../mail/em-utils.c:333
+#: ../mail/em-utils.c:335
 msgid "Message Filters"
 msgstr "Nachrichtenfilter"
 
-#: ../mail/em-utils.c:918
+#: ../mail/em-utils.c:920
 #, c-format
 msgid "Messages from %s"
 msgstr "Nachrichten von %s"
@@ -10095,7 +10109,7 @@ msgstr "Nachrichten von %s"
 msgid "Search _Folders"
 msgstr "Such_ordner"
 
-#: ../mail/em-vfolder-rule.c:618
+#: ../mail/em-vfolder-rule.c:594
 msgid "Add Folder"
 msgstr "Ordner hinzufügen"
 
@@ -10160,8 +10174,8 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:15
 msgid ""
-"Asks whether to close the message window when the user forwards or replies "
-"to the message shown in the window"
+"Asks whether to close the message window when the user forwards or replies to "
+"the message shown in the window"
 msgstr ""
 "Nachfragen, ob das Nachrichtenfenster geschlossen werden soll, wenn die "
 "Nachricht im Nachrichtenfenster weitergeleitet oder beantwortet wird."
@@ -10207,15 +10221,11 @@ msgid "Composer Window default width"
 msgstr "Voreingestellte Breite des Editorfensters"
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
-
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Kürzen der Adressanzeige in den Empfängerfeldern (An/Kopie/Blindkopie)"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -10223,7 +10233,7 @@ msgstr ""
 "Die Anzeige der Adressen in den Empfängerfeldern (An/Kopie/Blindkopie) auf "
 "die im Schlüssel »address_count« angegebene Anzahl reduzieren."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10231,13 +10241,13 @@ msgstr ""
 "Legt fest, wie oft lokale Änderungen mit dem entfernen Mail-Server "
 "abgeglichen werden. Der Intervall muss mindestens 30 Sekunden betragen."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
 "genutzt werden."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10245,55 +10255,55 @@ msgstr ""
 "Benutzerdefinierte Kopfzeilen, die für die Prüfung auf Unerwünschtheit "
 "genutzt werden.Das Format ist »Kopfzeilenname=Wert« im GConf-Schlüssel."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to compose messages"
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages."
 msgstr "Vorgabe-Zeichensatz beim Verfassen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to display messages"
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages."
 msgstr "Vorgabe-Zeichensatz beim Anzeigen von Nachrichten."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default forward style"
 msgstr "Vorgabe-Weiterleitungsstil"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default height of the Composer Window."
 msgstr "Die voreingestellte Höhe des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the mail browser window."
 msgstr "Die voreingestellte Höhe des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default maximized state of the mail browser window."
 msgstr "Der vorgegebene Maximierungsstatus des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default reply style"
 msgstr "Vorgabe-Antwortstil"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default value for thread expand state"
 msgstr "Vorgabewert, ob Threads ausgeklappt angezeigt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default width of the Composer Window."
 msgstr "Die voreingestellte Breite des Editorfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the mail browser window."
 msgstr "Die voreingestellte Breite des Nachrichtenbrowserfensters."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
@@ -10301,7 +10311,7 @@ msgstr ""
 "Legt fest, ob Nachrichtenköpfe in der Zwei-Fenster-Ansicht standardmäßig "
 "ausgeklappt oder eingeklappt sein sollen. »0« = ausgeklappt »1« = eingeklappt"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10309,13 +10319,12 @@ msgstr ""
 "Legt fest, ob nur in lokalen Adressbüchern nach der E-Mail-Adresse des "
 "Absenders für das Filtern unerwünschter Nachrichten gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
-"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
-"wird"
+"Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht wird"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10324,111 +10333,111 @@ msgid ""
 msgstr ""
 "Legt fest, ob im Adressbuch nach der E-Mail-Adresse des Absenders gesucht "
 "wird. Falls die Adresse gefunden wird, so ist die E-Mail nicht unerwünscht. "
-"Es wird nur in Adressbüchern gesucht, die für Auto-Vervollständigung "
-"markiert sind. Diese Funktion kann langsam sein falls entfernte Adressbücher "
-"(wie LDAP) für die Auto-Vervollständigung aktiviert sind."
+"Es wird nur in Adressbüchern gesucht, die für Auto-Vervollständigung markiert "
+"sind. Diese Funktion kann langsam sein falls entfernte Adressbücher (wie "
+"LDAP) für die Auto-Vervollständigung aktiviert sind."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Unerwünscht-Prüfung "
 "benutzt werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
-"Determines whether to use custom headers to check for junk. If this option "
-"is enabled and the headers are mentioned, it will be improve the junk "
-"checking speed."
+"Determines whether to use custom headers to check for junk. If this option is "
+"enabled and the headers are mentioned, it will be improve the junk checking "
+"speed."
 msgstr ""
 "Legt fest, ob benutzerdefinierte Kopfzeilen für die Prüfung auf "
 "Unerwünschtheit benutzt werden sollen. Wenn diese Option aktiviert ist und "
 "eine angegebene Kopfzeile auftritt, so wird hierdurch die Prüfung auf "
 "Unerwünschtheit beschleunigt."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
-"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile in "
-"der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
-
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
+"Legt fest, ob die gleichen Schriften für die »Von«- und die »Betreff«-Zeile "
+"in der »Nachrichten«-Spalte der vertikalen Ansicht verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for saving mail component files."
 msgstr "Ordner zum Speichern der E-Mailkomponenten-Dateien."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Zu lange Ordnernamen in Seitenleiste abkürzen"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Display only message texts not exceeding certain size"
 msgstr ""
 "Nur Nachrichtentexte anzeigen, die eine bestimmte Größe nicht überschreiten"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Kein Signaturtrennzeichen hinzufügen"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Indikatoren für Rechtschreibfehler bei der Eingabe zeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty Junk folders on exit"
 msgstr "Unerwünscht-Ordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Trash folders on exit"
 msgstr "Müllordner beim Beenden leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Alle Unerwünscht-Ordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Alle Müllordner beim Beenden von Evolution leeren."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
-"Enable animated images in HTML mail. Many users find animated images "
-"annoying and prefer to see a static image instead."
+"Enable animated images in HTML mail. Many users find animated images annoying "
+"and prefer to see a static image instead."
 msgstr ""
 "Bewegte Bilder in HTML-Nachrichten einschalten. Viele Benutzer empfinden "
 "animierte Bilder als störend und bevorzugen, ein statisches Bild zu sehen."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
-"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor "
-"angezeigt wird."
+"Eingabezeiger aktivieren, so dass beim Lesen von E-Mails ein Cursor angezeigt "
+"wird."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable local folders"
+msgstr "Lokale Ordner aktivieren"
+
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "Magische Leertaste ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Die Anzeige beim Markieren mehrerer Nachrichten ein-/ausschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "Schnellsuche an- oder abschalten"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "Suchordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "Aktiviert die Suchordner beim Starten von Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10436,7 +10445,7 @@ msgstr ""
 "Die Suchfunktion in der Seitenleiste einschalten für die interaktive Suche "
 "nach Ordnernamen."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10444,7 +10453,7 @@ msgstr ""
 "Legt fest, ob die Leertaste zum Blättern in der Nachrichtenvorschau, der "
 "Nachrichtenliste und den Ordnern benutzt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10452,23 +10461,23 @@ msgstr ""
 "Nur Nachrichtentexte anzeigen, welche die im Schlüssel "
 "»message_text_part_limit« angegebene Größe nicht übersteigen."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Ähnliche Ansichten der Nachrichtenliste für alle Ordner aktivieren."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "Eingabezeiger aktivieren/deaktivieren"
 
-#: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Dateinamen wie Outlook und GMail kodieren"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10480,41 +10489,41 @@ msgstr ""
 "darstellen. Beide ignorieren den Standard RFC 2231 und benutzen den "
 "inkorrekten Standard RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "Nachrichtenausgang nach dem Filtern leeren"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Forward message."
 msgstr "Weitergeleitete Nachricht."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "Gruppenantwort wird an Mailingliste geleitet"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "Höhe des Nachrichtenlistenfelds"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "Höhe des Nachrichtenlistenfelds."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Deaktiviert das Vorschaufenster und entfernt die Auswahl"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"If a user tries to open 10 or more messages at one time, ask the user if "
-"they really want to do it."
+"If a user tries to open 10 or more messages at one time, ask the user if they "
+"really want to do it."
 msgstr ""
 "Wenn ein Benutzer versucht, 10 oder mehr Nachrichten auf einmal zu öffnen, "
 "wird er gefragt, ob er es wirklich tun will."
 
 # CHECK - etwas holprig
 # IMMER NOCH CHECK - aber schon etwas weniger holprig
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -10524,19 +10533,19 @@ msgstr ""
 "dieser Liste vorhandenen MIME-Typ gibt, so wird der Inhalt mit einem in der "
 "GNOME-MIME-Datenbank verknüpften Bonobo-Komponentenbetrachter angezeigt."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "»Antwort an« der Mailingliste ignorieren"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
-"Initial height of the \"Filter Editor\" window. The value updates as the "
-"user resizes the window vertically."
+"Initial height of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window vertically."
 msgstr ""
 "Legt fest, wie hoch das Fenster »Filtereditor« anfänglich ist. Der Wert "
 "ändert sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10544,7 +10553,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster »Ordnerabonnements« anfänglich ist. Der Wert "
 "ändert sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10552,7 +10561,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster »Editor für Suchordner« ist. Der Wert ändert "
 "sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10560,7 +10569,7 @@ msgstr ""
 "Legt fest, wie hoch das Fenster »E-Mails verschicken und abrufen« ist. Der "
 "Wert ändert sich, wenn der Benutzer das Fenster vertikal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10573,7 +10582,7 @@ msgstr ""
 "nicht maximiert werden kann. Dieser Schlüssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10586,7 +10595,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser Schlüssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10599,13 +10608,12 @@ msgstr ""
 "nicht maximiert werden kann. Dieser Schlüssel existiert nur als "
 "Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
-"particular value is not used by Evolution since the \"Send and Receive Mail"
-"\" window cannot be maximized. This key exists only as an implementation "
-"detail."
+"particular value is not used by Evolution since the \"Send and Receive Mail\" "
+"window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
 "Legt fest, ob das Fenster »E-Mails verschicken und abrufen« maximiert ist. "
 "Der Wert ändert sich, wenn der Benutzer das Fenster maximiert oder "
@@ -10613,7 +10621,7 @@ msgstr ""
 "verwendet, da das Fenster nicht maximiert werden kann. Dieser Schlüssel "
 "existiert nur als Implementierungsdetail."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10621,7 +10629,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster »Filtereditor« anfänglich ist. Der Wert "
 "ändert sich, wenn der Benutzer das Fenster horizontal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10629,7 +10637,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster »Ordnerabonnements« anfänglich ist. Der Wert "
 "ändert sich, wenn der Benutzer das Fenster horizontal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10637,7 +10645,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster »Editor für Suchordner« ist. Der Wert ändert "
 "sich, wenn der Benutzer das Fenster horizontal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10645,7 +10653,7 @@ msgstr ""
 "Legt fest, wie breit des Fenster »E-Mails verschicken und empfangen« ist. Der "
 "Wert ändert sich, wenn der Benutzer das Fenster horizontal vergrößert."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10656,17 +10664,17 @@ msgstr ""
 "Werkzeugleistenknopf »Antwort an Gruppe« eine Antwort nur an die Mailingliste "
 "aus, über die Sie die Nachricht erhalten haben, auf die Sie antworten wollen."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
 "Legt fest, ob der Benutzer gewarnt werden soll, dass das Löschen einer "
-"Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur "
-"aus den Suchergebnissen entfernt."
+"Nachricht in einem Suchordner die Nachricht wirklich löscht und nicht nur aus "
+"den Suchergebnissen entfernt."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10675,15 +10683,15 @@ msgstr ""
 "private Antwort auf eine Nachricht versendet, die über eine Mailingliste "
 "eingegangen ist."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
-"It disables/enables the repeated prompts to warn that you are sending a "
-"reply to many people."
+"It disables/enables the repeated prompts to warn that you are sending a reply "
+"to many people."
 msgstr ""
 "Legt fest, ob der Benutzer wiederholt gewarnt werden soll, dass er eine "
 "Anwort an viele Personen versendet."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10694,7 +10702,7 @@ msgstr ""
 "Nachricht an den privaten Absender antworten wollen, aber die »Antwort an«-"
 "Kopfzeile die Antwort normalerweise an die Mailingliste leiten würde."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10703,43 +10711,43 @@ msgstr ""
 "Nachricht an Empfänger versendet, deren Adresse nicht als E-Mail-Adresse "
 "angegeben wurde"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "Letzte Leerung des Unerwünscht-Ordners"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "Letzte Müllleerung"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "Anordnung"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Protokolltyp, ab welchem die Nachricht protokolliert werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und damit assoziierter Farben"
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentenbetrachter hin überprüft "
 "werden sollen"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "Liste akzeptierter Lizenzen"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "Kontenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10748,192 +10756,192 @@ msgstr ""
 "enthält Zeichenketten, die Unterordner relativ zu »/apps«/evolution/mail/"
 "accounts« angeben."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Liste der Sprach-Codes der Wörterbücher, die für die Rechtschreibprüfung "
 "verwendet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:113
 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 ""
-"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. "
-"Die Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als "
-"HTML-Hextriplet anzugeben ist."
+"Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. Die "
+"Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als HTML-"
+"Hextriplet anzugeben ist."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "Liste der Protokollnamen, deren Lizenzen akzeptiert wurden."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "Bilder für HTML-Nachrichten per HTTP laden"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
-"Never load images off the net. \"1\" - Load images in messages from "
-"contacts. \"2\" - Always load images off the net."
+"Never load images off the net. \"1\" - Load images in messages from contacts. "
+"\"2\" - Always load images off the net."
 msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Mögliche Werte sind: »0« - "
 "Niemals Bilder aus dem Netz laden, »1« - Bilder laden falls Absender im "
 "Adressbuch, »2« - Immer Bilder aus dem Netz laden."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "Höhe des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "Nachrichtenbrowser ist maximiert"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "Breite des Nachrichtenbrowsers"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kennzeichnen."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "Anzeigebegrenzung des Nachrichtentexts"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 "Minimale Anzahl der Tage zwischen dem Leeren des Unerwünscht-Ordners beim "
 "Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimale Anzahl der Tage zwischen dem Leeren des Mülls beim Beenden."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 "Anzahl der Adressen, die in den Empfängerfeldern (An/Kopie/Blindkopie"
 "( angezeigt werden"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "Ursprüngliche Nachricht."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Path where picture gallery should search for its content"
 msgstr "Pfad, den die Bildergalerie nach Inhalten durchsuchen soll"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
-"Possible values are: never - to never close browser window always - to "
-"always close browser window ask - (or any other value) will ask user"
+"Possible values are: never - to never close browser window always - to always "
+"close browser window ask - (or any other value) will ask user"
 msgstr ""
 "Mögliche Werte sind: »never«, um das Browserfenster niemals zu schließen, "
 "»always«, um das Browserfenster immer zu schließen. Ein anderer Wert führt "
 "dazu, dass der Benutzer jedes Mal um Bestätigung gebeten wird."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Nachfragen, wenn Empfänger nicht als E-Mail-Adresse angegeben wurden"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "Nachfrage beim Löschen von Nachrichten in Suchordner"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
 "Nachfragen, wenn Mailinglisten versuchen private Antworten an die Liste "
 "umzuleiten"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "Bei privater Antwort auf Listennachrichten nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "Beim Antworten an viele Empfänger nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern nachfragen"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Vor gleichzeitigem Öffnen von 10 oder mehr Nachrichten einen Hinweis anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -10941,65 +10949,64 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld nachfragen."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
-"Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
-"verschicken"
+"Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu verschicken"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "Anzeigen wenn mehrere Nachrichten markiert werden"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "Beim Antworten eigene Signaturen an den Anfang stellen"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "Beim Antworten auf Mails unten mit dem Schreiben beginnen"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Emoticons im Text erkennen und durch Bilder ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "Ordner speichern"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "In den lokalen Adressbüchern nach dem Foto des Absenders suchen"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "Spalte mit der E-Mail-Adresse des Absenders in der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "Intervall für Datenabgleich mit Servern"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -11007,67 +11014,67 @@ msgstr ""
 "Setzen Sie dies auf »wahr«, wenn Sie kein beim Verfassen von Nachrichten kein "
 "Signaturtrennzeichen vor Ihre Signatur setzen wollen."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Das Feld »Blindkopie an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Das Feld »Kopie an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 "Das Feld »Von« beim Verfassen einer Nachricht an eine Newsgroup anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 "Das Feld »Antwort an« beim Verfassen einer Nachricht an eine Newsgroup "
 "anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Das Feld »Antwort an« beim Verfassen einer Nachricht anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "Animationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "Alle Nachrichtenköpfe anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "Beim Anzeigen von Nachrichten alle Nachrichtenköpfe anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "Animierte Bilder als Animationen anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 "Gelöschte Nachrichten (durchgestrichen) in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "Gelöschte Nachrichten in der Nachrichtenliste anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "Bildanimationen anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Den originalen Wert der Kopfzeile »Datum« anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "Foto des Absenders anzeigen"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11075,7 +11082,7 @@ msgstr ""
 "Das Feld »Blindkopie an« beim Verfassen einer Nachricht anzeigen. Die "
 "Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -11083,7 +11090,7 @@ msgstr ""
 "Das Feld »Kopie an« beim Verfassen einer Nachricht anzeigen. Die Einstellung "
 "kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -11091,7 +11098,7 @@ msgstr ""
 "Das Feld »Von« beim Verfassen einer Nachricht an eine Newsgroup anzeigen. Die "
 "Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11100,7 +11107,7 @@ msgstr ""
 "anzeigen. Die Einstellung kann im Menü »Ansicht« beim Verfassen angepasst "
 "werden."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11108,15 +11115,14 @@ msgstr ""
 "Das Feld »Antwort an« beim Verfassen einer Nachricht anzeigen. Die "
 "Einstellung kann im Menü »Ansicht« beim Verfassen angepasst werden."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
-"Show the email-address of the sender in a separate column in the message "
-"list."
+"Show the email-address of the sender in a separate column in the message list."
 msgstr ""
 "Zeigt die E-Mail-Adresse des Absenders in einer eigenen Spalte in der "
 "Nachrichtenliste an."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11127,19 +11133,19 @@ msgstr ""
 "Kopfzeile »Datum« in einem benutzerdefinierten Format und der lokalen "
 "Zeitzone dargestellt."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Fotos des Absenders in der Nachrichtenvorschau anzeigen."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
-"Some mailing lists set a Reply-To: header to trick users into sending "
-"replies to the list, even when they ask Evolution to make a private reply. "
-"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
-"so that Evolution will do as you ask it. If you use the private reply "
-"action, it will reply privately, while if you use the 'Reply to List' action "
-"it will do that. It works by comparing the Reply-To: header with a List-"
-"Post: header, if there is one."
+"Some mailing lists set a Reply-To: header to trick users into sending replies "
+"to the list, even when they ask Evolution to make a private reply. Setting "
+"this option to TRUE will attempt to ignore such Reply-To: headers, so that "
+"Evolution will do as you ask it. If you use the private reply action, it will "
+"reply privately, while if you use the 'Reply to List' action it will do that. "
+"It works by comparing the Reply-To: header with a List-Post: header, if there "
+"is one."
 msgstr ""
 "Einige Mailinglisten legen eine »Antwort an«-Kopfzeile fest, damit Benutzer "
 "ihre Antworten an die Liste senden, auch wenn Sie Evolution anweisen, eine "
@@ -11150,6 +11156,10 @@ msgstr ""
 "Geregelt wird dieses Verhalten durch Vergleichen der Kopfzeilenfelder "
 "»Antwort an« und »Antwort an Liste«, sofern letzteres vorhanden ist."
 
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Konten alphabetisch in einem Ordnerbau sortieren"
+
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
@@ -11167,26 +11177,38 @@ msgid "State of message headers in paned view"
 msgstr "Status von Nachrichtenköpfen in Zwei-Fenster-Ansicht"
 
 #: ../mail/evolution-mail.schemas.in.h:193
+msgid ""
+"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
+"true accounts are sorted alphabetically, with an exception of On This "
+"Computer and Search folders, otherwise accounts are sorted based on an order "
+"given by a user."
+msgstr ""
+"Legt fest, wie Konten in der Nachrichtenansicht in einem Ordnerbaum angezeigt "
+"werden. Wenn aktiviert, werden Konten alphabetisch sortiert, mit Ausnahme von "
+"»Auf diesem Rechner« und »Suchordner«, anderenfalls werden Konten nach einer "
+"vom Benutzer angegebenen Reihenfolge sortiert."
+
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Terminal font"
 msgstr "Terminal-Schrift"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "The default plugin for Junk hook"
 msgstr "Vorgabe-Plugin für die Unerwünscht-Erkennung"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Die Zeit seit der letzten Unerwünscht-Ordner-Leerung in Tagen seit dem "
 "01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Die Zeit seit der letzten Müllleerung in Tagen seit dem 01.01.1970."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11198,20 +11220,20 @@ msgstr ""
 "Vorschauleiste unter die Nachrichtenliste. »1« (vertikale Ansicht) setzt die "
 "Vorschauleiste neben die Nachrichtenliste. "
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "The terminal font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Terminal-Schrift."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
-"Text, der beim Weiterleiten einer E-Mail eingefügt wird, der darauf "
-"hinweist, dass die weitergeleitete E-Mail folgt."
+"Text, der beim Weiterleiten einer E-Mail eingefügt wird, der darauf hinweist, "
+"dass die weitergeleitete E-Mail folgt."
 
 # Was soll hier top-posting sein?
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11219,19 +11241,19 @@ msgstr ""
 "Text, der beim Antworten auf eine Nachricht eingefügt wird, der darauf "
 "hinweist, dass die ursprüngliche Nachricht folgt."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
-"The text that is inserted when replying to a message, attributing the "
-"message to the original author."
+"The text that is inserted when replying to a message, attributing the message "
+"to the original author."
 msgstr ""
 "Text, der beim Antworten auf eine Nachricht eingefügt wird, der die Nchricht "
 "dem ursprünglichen Autor zuordnet."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "The variable width font for mail display."
 msgstr "Die zum Anzeigen von E-Mails verwendete Schrift variabler Breite."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11239,27 +11261,27 @@ msgstr ""
 "Hier sind drei verschiedene Werte möglich: »0« für Fehler, »1« für Warnungen, "
 "»2« für Diagnosemeldungen."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value is "
+"used only when 'force_message_limit' key is activated."
 msgstr ""
 "Dies bestimmt die maximale Größe des Textteils, der von Evolution formatiert "
-"wird, angegeben in kB. Die Vorgabe sind 4MB/4096kB. Dieser Wert wird nur "
-"dann verwendet, wenn der Schlüssel »force_message_limit« aktiviert ist."
+"wird, angegeben in kB. Die Vorgabe sind 4MB/4096kB. Dieser Wert wird nur dann "
+"verwendet, wenn der Schlüssel »force_message_limit« aktiviert ist."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it won't fall back "
-"to the other available plugins."
+"enabled. If the default listed plugin is disabled, then it won't fall back to "
+"the other available plugins."
 msgstr ""
-"Dies ist das Vorgabe-Unerwünscht-Plugin, auch falls mehrere Plugins "
-"aktiviert sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, "
-"so wird nicht auf eines der anderen Plugins zurückgegriffen."
+"Dies ist das Vorgabe-Unerwünscht-Plugin, auch falls mehrere Plugins aktiviert "
+"sind. Falls das als Vorgabe aufgelistete Plugin deaktiviert ist, so wird "
+"nicht auf eines der anderen Plugins zurückgegriffen."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11270,33 +11292,33 @@ msgstr ""
 "Nachrichtenliste gesetzt."
 
 # CHECK
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:208
 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."
+"header enabled&gt; - set enabled if the header is to be displayed in the mail "
+"view."
 msgstr ""
 "Dieser Schlüssel enthält eine Liste von XML-Strukturen, die "
 "benutzerdefinierte Kopfzeilen angeben, und ob diese angezeigt werden sollen. "
 "Das XML-Strukturformat ist &lt;Kopfzeile aktiviert&gt; - setzen Sie "
 "aktiviert, falls die Kopfzeile in der E-Mail-Ansicht angezeigt werden soll."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid ""
-"This option is related to the key lookup_addressbook and is used to "
-"determine whether to look up addresses in local address book only to exclude "
-"mail sent by known contacts from junk filtering."
+"This option is related to the key lookup_addressbook and is used to determine "
+"whether to look up addresses in local address book only to exclude mail sent "
+"by known contacts from junk filtering."
 msgstr ""
 "Diese Option bezieht sich auf den Schlüssel »lookup_addressbook« und legt "
 "fest, ob Adressen im lokalen Adressbuch gesucht werden um sicherzustellen, "
 "dass E-Mails von Bekannten nicht als unerwünscht markiert werden."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "This option would help in improving the speed of fetching."
 msgstr "Beschleunigt das Abrufen."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11304,16 +11326,15 @@ msgstr ""
 "Dies setzt die Anzahl der Adressen, die in der Standardansicht angezeigt "
 "werden, bevor »…« angezeigt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
-"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Requires a restart to apply."
+"This setting specifies whether the threads should be in expanded or collapsed "
+"state by default. Requires a restart to apply."
 msgstr ""
 "Legt fest, ob Threads standardmäßig ausgeklappt oder eingeklappt dargestellt "
-"werden sollen. Evolution muss zur Umsetzung der Änderung neu gestartet "
-"werden."
+"werden sollen. Evolution muss zur Umsetzung der Änderung neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11323,45 +11344,45 @@ msgstr ""
 "werden sollen anstatt nach dem Datum der Nachricht. Evolution muss nach "
 "Ändern dieses Wertes hierfür neu gestartet werden."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
-"folder, usually set to ~/Pictures. This folder will be also used when the "
-"set path is not pointing to the existent folder."
+"folder, usually set to ~/Pictures. This folder will be also used when the set "
+"path is not pointing to the existent folder."
 msgstr ""
 "Dieser Wert kann eine leere Zeichenkette sein. In diesem Fall wird der "
 "Systemordner für Bilder (üblicherweise ~/Bilder) verwendet. Dieser Ordner "
 "wird ebenfalls verwendet, wenn ein nicht-existierender Ordner angegeben wird."
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Thread the message-list based on Subject"
 msgstr "Die Nachrichtenliste themenbasiert nach Threads sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen"
 msgstr "Intervall zum Markieren von Nachrichten als gelesen"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Timeout for marking message as seen."
 msgstr "Intervall zum Markieren von Nachrichten als gelesen."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "UID string of the default account."
 msgstr "UID-Zeichenkette für das Vorgabekonto."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Farbe für falsch geschriebene Wörter während der Eingabe"
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts"
 msgstr "Benutzerdefinierte Schriften verwenden"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts for displaying mail."
 msgstr "Benutzerdefinierte Schriften zum Anzeigen von E-Mails verwenden."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11371,27 +11392,27 @@ msgstr ""
 "platziert werden soll. Dies legt fest, ob die Marke zu Beginn oder am Ende "
 "der Nachricht platziert wird."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
-"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort "
-"platziert werden soll. Dies legt fest, ob die Signatur zu Beginn oder am "
-"Ende der Nachricht platziert wird."
+"Benutzer streiten sich wo die Signatur beim Verfassen einer Antwort platziert "
+"werden soll. Dies legt fest, ob die Signatur zu Beginn oder am Ende der "
+"Nachricht platziert wird."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Variable width font"
 msgstr "Schrift variabler Breite"
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Legt fest, ob die Anforderung einer Lesebestätigung standardmäßig zu jeder "
 "Nachricht hinzugefügt wird."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11402,7 +11423,7 @@ msgstr ""
 "Mails sehen alle X Minuten«-Einstellungen. Diese Option wird nur in "
 "Verbindung mit »send_recv_on_start« verwendet."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11411,39 +11432,45 @@ msgstr ""
 "gestartet wird. Dies beinhaltet das Versenden von E-Mails aus dem "
 "Nachrichtenausgang."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Legt fest, ob zu lange Ordnernamen in der Seitenleiste abgekürzt werden."
 
 # CHECK - etwas schluderig, kommt aber hoffentlich hin.
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
-"Whether or not to fall back on threading by subjects when the messages do "
-"not contain In-Reply-To or References headers."
+"Whether or not to fall back on threading by subjects when the messages do not "
+"contain In-Reply-To or References headers."
 msgstr ""
 "Auf Betreffbasis auf die Thread-Ordnung zurückgreifen, falls die Kopfzeilen "
 "einer Nachricht auf keine Referenznachricht verweisen."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Threads nach der letzten Nachricht im jeweiligen Thread sortieren"
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
-"only when there was used any 'Forward to' filter action and approximately "
-"one minute after the last action invocation."
+"only when there was used any 'Forward to' filter action and approximately one "
+"minute after the last action invocation."
 msgstr ""
 "Legt fest. ob der Nachrichtenausgang nach dem Filtern geleert werden soll. "
 "Das geschieht nur, wenn ein »Weiterleiten an«-Filtervorgang angewendet wurde, "
 "etwa eine Minute nach der letzten Aktion."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr ""
+"Legt fest, ob lokale Ordner (Auf diesem Rechner) in einem Ordnerbaum "
+"angezeigt werden sollen."
+
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "Breite der Nachrichtenliste"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "Breite der Nachrichtenliste."
 
@@ -11472,13 +11499,13 @@ msgstr "Zielor_dner:"
 
 #: ../mail/importers/evolution-mbox-importer.c:145
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:460
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "Select folder"
 msgstr "Ordner wählen"
 
 #: ../mail/importers/evolution-mbox-importer.c:146
 #: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:461
+#: ../plugins/pst-import/pst-importer.c:463
 msgid "Select folder to import into"
 msgstr "Wählen Sie den Ordner, in den importiert werden soll"
 
@@ -11492,8 +11519,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "Von"
 
-#: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
+#: ../mail/importers/evolution-mbox-importer.c:482 ../shell/e-shell-utils.c:187
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley Mailbox (mbox)"
 
@@ -11508,7 +11534,7 @@ msgstr "E-Mail-Postfach wird importiert"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:610
-#: ../plugins/pst-import/pst-importer.c:648
+#: ../plugins/pst-import/pst-importer.c:663
 #, c-format
 msgid "Importing '%s'"
 msgstr "»%s« wird importiert"
@@ -11523,7 +11549,7 @@ msgid "Importing Pine data"
 msgstr "Pine-Daten werden importiert"
 
 #: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
+#: ../modules/addressbook/addressbook-config.c:1078
 msgid "Address Book"
 msgstr "Adressbuch"
 
@@ -11633,8 +11659,7 @@ msgstr "_Lesebestätigung immer anfordern"
 msgid "Apply the same _view settings to all folders"
 msgstr "Ansichts_einstellungen auf alle Ordner anwenden"
 
-#: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
+#: ../mail/mail-config.ui.h:15 ../modules/addressbook/addressbook-config.c:1085
 msgid "Authentication"
 msgstr "Legitimation"
 
@@ -11687,7 +11712,7 @@ msgid "Composing Messages"
 msgstr "Verfassen von Nachrichten"
 
 #: ../mail/mail-config.ui.h:28
-#: ../modules/plugin-manager/evolution-plugin-manager.c:161
+#: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
 msgstr "Konfiguration"
 
@@ -11931,150 +11956,154 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:94
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS-Proxy:"
+
+#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL-Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL wird von dieser Erstellung von Evolution nicht unterstützt"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_earch for sender photograph only in local address books"
 msgstr "_Nach Foto des Absenders nur in lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_elect..."
 msgstr "A_uswählen …"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_end message receipts:"
 msgstr "Lese_bestätigungen verschicken:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "Secure MIME (S/MIME)"
 msgstr "Sicheres MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "HTML-Proportionalschrift wählen"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Sender Photograph"
 msgstr "Foto des Absenders"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a _private reply to a mailing list message"
 msgstr "_Private Antwort auf eine Listennachricht senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Nachricht mit Empfängern senden, die nicht als E-Mail-Ad_resse angegeben "
 "wurden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a message with an _empty subject line"
 msgstr "Nachrichten mit _leerem Betreff senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Nachricht mit ausschließlich _Blindkopie-Empfängern senden"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Antwort an zahlreiche Empfänger se_nden"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Serverkonfiguration"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_Server-Art:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Set custom junk header"
 msgstr "Benutzerdefinierte Unerwünscht-Kopfzeile hinzufügen"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:121
 msgid "Si_gning algorithm:"
 msgstr "Si_gnaturalgorithmus:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_natures"
 msgstr "Sig_naturen"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid "Sig_ning certificate:"
 msgstr "Signatur_zertifikat:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid "Signat_ure:"
 msgstr "_Signatur:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:125
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:126
 msgid "Signing _algorithm:"
 msgstr "Signatur_algorithmus:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid "Special Folders"
 msgstr "Spezielle Ordner"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:128
 msgid "Spell Checking"
 msgstr "Rechtschreibprüfung"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Start _typing at the bottom on replying"
 msgstr "Beim Antworten auf Mails _unten mit dem Schreiben beginnen"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Start up"
 msgstr "Startvorgang"
 
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS-Verschlüsselung"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"Diese Sprachliste enthält ausschließlich die Sprachen, für die ein "
-"Wörterbuch installiert sind."
+"Diese Sprachliste enthält ausschließlich die Sprachen, für die ein Wörterbuch "
+"installiert sind."
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12084,15 +12113,15 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zur Anzeige verwendet."
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid ""
-"To help avoid email accidents and embarrassments, ask for confirmation "
-"before taking the following checkmarked actions:"
+"To help avoid email accidents and embarrassments, ask for confirmation before "
+"taking the following checkmarked actions:"
 msgstr ""
 "Um Ärgernisse und ungewollte Ergebnisse zu vermeiden, bei folgenden "
 "markierten Aktionen um Bestätigung nachfragen:"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12100,139 +12129,139 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Geschäftlich« oder »Persönlich«."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "Us_ername:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "Use Authe_ntication"
 msgstr "_Legitimation benutzen"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "User _Name:"
 msgstr "_Benutzername:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Authentication Type"
 msgstr "_Legitimationsart"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Direkte Internetverbindung"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "_Unerwünscht-Ordner:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "Signat_ur beim Antworten über der Original-Nachricht behalten"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "_Sprachen"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "Bilder nur in Nachrichten von Kontakten _laden"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "Nur in _lokalen Adressbüchern suchen"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "_Manuelle Proxy-Konfiguration:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Internet laden"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "_Nachfrage beim Abschicken von HTML-Nachrichten an Kontakte, die dies nicht "
 "wünschen"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "_Sicherer HTTP-Proxy:"
 
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Server:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Foto des Absenders in der Nachrichtenvorschau anzeigen"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "M_üllordner:"
 
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Sichere Verbindung verwenden:"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "Farbe"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "Beschreibung"
 
@@ -12314,8 +12343,7 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"Dies ist eine Liste der von Ihnen als Folgenachricht markierten "
-"Nachrichten.\n"
+"Dies ist eine Liste der von Ihnen als Folgenachricht markierten Nachrichten.\n"
 "Bitte wählen Sie eine Aktion für die Folgenachricht aus dem Menü »Markierung«."
 
 #: ../mail/mail-dialogs.ui.h:25
@@ -12339,73 +12367,73 @@ msgstr "Ha_ken Sie dies ab, um die Lizenzvereinbarung zu akzeptieren"
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: ../mail/mail-ops.c:85
+#: ../mail/mail-ops.c:86
 msgid "Filtering Selected Messages"
 msgstr "Gewählte Nachrichten filtern"
 
-#: ../mail/mail-ops.c:205
+#: ../mail/mail-ops.c:206
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: ../mail/mail-ops.c:821
+#: ../mail/mail-ops.c:843
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:891
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d von %d Nachrichten konnten nicht verschickt werden"
 
-#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:837
+#: ../mail/mail-ops.c:895 ../mail/mail-send-recv.c:840
 msgid "Canceled."
 msgstr "Abgebrochen."
 
-#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:839
+#: ../mail/mail-ops.c:897 ../mail/mail-send-recv.c:842
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:1012
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Nachrichten werden nach »%s« verschoben"
 
-#: ../mail/mail-ops.c:986
+#: ../mail/mail-ops.c:1013
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Nachrichten werden nach »%s« kopiert"
 
-#: ../mail/mail-ops.c:1104
+#: ../mail/mail-ops.c:1131
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1179
+#: ../mail/mail-ops.c:1206
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Konto »%s« wird gesäubert und gespeichert"
 
-#: ../mail/mail-ops.c:1180
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto »%s« wird gespeichert"
 
-#: ../mail/mail-ops.c:1242
+#: ../mail/mail-ops.c:1269
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ordner »%s« wird aufgefrischt"
 
-#: ../mail/mail-ops.c:1432
+#: ../mail/mail-ops.c:1459
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ordner »%s« wird gesäubert"
 
-#: ../mail/mail-ops.c:1517
+#: ../mail/mail-ops.c:1544
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: ../mail/mail-ops.c:1619
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Disconnecting %s"
 msgstr "»%s« wird getrennt"
@@ -12422,7 +12450,7 @@ msgstr "E-Mails verschicken und abrufen"
 msgid "Cancel _All"
 msgstr "A_lles abbrechen"
 
-#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:979
+#: ../mail/mail-send-recv.c:596 ../mail/mail-send-recv.c:988
 msgid "Updating..."
 msgstr "Aktualisieren …"
 
@@ -12430,7 +12458,7 @@ msgstr "Aktualisieren …"
 msgid "Waiting..."
 msgstr "Warten …"
 
-#: ../mail/mail-send-recv.c:959
+#: ../mail/mail-send-recv.c:967
 #, c-format
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
@@ -12472,8 +12500,7 @@ msgstr "Suchordner für »%s« werden aktualisiert: %s"
 #: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
-"The Search Folder \"%s\" has been modified to account for the deleted "
-"folder\n"
+"The Search Folder \"%s\" has been modified to account for the deleted folder\n"
 "\"%s\"."
 msgid_plural ""
 "The following Search Folders\n"
@@ -12791,8 +12818,7 @@ msgstr "Das lokale Nachrichtenformat von Evolution wurde geändert."
 
 #: ../mail/mail.error.xml.h:63
 msgid "Failed to download messages for offline viewing."
-msgstr ""
-"Nachrichten konnten nicht für Offline-Benutzung heruntergeladen werden."
+msgstr "Nachrichten konnten nicht für Offline-Benutzung heruntergeladen werden."
 
 #: ../mail/mail.error.xml.h:64
 msgid "Failed to find duplicate messages."
@@ -12839,12 +12865,16 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Der Ordner »{0}« enthält keine doppelten Nachrichten."
 
 #: ../mail/mail.error.xml.h:75
+msgid "Hidden file is attached."
+msgstr "Eine verborgene Datei wurde beigelegt."
+
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12852,18 +12882,17 @@ msgstr ""
 "Falls Sie einen Ordner löschen, geht sein gesamter Inhalt sowie der Inhalt "
 "seiner Unterordner dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr ""
 "Falls Sie einen Ordner löschen, geht sein gesamter Inhalt dauerhaft verloren."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr ""
-"Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht."
+msgstr "Falls Sie fortfahren, werden alle Vertretungskonten dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12871,40 +12900,39 @@ msgstr ""
 "Falls Sie fortfahren, werden die Konten- und\n"
 "Vertretungsinformationen dauerhaft gelöscht."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 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:82
+#: ../mail/mail.error.xml.h:83
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"If you quit, these messages will not be sent until Evolution is started again."
 msgstr ""
 "Falls Sie Evolution beenden, werden diese Nachrichten nicht verschickt, "
 "solange Evolution nicht neu gestartet wurde."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Invalid authentication"
 msgstr "Legitimation ungültig"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail Deletion Failed"
 msgstr "Löschen der E-Mail gescheitert"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Mail filters automatically updated."
 msgstr "E-Mail-Filter automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 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: "
+"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 ""
 "Viele E-Mail-Systeme fügen eine »Apparently-To«-Kopfzeile zu Nachrichten "
@@ -12913,60 +12941,59 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"Die in Suchordnern angezeigten Nachrichten sind keine Kopien. Das Löschen "
-"von Nachrichten in Suchordnern löscht diese in den jeweiligen "
-"Nachrichtenordnern, in denen sich diese Nachrichten physikalisch befinden. "
-"Möchten Sie wirklich löschen?"
+"Die in Suchordnern angezeigten Nachrichten sind keine Kopien. Das Löschen von "
+"Nachrichten in Suchordnern löscht diese in den jeweiligen Nachrichtenordnern, "
+"in denen sich diese Nachrichten physikalisch befinden. Möchten Sie wirklich "
+"löschen?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Missing folder."
 msgstr "Ordner fehlt."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "N_ever"
 msgstr "Ni_e"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No duplicate messages found."
 msgstr "Keine doppelten Nachrichten gefunden."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "No sources selected."
 msgstr "Keine Quellen gewählt."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 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:95
+#: ../mail/mail.error.xml.h:96
 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:96
+#: ../mail/mail.error.xml.h:97
 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:97
+#: ../mail/mail.error.xml.h:98
 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."
+"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 ""
-"Bitte geben Sie eine gültige E-Mail-Adresse im An-Feld ein. Sie können nach "
-"E-Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld "
-"anklicken."
+"Bitte geben Sie eine gültige E-Mail-Adresse im An-Feld ein. Sie können nach E-"
+"Mail-Adressen suchen, indem Sie den An-Knopf neben dem Eingabefeld anklicken."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12977,80 +13004,87 @@ msgstr ""
 "{0}\n"
 "Dennoch abschicken?"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 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:101
+#: ../mail/mail.error.xml.h:102
 msgid "Please wait."
 msgstr "Bitte warten."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Probleme beim Migrieren des alten E-Mail-Ordners »{0}«."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 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:104
+#: ../mail/mail.error.xml.h:105
 msgid "Read receipt requested."
 msgstr "Lesebestätigung angefordert."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ordner »{0}« und alle seine Unterordner wirklich löschen?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Really delete folder \"{0}\"?"
 msgstr "Soll der Ordner »{0}« wirklich gelöscht werden?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Remove duplicate messages?"
 msgstr "Sollen die doppelten Nachrichten entfernt werden?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid "Reply _Privately"
 msgstr "_Privat antworten"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Search Folders automatically updated."
 msgstr "Suchordner automatisch aktualisiert."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send private reply?"
 msgstr "Private Antwort senden?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Send reply to all recipients?"
 msgstr "Antwort an alle Empfänger senden?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Signature Already Exists"
 msgstr "Signatur existiert bereits"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ordner lokal für Offline-Benutzung abgleichen?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
-"System folders are required for Evolution to function correctly and cannot "
-"be renamed, moved, or deleted."
+"System folders are required for Evolution to function correctly and cannot be "
+"renamed, moved, or deleted."
 msgstr ""
 "Evolution benötigt Systemordner, um korrekt zu funktionieren. Diese können "
 "weder umbenannt, noch verschoben oder gelöscht werden."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"Die Anlage namens {0} ist eine verborgene Datei und könnte sensible Daten "
+"enthalten. Bitte überprüfen Sie sie vor dem Abschicken."
+
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
+"Many email systems add an Apparently-To header to messages that only have BCC "
+"recipients. This header, if added, will list all of your recipients in your "
+"message. To avoid this, you should add at least one To: or CC: recipient. "
 msgstr ""
 "Die zu verschickende Kontaktliste ist so konfiguriert, dass Listenempfänger "
 "verborgen werden.\n"
@@ -13061,7 +13095,7 @@ msgstr ""
 "Um dies zu umgehen, sollten Sie mindestens einen »An:«- oder »Kopie an:-"
 "Empfänger hinzufügen.«"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13069,7 +13103,7 @@ msgstr ""
 "Der folgende Empfänger wurden als ungültige E-Mail-Adresse erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13077,15 +13111,15 @@ msgstr ""
 "Die folgenden Empfänger wurden als ungültige E-Mail-Adressen erkannt:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "The script file must exist and be executable."
 msgstr "Die Skriptdatei muss existieren und ausführbar sein."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "These messages are not copies."
 msgstr "Diese Nachrichten sind keine Kopien."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13093,22 +13127,22 @@ 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:129
+#: ../mail/mail.error.xml.h:131
 msgid ""
-"This message cannot be sent because the account you chose to send with is "
-"not enabled"
+"This message cannot be sent because the account you chose to send with is not "
+"enabled"
 msgstr ""
 "Diese Nachricht konnte nicht verschickt werden, da das zum Verschicken "
 "gewählte Konto nicht aktiviert ist"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 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:131
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13116,27 +13150,26 @@ msgstr ""
 "Dieser Server unterstützt diese Art der Legitimation nicht. Möglicherweise "
 "unterstützt er keinerlei Legitimation."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 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:133
+#: ../mail/mail.error.xml.h:135
 msgid ""
-"This will mark all messages as read in the selected folder and its "
-"subfolders."
+"This will mark all messages as read in the selected folder and its subfolders."
 msgstr ""
 "Dies wird alle Nachrichten im gewählten Ordner und seinen Unterordnern als "
 "gelesen markieren."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Dies wird alle Nachrichten im gewählten Ordner als gelesen markieren."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to connect to the GroupWise server."
 msgstr "Verbindungsaufbau zum GroupWise-Server gescheitert."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13144,37 +13177,37 @@ msgstr ""
 "Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden. Soll "
 "stattdessen der System-Entwurfsordner verwendet werden?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "Unable to read license file."
 msgstr "Die Lizenzdatei konnte nicht gelesen werden."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
 msgid "Unable to retrieve message."
 msgstr "Nachricht konnte nicht abgerufen werden."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "Use _Default"
 msgstr "_Vorgabe benutzen"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "Use default drafts folder?"
 msgstr "Soll der vorgegebene Entwurfsordner benutzt werden?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:143
 msgid "Would you like to close the message window?"
 msgstr "Wollen Sie das Nachrichtenfenster schließen?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
 msgid ""
-"You are replying privately to a message which arrived via a mailing list, "
-"but the list is trying to redirect your reply to go back to the list. Are "
-"you sure you want to proceed?"
+"You are replying privately to a message which arrived via a mailing list, but "
+"the list is trying to redirect your reply to go back to the list. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Sie antworten privat auf eine Nachricht, die Sie über eine Mailingliste "
 "erhalten haben. Die Liste versucht jedoch, Ihre Antwort direkt an die Liste "
 "zu leiten. Wollen Sie wirklich fortsetzen?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:145
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13184,42 +13217,41 @@ msgstr ""
 "aber Sie antworten an den privaten Absender, nicht an die Liste. Wollen Sie "
 "wirklich fortsetzen?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:146
 msgid ""
-"You are replying to a message which was sent to many recipients. Are you "
-"sure you want to reply to ALL of them?"
+"You are replying to a message which was sent to many recipients. Are you sure "
+"you want to reply to ALL of them?"
 msgstr ""
 "Sie antworten auf eine Nachricht, die an viele Empfänger versendet wurde. "
 "Sind Sie sicher, dass Sie an ALLE antworten wollen?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Sie haben keine ausreichenden Rechte, um diese E-Mail zu löschen."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:148
 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:147
+#: ../mail/mail.error.xml.h:149
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
-"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch "
-"beenden?"
+"Es existieren unverschickte Nachrichten. Wollen Sie Evolution dennoch beenden?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:150
 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:149
+#: ../mail/mail.error.xml.h:151
 msgid "You must name this Search Folder."
 msgstr "Sie müssen einen Namen für diesen Suchordner vergeben."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:152
 msgid "You must specify a folder."
 msgstr "Sie müssen einen Ordner angeben."
 
 # CHECK
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:153
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13229,65 +13261,65 @@ msgstr ""
 "Dies geschieht entweder durch individuelle Auswahl der Ordner und/oder durch "
 "das Wählen aller lokalen, aller fernen Ordner oder beider."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:155
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Anmedlung am Server »{0}« als »{0}« ist gescheitert."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Always"
 msgstr "_Immer"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:157
 msgid "_Append"
 msgstr "An_hängen"
 
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../mail/mail.error.xml.h:158
+#: ../plugins/publish-calendar/publish-calendar.c:611
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Discard changes"
 msgstr "Änderungen _verwerfen"
 
-#: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../mail/mail.error.xml.h:160
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "_Empty Trash"
 msgstr "_Müll leeren"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Exit Evolution"
 msgstr "Evolution b_eenden"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:162
 msgid "_Expunge"
 msgstr "_Säubern"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:163
 msgid "_Migrate Now"
 msgstr "Jetzt _migrieren"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "_No"
 msgstr "_Nein"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "_Open Messages"
 msgstr "Nachrichten ö_ffnen"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "_Send Receipt"
 msgstr "Bestätigung _senden"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "_Synchronize"
 msgstr "_Abgleichen"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
@@ -13420,28 +13452,23 @@ msgstr "Größe"
 msgid "Subject - Trimmed"
 msgstr "Betreff - Gekürzt"
 
-#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../mail/searchtypes.xml.h:1 ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Body contains"
 msgstr "Rumpf enthält"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Message contains"
 msgstr "Nachricht enthält"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "Recipients contain"
 msgstr "Empfänger enthalten"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Sender contains"
 msgstr "Absender enthält"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Subject contains"
 msgstr "Betreff enthält"
 
@@ -13449,7 +13476,7 @@ msgstr "Betreff enthält"
 msgid "Subject or Addresses contains"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:204
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13457,7 +13484,7 @@ msgstr ""
 "Wenn Sie diese Option auswählen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser SSL unterstützt."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13465,7 +13492,7 @@ msgstr ""
 "Wenn Sie diese Option auswählen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem LDAP-Server her, falls dieser TLS unterstützt."
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:208
 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 "
@@ -13475,15 +13502,15 @@ msgstr ""
 "Verbindung zu Ihrem LDAP-Server her. Das bedeutet, dass Ihre Verbindung "
 "unsicher ist und dadurch ein Sicherheitsproblem entsteht."
 
-#: ../modules/addressbook/addressbook-config.c:641
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Im Geburt_s- und Jahrestagskalender verwenden"
 
-#: ../modules/addressbook/addressbook-config.c:683
+#: ../modules/addressbook/addressbook-config.c:680
 msgid "Copy _book content locally for offline operation"
 msgstr "Den Adressbuchinhalt lokal zum Arbeiten im Offline-Modus _kopieren"
 
-#: ../modules/addressbook/addressbook-config.c:798
+#: ../modules/addressbook/addressbook-config.c:795
 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 "
@@ -13493,51 +13520,50 @@ msgstr ""
 "soll. Es wurde bereits eine Liste der Standard-Ports bereitgestellt. Fragen "
 "Sie Ihren Systemadministrator, welchen Port Sie angeben müssen."
 
-#: ../modules/addressbook/addressbook-config.c:879
+#: ../modules/addressbook/addressbook-config.c:876
 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."
+"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 ""
 "Dies ist die von Evolution verwendete Methode, um Sie zu legitimieren. "
-"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
-"ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
+"Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich ist, "
+"wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: ../modules/addressbook/addressbook-config.c:962
+#: ../modules/addressbook/addressbook-config.c:959
 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."
+"your search base. A search scope of \"one\" will only include the entries one "
+"level beneath your base."
 msgstr ""
-"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum "
-"absteigen wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
+"Der Suchbereich legt fest, wie tief Sie bei der Suche im Ordnerbaum absteigen "
+"wollen. Der Suchbereich »sub« schließt alle Einträge unterhalb des "
 "Suchbereichs ein. Der Suchbereich »one« hingegen schließt lediglich die Ebene "
 "unterhalb des Ausgangspunktes der Suche ein."
 
-#: ../modules/addressbook/addressbook-config.c:1086
+#: ../modules/addressbook/addressbook-config.c:1083
 msgid "Server Information"
 msgstr "Server-Informationen"
 
-#: ../modules/addressbook/addressbook-config.c:1091
+#: ../modules/addressbook/addressbook-config.c:1088
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Details"
 
-#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/addressbook/addressbook-config.c:1089
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Suchen"
 
-#: ../modules/addressbook/addressbook-config.c:1094
+#: ../modules/addressbook/addressbook-config.c:1091
 msgid "Downloading"
 msgstr "Herunterladen"
 
-#: ../modules/addressbook/addressbook-config.c:1309
+#: ../modules/addressbook/addressbook-config.c:1306
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1308
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
@@ -13566,33 +13592,36 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList-XML für die Liste der Vervollständigungs-URIs."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Enable address formatting"
+msgstr "Adressformatierung aktivieren"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 "Position des Vorschaufeldes der Kontaktliste bei horizontaler Anordnung."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "Position des Vorschaufeldes der Kontaktliste bei vertikaler Anordnung."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Primary address book"
 msgstr "Primäres Adressbuch"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show autocompleted name with an address"
 msgstr ""
-"Legt fest, ob der automatisch vervollständigte Name mit Adresse angezeigt "
-"wird"
+"Legt fest, ob der automatisch vervollständigte Name mit Adresse angezeigt wird"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show maps"
 msgstr "Karten anzeigen"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Show preview pane"
 msgstr "Vorschaufeld anzeigen"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13600,7 +13629,7 @@ msgstr ""
 "Die UID des gewählten (oder »primären«) Adressbuchs in der Seitenleiste der "
 "»Kontakte«-Ansicht."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13612,7 +13641,7 @@ msgstr ""
 "Kontaktliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die "
 "Kontaktliste. "
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13620,15 +13649,23 @@ msgstr ""
 "Die Anzahl der Zeichen, die eingegeben werden müssen, bevor Evolution die "
 "Auto-Vervollständigung versucht."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresse des zuletzt im Namenswähler verwendeten Ordners"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresse des zuletzt im Namenswähler verwendeten Ordners."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
+msgstr ""
+"Legt fest, ob Adressen nach den im Zielland geltenden Standards formatiert "
+"werden sollen."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13636,11 +13673,11 @@ msgstr ""
 "Legt fest, ob die E-Mail-Adresse zusammen mit dem Namen des automatisch "
 "vervollständigten Kontakts im Eintrag angezeigt wird."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Whether to show maps in preview pane."
 msgstr "Sollen Karten im Vorschaufeld angezeigt werden?"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid "Whether to show the preview pane."
 msgstr "Soll das Vorschaufeld angezeigt werden?"
 
@@ -13651,10 +13688,18 @@ msgid "_Table column:"
 msgstr "_Tabellenspalte:"
 
 #: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
+msgstr "Adressformatierung"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "Adresse anhand der Vorgaben des Ziellandes _formatieren"
+
+#: ../modules/addressbook/autocompletion-config.c:209
 msgid "Autocompletion"
 msgstr "Auto-Vervollständigung"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:212
 msgid "Always _show address of the autocompleted contact"
 msgstr "Immer Adresse des automatisch vervollständigten Kontakts an_zeigen"
 
@@ -13763,7 +13808,7 @@ msgstr "Karte mit allen Kontakten des gewählten Adressbuchs anzeigen"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
@@ -13844,7 +13889,7 @@ msgstr "A_ktionen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "_Preview"
 msgstr "_Vorschau"
 
@@ -13883,7 +13928,7 @@ msgstr "Karten im Kontakt-Vorschaufenster anzeigen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/mail/e-mail-shell-view-actions.c:1462
 msgid "_Classic View"
 msgstr "_Klassische Ansicht"
 
@@ -13895,7 +13940,7 @@ msgstr "Kontakt-Vorschaufenster unter der Kontaktliste anzeigen"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "_Vertical View"
 msgstr "_Vertikale Ansicht"
 
@@ -13911,18 +13956,18 @@ msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
-#: ../shell/e-shell-content.c:666
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
@@ -14042,8 +14087,8 @@ msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
 msgstr ""
-"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden "
-"soll. Wird er nicht verändert, so wird die voreingestellte Suche auf den Typ "
+"Der Suchfilter legt die Art der Objekte fest, nach denen gesucht werden soll. "
+"Wird er nicht verändert, so wird die voreingestellte Suche auf den Typ "
 "»Person« durchgeführt."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
@@ -14366,8 +14411,7 @@ msgid "Calendars to run reminders for"
 msgstr "Kalender, für die Erinnerungen ausgeführt werden sollen"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-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 ""
 "Farbe der Marcus-Bains-Linie in der Zeitleiste (Voreinstellung ist leer)."
 
@@ -14386,8 +14430,8 @@ msgstr "Beim Säubern nachfragen"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr ""
-"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden "
-"gekennzeichnet werden soll."
+"Die Tage, bei denen der Anfang und das Ende der Arbeitsstunden gekennzeichnet "
+"werden soll."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
@@ -14451,8 +14495,7 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
+msgstr "In der Tages- und Wochentagsansicht anzuzeigende Intervalle in Minuten."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
 msgid "Last reminder time"
@@ -14482,8 +14525,8 @@ msgstr "Farbe der Marcus-Bains-Linie - Zeitleiste"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
-"Maximum number of recently used timezones to remember in a "
-"'day_second_zones' list."
+"Maximum number of recently used timezones to remember in a 'day_second_zones' "
+"list."
 msgstr ""
 "Höchstzahl der zuletzt genutzten gespeicherten Zeitzonen in der Liste "
 "»day_second_zones«."
@@ -14523,8 +14566,8 @@ msgstr "Position der vertikalen Schiebeleiste in der Monatsansicht"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
 msgstr ""
-"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag "
-"oder Jahrestag."
+"Anzahl der Einheiten zur Festlegung einer Erinnerung an einen Geburtstag oder "
+"Jahrestag."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
@@ -14544,8 +14587,8 @@ msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
-"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur "
-"Auswahl des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
+"Die Position der horizontalen Schiebeleiste zwischen dem Kalender zur Auswahl "
+"des Datums und der Aufgabenliste in Pixel, wenn keine Monatsansicht "
 "eingestellt ist."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
@@ -14766,10 +14809,10 @@ msgid ""
 "the task list. \"0\" (Classic View) places the preview pane below the task "
 "list. \"1\" (Vertical View) places the preview pane next to the task list."
 msgstr ""
-"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die "
-"Aufgabenliste angezeigt wird. »0« (klassische Ansicht) setzt die "
-"Vorschauleiste unter die Aufgabenliste. »1« (vertikale Ansicht) setzt die "
-"Vorschauleiste neben die Aufgabenliste. "
+"Die Anordnung legt fest, wo die Vorschauleiste in Bezug auf die Aufgabenliste "
+"angezeigt wird. »0« (klassische Ansicht) setzt die Vorschauleiste unter die "
+"Aufgabenliste. »1« (vertikale Ansicht) setzt die Vorschauleiste neben die "
+"Aufgabenliste. "
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:91
 msgid "The second timezone for a Day View"
@@ -14801,8 +14844,8 @@ msgstr "24-Stunden-Zeitformat"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
 msgid ""
-"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-"\"days\"."
+"Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or \"days"
+"\"."
 msgstr ""
 "Einheit für Erinnerungen an Geburtstage oder Jahrestage (»minutes«, »hours« "
 "oder »days«)."
@@ -14877,8 +14920,7 @@ msgstr ""
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to hide completed tasks in the tasks view."
-msgstr ""
-"Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
+msgstr "Sollen abgeschlossene Aufgaben in der Aufgabenansicht verborgen werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to scroll a Month View by a week, not by a month."
@@ -14896,8 +14938,7 @@ msgstr "Soll eine Erinnerung für Geburtstage und Jahrestage festgelegt werden?"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
-"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das UAwg-Feld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
@@ -14917,8 +14958,7 @@ msgstr ""
 "werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:119
-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 ""
 "Sollen Zeiten im 24-Stunden- und nicht im 12-Stunden-Format angezeigt werden?"
 
@@ -14930,8 +14970,7 @@ msgstr ""
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr ""
-"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt "
-"werden?"
+"Soll das Artenfeld im Ereignis-/Aufgaben-/Besprechungseditor angezeigt werden?"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week numbers in various places in the Calendar."
@@ -15080,8 +15119,7 @@ msgstr "Drucken"
 #: ../modules/calendar/e-cal-shell-view-actions.c:320
 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."
+"amount of time. If you continue, you will not be able to recover these events."
 msgstr ""
 "Dieser Vorgang löscht alle Ereignisse, die älter als der angegebene Zeitraum "
 "sind. Falls Sie fortfahren, können Sie diese Ereignisse nicht "
@@ -15323,27 +15361,31 @@ msgstr "Aktuelle Termine"
 msgid "Next 7 Days' Appointments"
 msgstr "Termine der nächsten 7 Tage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 #: ../modules/calendar/e-memo-shell-view-actions.c:795
 #: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
 #: ../modules/calendar/e-memo-shell-view-actions.c:802
 #: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "Vorschau auf den zu druckenden Kalender"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-actions.c:1789
 #: ../modules/calendar/e-cal-shell-view-memopad.c:294
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:381
 #: ../modules/calendar/e-memo-shell-view-actions.c:843
@@ -15351,7 +15393,7 @@ msgstr "Vorschau auf den zu druckenden Kalender"
 msgid "_Save as iCalendar..."
 msgstr "Als i_Calendar speichern …"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 msgid "Go To"
 msgstr "Gehe zu"
 
@@ -15749,11 +15791,11 @@ msgid_plural "%d tasks"
 msgstr[0] "%d Aufgabe"
 msgstr[1] "%d Aufgaben"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:258
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:307
 msgid "Account Editor"
 msgstr "Konteneditor"
 
@@ -15781,313 +15823,313 @@ msgstr "E-Mail-_Ordner"
 msgid "Create a new mail folder"
 msgstr "Einen neuen E-Mail-Ordner anlegen"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:409
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:417
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:425
 msgid "Composer Preferences"
 msgstr "Editoreinstellungen"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:433
 msgid "Network Preferences"
 msgstr "Netzwerkeinstellungen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 #: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "Konto _deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Disable this account"
 msgstr "Dieses Konto deaktivieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "_Download Messages for Offline Usage"
 msgstr "_Nachrichten für Offline-Benutzung herunterladen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Nachrichten von Konten/Ordnern herunterladen, die für den Offline-Modus "
 "markiert sind"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Fl_ush Outbox"
 msgstr "E-Mails aus A_usgang verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Copy Folder To..."
 msgstr "Ordner _kopieren nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Copy the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner kopieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
 msgid "Permanently remove this folder"
 msgstr "Diesen Ordner dauerhaft entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "E_xpunge"
 msgstr "_Säubern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Mar_k All Messages as Read"
 msgstr "Alle Nachrichten als gelesen _markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Mark all messages in the folder as read"
 msgstr "Alle Nachrichten im Ordner als gelesen markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Move Folder To..."
 msgstr "Ordner verschie_ben nach …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Move the selected folder into another folder"
 msgstr "Den gewählten Ordner in einen anderen Ordner verschieben"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "_New..."
 msgstr "_Neu …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "Create a new folder for storing mail"
 msgstr "Einen neuen Ordner zum Ablegen von Nachrichten anlegen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Change the properties of this folder"
 msgstr "Die Eigenschaften dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Refresh the folder"
 msgstr "Den Ordner auffrischen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Change the name of this folder"
 msgstr "Den Namen dieses Ordners ändern"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Select Message _Thread"
 msgstr "Nachrichten-_Thread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Alle Nachrichten im selben Thread wie die gewählte Nachricht markieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Select Message S_ubthread"
 msgstr "Nachrichten-_Subthread auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Select all replies to the currently selected message"
 msgstr "Alle Antworten auf die momentan ausgewählten Nachricht auswählen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Empty _Trash"
 msgstr "_Müll leeren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Konten entfernen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "_New Label"
 msgstr "_Neue Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "N_one"
 msgstr "_Keine"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Manage Subscriptions"
 msgstr "Abonnements _verwalten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ordner auf fernen Servern abonnieren oder abbestellen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Send / _Receive"
 msgstr "Verschicken/Ab_rufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "R_eceive All"
 msgstr "Alle _empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Receive new items from all accounts"
 msgstr "Neue Objekte in von allen Konten empfangen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "_Send All"
 msgstr "Alle _verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Send queued items in all accounts"
 msgstr "Objekte in den Warteschlangen aller Konten verschicken"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Cancel the current mail operation"
 msgstr "Den momentan ausgeführten E-Mail-Vorgang abbrechen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Collapse All _Threads"
 msgstr "Alle _Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Collapse all message threads"
 msgstr "Alle Nachrichten-Threads einklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "E_xpand All Threads"
 msgstr "Alle Threads a_usklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Expand all message threads"
 msgstr "Alle Nachrichten-Threads ausklappen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Message Filters"
 msgstr "Nachrichtenf_ilter"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Create or edit rules for filtering new mail"
 msgstr "Regeln zum Filtern neuer E-Mails anlegen/bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "_Subscriptions..."
 msgstr "A_bonnements …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "F_older"
 msgstr "_Ordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "_Label"
 msgstr "Bes_chriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "C_reate Search Folder From Search..."
 msgstr "Sucho_rdner aus Suche anlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Search F_olders"
 msgstr "S_uchordner"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Create or edit search folder definitions"
 msgstr "Suchordner-Definitionen anlegen oder bearbeiten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen …"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Show Message _Preview"
 msgstr "Nachrichten_vorschau anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "Show message preview pane"
 msgstr "Nachrichten-Vorschaufenster anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Show _Deleted Messages"
 msgstr "Gel_öschte Nachrichten anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show deleted messages with a line through them"
 msgstr "Gelöschte Nachrichten (durchgestrichen) anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
 msgid "_Group By Threads"
 msgstr "Nach Threads _gruppieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Threaded message list"
 msgstr "Nachrichtenliste nach Threads sortieren"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "Show message preview below the message list"
 msgstr "Nachrichtenvorschau unter der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Show message preview alongside the message list"
 msgstr "Nachrichtenvorschau neben der Nachrichtenliste anzeigen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "All Messages"
 msgstr "Alle Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Important Messages"
 msgstr "Wichtige Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "Last 5 Days' Messages"
 msgstr "Nachrichten der letzten fünf Tage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Messages Not Junk"
 msgstr "Nachrichten sind nicht unerwünscht"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Messages with Attachments"
 msgstr "Nachrichten mit Anlagen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "No Label"
 msgstr "Keine Beschriftung"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Read Messages"
 msgstr "Gelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Recent Messages"
 msgstr "Letzte Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "Subject or Addresses contain"
 msgstr "Betreff oder Adresse enthält"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "All Accounts"
 msgstr "Alle Konten"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Current Account"
 msgstr "Derzeitiges Konto"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Current Folder"
 msgstr "Derzeitiger Ordner"
 
@@ -16164,18 +16206,18 @@ msgstr[1] "%d insgesamt"
 msgid "Trash"
 msgstr "Müll"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1544
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ../modules/mail/em-composer-prefs.c:495
-#: ../modules/plugin-manager/evolution-plugin-manager.c:361
-#: ../plugins/publish-calendar/publish-calendar.c:857
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:849
+#: ../widgets/misc/e-account-tree-view.c:385
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../modules/mail/em-composer-prefs.c:499
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
@@ -16214,8 +16256,7 @@ msgstr "_Originalwert der Kopfzeile anzeigen"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr ""
-"Überprüfen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
+msgstr "Überprüfen, ob Evolution die Vorgabeanwendung zur E-Mail-Verwaltung ist"
 
 #: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
@@ -16245,8 +16286,7 @@ msgstr "Evolution ist im Offline-Modus"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
 msgid ""
-"Evolution will return to online mode once a network connection is "
-"established."
+"Evolution will return to online mode once a network connection is established."
 msgstr ""
 "Evolution wird in den Online-Modus zurückkehren, sobald eine "
 "Netzwerkverbindung hergestellt ist."
@@ -16271,32 +16311,32 @@ msgstr ""
 "Diese Option stellt über den GNOME-Online-Konto-Dienst eine Verbindung zum "
 "Server her."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "Autor(en)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "Plugin-Verwaltung"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:271
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Hinweis: Einige Änderungen werden erst nach einem Neustart wirksam."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:300
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "Ãœberblick"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:369
-#: ../modules/plugin-manager/evolution-plugin-manager.c:452
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "Plugin"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "_Plugins"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:491
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Enable and disable plugins"
 msgstr "Plugins aktivieren und deaktivieren"
 
@@ -16407,14 +16447,13 @@ msgstr "Willkommen"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect to "
+"your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "Willkommen bei Evolution. Die folgenden Dialoge werden Ihnen helfen, Ihre E-"
-"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu "
-"importieren.\n"
+"Mail-Konten einzurichten und Dateien aus anderen Anwendungen zu importieren.\n"
 "\n"
 "Klicken Sie auf »Vor«, um fortzufahren. "
 
@@ -16432,8 +16471,7 @@ msgstr "Lokale Adressbücher"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body"
+"List of clues for the attachment reminder plugin to look for in a message body"
 msgstr ""
 "Liste der Begriffe, nach denen die Anlagenerinnerung im Text der Nachricht "
 "sucht"
@@ -16484,23 +16522,23 @@ msgstr "Eingebettete Klänge"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Audio-Anlagen direkt in Nachrichten wiedergeben."
 
-#: ../plugins/backup-restore/backup-restore.c:192
+#: ../plugins/backup-restore/backup-restore.c:223
 msgid "Select name of the Evolution backup file"
 msgstr "Name des Evolution-Sicherungsarchivs auswählen"
 
-#: ../plugins/backup-restore/backup-restore.c:225
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "_Restart Evolution after backup"
 msgstr "Evolution nach Sicherung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:283
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Name des Evolution-Sicherungsarchivs zur Wiederherstellung wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:296
 msgid "_Restart Evolution after restore"
 msgstr "Evolution nach Wiederherstellung neu sta_rten"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:383
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16510,37 +16548,37 @@ msgstr ""
 "Mails, Kalender, Aufgaben, Notizen und Adressbücher sowie alle persönlichen "
 "Einstellungen, Filter etc. können wiederhergestellt werden."
 
-#: ../plugins/backup-restore/backup-restore.c:344
+#: ../plugins/backup-restore/backup-restore.c:393
 msgid "_Restore Evolution from the backup file"
 msgstr "Evolution aus _Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:403
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Evolution-Archiv zur Wiederherstellung wählen:"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:407
 msgid "Choose a file to restore"
 msgstr "Eine Datei zum Wiederherstellen wählen"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:421
 msgid "Restore from backup"
 msgstr "Aus Sicherungsdatei wiederherstellen"
 
-#: ../plugins/backup-restore/backup-restore.c:402
+#: ../plugins/backup-restore/backup-restore.c:468
 msgid "_Back up Evolution Data..."
 msgstr "Evolution-Daten _sichern…"
 
-#: ../plugins/backup-restore/backup-restore.c:404
+#: ../plugins/backup-restore/backup-restore.c:470
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen in einer "
 "Archivdatei"
 
-#: ../plugins/backup-restore/backup-restore.c:409
+#: ../plugins/backup-restore/backup-restore.c:475
 msgid "R_estore Evolution Data..."
 msgstr "Evolution-Daten wi_ederherstellen …"
 
-#: ../plugins/backup-restore/backup-restore.c:411
+#: ../plugins/backup-restore/backup-restore.c:477
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Sichern und Wiederherstellen von Evolution-Daten und Einstellungen aus einer "
@@ -16567,85 +16605,84 @@ msgid "With Graphical User Interface"
 msgstr "Mit grafischer Oberfläche"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:300
+#: ../plugins/backup-restore/backup.c:424
 msgid "Shutting down Evolution"
 msgstr "Evolution wird heruntergefahren"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:309
 msgid "Backing Evolution accounts and settings"
 msgstr "Sichern der Evolution-Konten und -Einstellungen"
 
-#: ../plugins/backup-restore/backup.c:318
+#: ../plugins/backup-restore/backup.c:321
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Sichern der Evolution-Daten (E-Mails, Kontakte, Kalender, Aufgaben, Notizen)"
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../plugins/backup-restore/backup.c:337
 msgid "Back up complete"
 msgstr "Sicherung komplett"
 
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
+#: ../plugins/backup-restore/backup.c:344
+#: ../plugins/backup-restore/backup.c:560
 msgid "Restarting Evolution"
 msgstr "Evolution wird neugestartet"
 
-#: ../plugins/backup-restore/backup.c:424
+#: ../plugins/backup-restore/backup.c:430
 msgid "Back up current Evolution data"
 msgstr "Aktuelle Evolution-Daten sichern"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:438
 msgid "Extracting files from back up"
 msgstr "Dateien werden aus dem Sicherungsarchiv entpackt"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:505
 msgid "Loading Evolution settings"
 msgstr "Evolution-Einstellungen laden"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:541
 msgid "Removing temporary back up files"
 msgstr "Temporäre Sicherungsdateien werden entfernt"
 
-#: ../plugins/backup-restore/backup.c:520
+#: ../plugins/backup-restore/backup.c:553
 msgid "Ensuring local sources"
 msgstr "Lokale Quellen sicherstellen"
 
-#: ../plugins/backup-restore/backup.c:707
+#: ../plugins/backup-restore/backup.c:748
+msgid "Evolution Back Up"
+msgstr "Evolution-Datensicherung"
+
+#: ../plugins/backup-restore/backup.c:749
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Sichern nach %s"
 
-#: ../plugins/backup-restore/backup.c:712
+#: ../plugins/backup-restore/backup.c:754
+msgid "Evolution Restore"
+msgstr "Evolution-Wiederherstellung"
+
+#: ../plugins/backup-restore/backup.c:755
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Wiederherstellen von %s"
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Back up"
-msgstr "Evolution-Datensicherung"
-
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Evolution-Wiederherstellung"
-
-#: ../plugins/backup-restore/backup.c:774
+#: ../plugins/backup-restore/backup.c:824
 msgid "Backing up Evolution Data"
 msgstr "Sichern der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:775
+#: ../plugins/backup-restore/backup.c:825
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten sichert."
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../plugins/backup-restore/backup.c:827
 msgid "Restoring Evolution Data"
 msgstr "Wiederherstellen der Evolution-Daten"
 
-#: ../plugins/backup-restore/backup.c:778
+#: ../plugins/backup-restore/backup.c:828
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Bitte warten Sie, während Evolution Ihre Daten wiederherstellt."
 
-#: ../plugins/backup-restore/backup.c:796
+#: ../plugins/backup-restore/backup.c:846
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Dies kann abhängig von den Daten in Ihrem Konto einige Zeit dauern."
 
@@ -16666,8 +16703,8 @@ msgstr "Sind Sie sicher, dass Sie Evolution beenden wollen?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
-"Sind Sie sicher, dass Evolution aus dem ausgewählten Archiv "
-"wiederhergestellt werden soll?"
+"Sind Sie sicher, dass Evolution aus dem ausgewählten Archiv wiederhergestellt "
+"werden soll?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Close and Back up Evolution"
@@ -16710,10 +16747,10 @@ msgid ""
 "up."
 msgstr ""
 "Um Ihre Daten und Einstellungen wiederherzustellen, müssen Sie zuerst "
-"Evolution beenden. Stellen Sie bitte sicher, dass Sie ungesicherte "
-"Änderungen speichern, bevor Sie fortfahren. Es werden alle derzeitigen "
-"Evolution-Daten und -Einstellungen unwiderruflich gelöscht und aus der "
-"Sicherungskopie wiederhergestellt."
+"Evolution beenden. Stellen Sie bitte sicher, dass Sie ungesicherte Änderungen "
+"speichern, bevor Sie fortfahren. Es werden alle derzeitigen Evolution-Daten "
+"und -Einstellungen unwiderruflich gelöscht und aus der Sicherungskopie "
+"wiederhergestellt."
 
 #: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -17041,23 +17078,23 @@ msgstr "Outlook DBX-Importeur"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Persönliche Ordner aus Outlook Express 5/6 (.dbx)"
 
-#: ../plugins/default-source/default-source.c:168
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Als _Vorgabeadressbuch markieren"
 
-#: ../plugins/default-source/default-source.c:182
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr "Aus diesem Adressbuch a_utomatisch vervollständigen"
 
-#: ../plugins/default-source/default-source.c:191
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "Als _Vorgabekalender markieren"
 
-#: ../plugins/default-source/default-source.c:192
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default task list"
 msgstr "Als _Vorgabeaufgabenliste markieren"
 
-#: ../plugins/default-source/default-source.c:193
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr "Als _Vorgabenotizliste markieren"
 
@@ -17203,8 +17240,7 @@ msgstr "Externer Editor"
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
 msgid "Use an external editor to compose plain-text mail messages."
-msgstr ""
-"Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
+msgstr "Einen externen Editor zum Verfassen von Nur-Text-Nachrichten verwenden."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
@@ -17216,8 +17252,7 @@ msgstr "Editor kann nicht gestartet werden"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
-"Evolution is unable to create a temporary file to save your mail. Retry "
-"later."
+"Evolution is unable to create a temporary file to save your mail. Retry later."
 msgstr ""
 "Es konnte keine temporäre Datei zum Speichern der E-Mails angelegt werden. "
 "Bitte versuchen Sie es später erneut."
@@ -17239,8 +17274,8 @@ msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr ""
-"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht "
-"gestartet werden. Bitte benutzen Sie einen anderen Editor."
+"Der in den Pluin-Einstellungen gesetzte externe Editor konnte nicht gestartet "
+"werden. Bitte benutzen Sie einen anderen Editor."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
@@ -17327,8 +17362,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:576
-#: ../plugins/mail-to-task/mail-to-task.c:813
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -17592,44 +17627,44 @@ msgstr ""
 "Um alle diese Elemente weiterzuverarbeiten, sollte die Datei gespeichert und "
 "der Kalender importiert werden."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2672
+#: ../plugins/itip-formatter/itip-formatter.c:2665
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Keine"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../plugins/itip-formatter/itip-formatter.c:2681
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../plugins/itip-formatter/itip-formatter.c:2799
 msgid "This meeting recurs"
 msgstr "Diese Besprechung wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2802
 msgid "This task recurs"
 msgstr "Diese Aufgabe wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2812
+#: ../plugins/itip-formatter/itip-formatter.c:2805
 msgid "This memo recurs"
 msgstr "Diese Notiz wird wiederholt"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3036
+#: ../plugins/itip-formatter/itip-formatter.c:3029
 msgid "Meeting Invitations"
 msgstr "Besprechungseinladungen"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/itip-formatter/itip-formatter.c:3054
 msgid "_Delete message after acting"
 msgstr "_Löschen der Nachricht nach Abarbeitung"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
+#: ../plugins/itip-formatter/itip-formatter.c:3064
+#: ../plugins/itip-formatter/itip-formatter.c:3097
 msgid "Conflict Search"
 msgstr "Konfliktsuche"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
+#: ../plugins/itip-formatter/itip-formatter.c:3079
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Kalender zur Suche nach Besprechungskonflikten auswählen"
 
@@ -17854,7 +17889,7 @@ msgstr "%s hat durch %s folgende Besprechung abgesagt:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
-msgid "%s has canceled the following meeting."
+msgid "%s has canceled the following meeting:"
 msgstr "%s hat folgende Besprechung abgesagt:"
 
 #: ../plugins/itip-formatter/itip-view.c:418
@@ -17864,7 +17899,7 @@ msgstr "%s durch %s hat folgende Besprechungsänderungen vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
-msgid "%s has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen vorgeschlagen:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
@@ -17874,7 +17909,7 @@ msgstr "%s hat durch %s folgende Besprechungsänderungen abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
-msgid "%s has declined the following meeting changes."
+msgid "%s has declined the following meeting changes:"
 msgstr "%s hat folgende Besprechungsänderungen abgelehnt:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
@@ -18156,8 +18191,8 @@ msgid ""
 "If \"true\", then beep, otherwise will play sound file when new messages "
 "arrive."
 msgstr ""
-"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben "
-"wird (»TRUE«) oder eine Klangdatei abgespielt wird (»FALSE«)."
+"Legt fest, ob beim Eintreffen neuer Nachrichten ein Signalton ausgegeben wird "
+"(»TRUE«) oder eine Klangdatei abgespielt wird (»FALSE«)."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
@@ -18175,8 +18210,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
+msgstr "Symbol im Benachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
@@ -18204,7 +18238,7 @@ msgstr ""
 "Legt fest, ob nur über Nachrichten im Eingangsordner benachrichtigt werden "
 "soll."
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:392
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18221,59 +18255,58 @@ msgstr[1] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:417
 #, c-format
 msgid "Subject: %s"
 msgstr "Betreff: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:428
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Sie haben %d neue Nachricht."
 msgstr[1] "Sie haben %d neue Nachrichten."
 
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:448
 msgid "New email"
 msgstr "Neue E-Mail"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:469
 #, c-format
 msgid "Show %s"
 msgstr "%s anzeigen"
 
-#: ../plugins/mail-notification/mail-notification.c:673
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "_Play sound when a new message arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Klang abspielen"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:704
 msgid "_Beep"
 msgstr "_Signalton ausgeben"
 
-#: ../plugins/mail-notification/mail-notification.c:716
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "Use sound _theme"
 msgstr "Klang_thema verwenden"
 
-#: ../plugins/mail-notification/mail-notification.c:735
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Play _file:"
 msgstr "Klang_datei abspielen:"
 
-#: ../plugins/mail-notification/mail-notification.c:744
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Select sound file"
 msgstr "Klangdatei auswählen"
 
-#: ../plugins/mail-notification/mail-notification.c:801
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Nur über neue Nachrichten im _Eingangsordner benachrichtigen."
 
-#: ../plugins/mail-notification/mail-notification.c:811
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
-msgstr ""
-"Symbol im Be_nachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen"
+msgstr "Symbol im Be_nachrichtigungsfeld beim Eintreffen neuer E-Mails anzeigen"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18284,39 +18317,39 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Beim Eintreffen neuer E-Mails benachrichtigen"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:238
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Erstellt aus einer Nachricht an %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:603
+#: ../plugins/mail-to-task/mail-to-task.c:610
 #, c-format
 msgid ""
-"Selected calendar contains event '%s' already. Would you like to edit the "
-"old event?"
+"Selected calendar contains event '%s' already. Would you like to edit the old "
+"event?"
 msgstr ""
 "Der ausgewählte Kalender enthält bereits das Ereignis »%s«. Möchten Sie das "
 "alte Ereignis bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:606
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid ""
-"Selected task list contains task '%s' already. Would you like to edit the "
-"old task?"
+"Selected task list contains task '%s' already. Would you like to edit the old "
+"task?"
 msgstr ""
 "Die ausgewählte Aufgabenliste enthält bereits die Aufgabe »%s«. Möchten Sie "
 "die alte Aufgabe bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:609
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
-"Selected memo list contains memo '%s' already. Would you like to edit the "
-"old memo?"
+"Selected memo list contains memo '%s' already. Would you like to edit the old "
+"memo?"
 msgstr ""
 "Die ausgewählte Notizliste enthält bereits die Notiz »%s«. Möchten Sie die "
 "alte Notiz bearbeiten?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:626
+#: ../plugins/mail-to-task/mail-to-task.c:633
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18325,7 +18358,7 @@ msgstr ""
 "Sie haben %d Nachrichten ausgewählt, die in Ereignisse umgewandelt werden "
 "sollen. Wollen Sie diese wirklich alle hinzufügen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:629
+#: ../plugins/mail-to-task/mail-to-task.c:636
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18334,7 +18367,7 @@ msgstr ""
 "Sie haben %d Nachrichten ausgewählt, die in Aufgaben umgewandelt werden "
 "sollen. Wollen Sie diese wirklich alle hinzufügen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:632
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18343,29 +18376,29 @@ msgstr ""
 "Sie haben %d Nachrichten ausgewählt, die in Notizen umgewandelt werden "
 "sollen. Wollen Sie diese wirklich alle hinzufügen?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:651
+#: ../plugins/mail-to-task/mail-to-task.c:658
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Soll die Umwandlung der verbleibenden Nachrichten fortgesetzt werden?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:726
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "[No Summary]"
 msgstr "[Keine Zusammenfassung]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:745
 msgid "Invalid object returned from a server"
 msgstr "Ein ungültiges Objekt wurde vom Server zurückgegeben."
 
-#: ../plugins/mail-to-task/mail-to-task.c:788
+#: ../plugins/mail-to-task/mail-to-task.c:795
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ein Fehler ist während der Verarbeitung aufgetreten: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Kalender konnte nicht geöffnet werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18373,7 +18406,7 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann kein neues Ereignis "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:823
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18381,7 +18414,7 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Aufgabe "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:826
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18389,44 +18422,44 @@ msgstr ""
 "Die gewählte Quelle ist schreibgeschützt, daher kann keine neue Notiz "
 "erstellt werden. Bitte wählen Sie eine andere Quelle aus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Die Liste der Quelle konnte nicht erhalten werden. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1138
+#: ../plugins/mail-to-task/mail-to-task.c:1147
 msgid "No writable calendar is available."
 msgstr "Keine schreibbarer Kalender verfügbar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1230
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create an _Event"
 msgstr "Ein _Ereignis anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1232
+#: ../plugins/mail-to-task/mail-to-task.c:1241
 msgid "Create a new event from the selected message"
 msgstr "Ein neues Ereignis mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1237
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a Mem_o"
 msgstr "Eine _Notiz anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1239
+#: ../plugins/mail-to-task/mail-to-task.c:1248
 msgid "Create a new memo from the selected message"
 msgstr "Eine neue Notiz mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1244
+#: ../plugins/mail-to-task/mail-to-task.c:1253
 msgid "Create a _Task"
 msgstr "Eine _Aufgabe anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1246
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a new task from the selected message"
 msgstr "Eine neue Aufgabe mit Hilfe der gewählten Nachricht anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1254
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a _Meeting"
 msgstr "Eine _Besprechung anlegen"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1256
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a new meeting from the selected message"
 msgstr "Eine neue Besprechung mit Hilfe der gewählten Nachricht anlegen"
 
@@ -18531,9 +18564,9 @@ msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
 msgstr ""
-"Veröffentlichungen auf dieser Mailingliste sind nicht erlaubt. "
-"Möglicherweise ist diese Liste nur zum Lesen gedacht. Um Einzelheiten "
-"darüber zu erfahren, nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
+"Veröffentlichungen auf dieser Mailingliste sind nicht erlaubt. Möglicherweise "
+"ist diese Liste nur zum Lesen gedacht. Um Einzelheiten darüber zu erfahren, "
+"nehmen Sie bitte Kontakt zum Eigner dieser Liste auf."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18541,8 +18574,8 @@ msgstr "Die Nachricht an die Mailingliste schicken?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not "
-"contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not contain "
+"any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18564,8 +18597,7 @@ 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."
+"This message does not contain the header information required for this action."
 msgstr ""
 "Diese Nachricht enthält nicht die benötigten Kopfdaten, die zur Ausführung "
 "dieser Aktion notwendig sind."
@@ -18675,31 +18707,31 @@ msgstr "Outlook PST-Importeur"
 msgid "Outlook personal folders (.pst)"
 msgstr "Persönliche Outlook-Ordner (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:450
+#: ../plugins/pst-import/pst-importer.c:452
 msgid "_Mail"
 msgstr "_E-Mail"
 
-#: ../plugins/pst-import/pst-importer.c:469
+#: ../plugins/pst-import/pst-importer.c:471
 msgid "Destination folder:"
 msgstr "Zielordner:"
 
-#: ../plugins/pst-import/pst-importer.c:475
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Address Book"
 msgstr "_Adressbuch"
 
-#: ../plugins/pst-import/pst-importer.c:476
+#: ../plugins/pst-import/pst-importer.c:482
 msgid "A_ppointments"
 msgstr "_Termine"
 
-#: ../plugins/pst-import/pst-importer.c:477 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:486 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Aufgaben"
 
-#: ../plugins/pst-import/pst-importer.c:478
+#: ../plugins/pst-import/pst-importer.c:490
 msgid "_Journal entries"
 msgstr "_Journal-Einträge"
 
-#: ../plugins/pst-import/pst-importer.c:585
+#: ../plugins/pst-import/pst-importer.c:600
 msgid "Importing Outlook data"
 msgstr "Outlook-Daten werden importiert"
 
@@ -18719,7 +18751,7 @@ msgid "Publish calendars to the web."
 msgstr "Kalender im Internet veröffentlichen."
 
 #: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:471
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "»%s« konnte nicht geöffnet werden:"
@@ -18739,28 +18771,28 @@ msgstr "Bei der Veröffentlichung nach »%s« ist ein Fehler aufgetreten:"
 msgid "Publishing to %s finished successfully"
 msgstr "Die Veröffentlichung nach »%s« ist erfolgreich abgeschlossen worden"
 
-#: ../plugins/publish-calendar/publish-calendar.c:288
+#: ../plugins/publish-calendar/publish-calendar.c:284
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Einhängen von »%s« ist fehlgeschlagen:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.c:611
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:759
 msgid "Are you sure you want to remove this location?"
 msgstr "Sind Sie sicher, dass Sie diesen Ort entfernen wollen?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1091
 msgid "Could not create publish thread."
 msgstr "Thema zum Veröffentlichen der Nachricht konnte nicht erstellt werden."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "_Publish Calendar Information"
 msgstr "Kalenderinformationen verö_ffentlichen"
 
@@ -18797,8 +18829,8 @@ msgid "Publishing _Frequency:"
 msgstr "Veröffentlichungsin_tervall:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "Sicheres FTP (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "Sicheres FTP (SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
@@ -18947,7 +18979,7 @@ msgstr "Variablen _einschließen in:"
 msgid "Comma separated values (.csv)"
 msgstr "Mit Kommata getrennte Werte (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:191
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -18957,8 +18989,7 @@ msgstr "Auswahl speichern"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
-msgstr ""
-"Einen Kalender oder eine Aufgabenliste auf einem Datenträger speichern."
+msgstr "Einen Kalender oder eine Aufgabenliste auf einem Datenträger speichern."
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
@@ -19003,9 +19034,9 @@ msgstr ""
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid ""
-"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
+"Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG"
+"[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an "
+"email you are replying to."
 msgstr ""
 "Auf Entwürfen basierendes Vorlagen-Plugin. Sie können Variablen wie $ORIG"
 "[subject], $ORIG[from], $ORIG[to] oder $ORIG[body] verwenden. Diese werden "
@@ -19040,27 +19071,27 @@ msgstr "Eingebettete vCards"
 msgid "Show vCards directly in mail messages."
 msgstr "vCards innerhalb von Nachrichten anzeigen."
 
-#: ../plugins/vcard-inline/vcard-inline.c:207
-#: ../plugins/vcard-inline/vcard-inline.c:292
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
 msgid "Show Full vCard"
 msgstr "Gesamte VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:210
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr "Kompakt-VCard anzeigen"
 
-#: ../plugins/vcard-inline/vcard-inline.c:271
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr "Es gibt einen weiteren Kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:280
+#: ../plugins/vcard-inline/vcard-inline.c:281
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Es gibt %d weiteren Kontakt."
 msgstr[1] "Es gibt %d weitere Kontakte."
 
-#: ../plugins/vcard-inline/vcard-inline.c:301
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "In Adressbuch speichern"
 
@@ -19174,14 +19205,6 @@ msgid "Initial attachment view"
 msgstr "Erstmalige Anlagenansicht"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "Ausgangsordner des Dateiwählers"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Ausgangsordner des GtkFileChooser-Dialogs."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19189,46 +19212,46 @@ msgstr ""
 "Initiale Ansicht der Widgets in der Anlagenleiste. »0« bedeutet "
 "Symbolansicht, »1« Listenansicht"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Zuletzt aktualisierte Konfigurationsversion"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 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 "
 "abgeglichen werden sollen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Nicht-Proxy-Rechner"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Zur Legitimation verwendetes Passwort für HTTP-Proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Proxy-Konfigurationsmodus"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Rechnername für SOCKS-Proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Port für SOCKS-Proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Rechnername für sicheren HTTP-Proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Port für sicheren HTTP-Proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19239,51 +19262,51 @@ msgstr ""
 "(Systemeinstellungen verwenden), 1 (kein Proxy), 2 (manuelle Proxy-"
 "Konfiguration) sowie 3 (automatische Proxy-Konfiguration über Adresse)"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "Seitenleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Entwicklungs-Warndialog nicht anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "Statusleiste ist sichtbar"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
-"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und "
-"Konfigurations-Stufe (z.B. »2.6.0«)."
+"Die Konfigurationsversion von Evolution mit Haupt-, Unter- und Konfigurations-"
+"Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default X coordinate for the main window."
 msgstr "Die vorgegebene X-Koordinate des Hauptfensters."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The default Y coordinate for the main window."
 msgstr "Die vorgegebene Y-Koordinate des Hauptfensters."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "Die voreingestellte Höhe des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "Die voreingestellte Breite des Hauptfensters in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "Die voreingestellte Breite der Seitenleiste in Pixel."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19291,28 +19314,28 @@ msgstr ""
 "Die zuletzt aktualisierte Konfigurationsversion von Evolution mit Haupt-, "
 "Unter- und Konfigurations-Stufe (z.B. »2.6.0«)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "Der Rechnername des Proxys, durch den HTTP-Anfragen geleitet werden."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr ""
 "Der Rechnername des Proxys, durch den sichere HTTP-Anfragen geleitet werden."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "Der Rechnername des Proxys, durch den SOCKS-Anfragen geleitet werden."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
-"Der Port des in »/apps/evolution/shell/network_config/http_host» "
-"festgelegten Proxys."
+"Der Port des in »/apps/evolution/shell/network_config/http_host» festgelegten "
+"Proxys."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19320,7 +19343,7 @@ msgstr ""
 "Der Port des in »/apps/evolution/shell/network_config/secure_host« "
 "festgelegten Proxys."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19328,17 +19351,17 @@ msgstr ""
 "Der Port des in »/apps/evolution/shell/network_config/socks_host« "
 "festgelegten Proxys."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 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."
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by "
+"the GNOME toolbar setting."
 msgstr ""
-"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, »both« "
-"und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der GNOME-"
-"Einstellungen festgelegt."
+"Der Stil der Fensterknöpfe. Mögliche Einstellungen sind »text«, »icons«, "
+"»both« und »toolbar«. Wenn »toolbar« gesetzt wurde, wird der Stil anhand der "
+"GNOME-Einstellungen festgelegt."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19351,65 +19374,65 @@ msgstr ""
 "Anfang wie *.example.com), IP-Adressen (sowohl IPv4 als auch IPv6) sowie "
 "Netzwerk-Adressen mit einer Netzmaske (z.B. 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "Werkzeugleiste anzeigen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "Adresse, unter der Werte für die Proxy-Konfigration vorliegen"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "HTTP-Proxy verwenden"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Benutzername für Legitimation an HTTP-Proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 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.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Soll das Fenster maximiert werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Soll die Seitenleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Soll die Statusleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Soll die Werkzeugleiste angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 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.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Sollen die Fensterknöpfe angezeigt werden?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Fensterknopfstil"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Fensterknöpfe sind sichtbar"
 
-#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Suchen"
 
-#: ../shell/e-shell-content.c:773
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Suche speichern"
 
@@ -19417,27 +19440,27 @@ msgstr "Suche speichern"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "An_zeigen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:970
 msgid "Sear_ch:"
 msgstr "S_uchen: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1033
 msgid "i_n"
 msgstr " _in "
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:189
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:212
 msgid "All Files (*)"
 msgstr "Alle Dateien (*)"
 
@@ -19736,24 +19759,24 @@ msgstr "Diese Suchparameter ausführen"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:442
+#: ../shell/e-shell-window.c:445
 msgid "New"
 msgstr "Neu"
 
-#: ../shell/e-shell.c:361
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Offline-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:414
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Online-Betrieb wird vorbereitet …"
 
-#: ../shell/e-shell.c:476
+#: ../shell/e-shell.c:434
 msgid "Preparing to quit..."
 msgstr "Beenden wird vorbereitet …"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19792,7 +19815,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:219
+#: ../shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19800,13 +19823,13 @@ msgstr ""
 "Vielen Dank\n"
 "Das Evolution-Team\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:224
 msgid "Do not tell me again"
 msgstr "Nicht mehr anzeigen"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:304
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19814,51 +19837,51 @@ msgstr ""
 "Evolution mit einer bestimmten Komponente starten. Mögliche Optionen sind "
 "»mail«, »calendar«, »contacts« und »memos«"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:308
 msgid "Apply the given geometry to the main window"
 msgstr "Die angegebene Geometrie auf das Hauptfenster anwenden"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:312
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid "Ignore network availability"
 msgstr "Verfügbarkeit des Netzwerks ignorieren"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:316
 msgid "Start in \"express\" mode"
 msgstr "Im Express-Modus starten"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Evolution zum Herunterfahren zwingen"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Disable loading of any plugins."
 msgstr "Das Laden von allen Plugins deaktivieren."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Die Vorschau von E-Mails, Kontakten und Aufgaben deaktivieren."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Die Adressen oder Dateinamen in den restlichen Argumenten importieren."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Request a running Evolution process to quit"
 msgstr "Einen laufenden Evolution-Prozess zum Beenden auffordern"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:508 ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Die Evolution PIM- und E-Mail-Anwendung"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19867,13 +19890,14 @@ msgstr ""
 "%s: »--online« und »--offline« können nicht gemeinsam verwendet werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:585
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: »--force-online« und »--offline« können nicht gemeinsam verwendet werden.\n"
+"%s: »--force-online« und »--offline« können nicht gemeinsam verwendet "
+"werden.\n"
 "  Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
 #: ../shell/shell.error.xml.h:1
@@ -19892,8 +19916,8 @@ msgstr "Trotzdem fortsetzen"
 #: ../shell/shell.error.xml.h:4
 msgid ""
 "Evolution no longer supports upgrading directly from version {0}. However as "
-"a workaround you might try first upgrading to Evolution 2, and then "
-"upgrading to Evolution 3."
+"a workaround you might try first upgrading to Evolution 2, and then upgrading "
+"to Evolution 3."
 msgstr ""
 "Evolution unterstützt die Aktualisierung direkt von Version {0} nicht mehr. "
 "Es ist allerdings möglich, zunächst auf Version 2 und dann auf Version 3 zu "
@@ -19924,8 +19948,7 @@ msgstr "Verw_erfen"
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old "
-"data.\n"
+"If you choose to continue, you may not have access to some of your old data.\n"
 msgstr ""
 "{0}\n"
 "\n"
@@ -20061,7 +20084,7 @@ msgstr "Einer Organisationseinheit (OU) ausgestellt"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:569
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Seriennummer"
 
@@ -20080,38 +20103,32 @@ msgstr "Ausgestellt von"
 msgid "Issued By Organization"
 msgstr "Von einer Organisation ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118
 msgid "Issued By Organizational Unit"
 msgstr "Von einer Organisationseinheit (OU) ausgestellt"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:81 ../smime/gui/certificate-manager.c:101
 #: ../smime/gui/certificate-manager.c:119
 msgid "Issued"
 msgstr "Aussteller"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:82 ../smime/gui/certificate-manager.c:102
 #: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:83 ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5-Fingerabdruck"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
@@ -20127,7 +20144,7 @@ msgstr "Alle Dateien"
 msgid "Failed to import certificate"
 msgstr "Zertifikat konnte nicht importiert werden"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:992
 msgid "All PKCS12 files"
 msgstr "Alle PKCS12-Dateien"
 
@@ -20135,7 +20152,7 @@ msgstr "Alle PKCS12-Dateien"
 msgid "All email certificate files"
 msgstr "Alle E-Mail-Zertifikatdateien"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Alle CA-Zertifikatdateien"
 
@@ -20154,7 +20171,7 @@ msgstr "Geben Sie das Passwort für »%s« ein"
 msgid "Enter new password for certificate database"
 msgstr "Geben Sie ein neues Passwort für die Zertifikatdatenbank ein"
 
-#: ../smime/gui/component.c:78
+#: ../smime/gui/component.c:79
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
@@ -20199,11 +20216,11 @@ msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
-"Bevor Sie dieser Zertifizierungsstelle uneingeschränkt vertrauen, sollten "
-"Sie sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
+"Bevor Sie dieser Zertifizierungsstelle uneingeschränkt vertrauen, sollten Sie "
+"sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "möglich)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
 msgid "Certificate"
 msgstr "Zertifikat"
 
@@ -20279,11 +20296,11 @@ msgstr "Organisation (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Organisationseinheit (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
 msgid "SSL Server Certificate"
 msgstr "SSL-Server-Zertifikat"
 
@@ -20313,8 +20330,7 @@ msgstr "Gültigkeit"
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr ""
-"Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
+msgstr "Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
@@ -20339,159 +20355,159 @@ msgstr "_Sichern"
 msgid "_Edit CA Trust"
 msgstr "CA-Vertrauenswürdigkeit _bearbeiten"
 
-#: ../smime/lib/e-cert-db.c:912
+#: ../smime/lib/e-cert-db.c:910
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:226 ../smime/lib/e-cert.c:236
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr "Signieren"
 
-#: ../smime/lib/e-cert.c:418
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "Version"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "Version 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "Version 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "Version 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-cert.c:642
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:645
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 mit RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1-RSA-Verschlüsselung"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Verwendungszweck des Zertifikatsschlüssels"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape-Zertifikatart"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Schlüsselidentifikator der Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-cert.c:745
 msgid "Algorithm Identifier"
 msgstr "Algorithmusidentifikator"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:753
 msgid "Algorithm Parameters"
 msgstr "Algorithmus-Parameter"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:775
 msgid "Subject Public Key Info"
 msgstr "Infos zum öffentlichen Empfängerschlüssel"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-cert.c:780
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithmus des öffentlichen Empfängerschlüssels"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-cert.c:795
 msgid "Subject's Public Key"
 msgstr "Öffentlicher Schlüssel des Empfängers"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:816 ../smime/lib/e-cert.c:866
 msgid "Error: Unable to process extension"
 msgstr "Fehler: Erweiterung konnte nicht verarbeitet werden"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-cert.c:837 ../smime/lib/e-cert.c:849
 msgid "Object Signer"
 msgstr "Objektunterzeichner"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-cert.c:841
 msgid "SSL Certificate Authority"
 msgstr "SSL-Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-cert.c:845
 msgid "Email Certificate Authority"
 msgstr "E-Mail-Zertifizierungsstelle"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:874
 msgid "Signing"
 msgstr "Signieren"
 
 # CHECK
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:878
 msgid "Non-repudiation"
 msgstr "Unleugbarkeit"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:882
 msgid "Key Encipherment"
 msgstr "Schlüsselverschlüsselung"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:886
 msgid "Data Encipherment"
 msgstr "Datenverschlüsselung"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-cert.c:890
 msgid "Key Agreement"
 msgstr "Key-Agreement"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-cert.c:894
 msgid "Certificate Signer"
 msgstr "Zertifikatunterzeichner"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-cert.c:898
 msgid "CRL Signer"
 msgstr "CRL-Unterzeichner"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:947
 msgid "Critical"
 msgstr "Kritisch"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-cert.c:949 ../smime/lib/e-cert.c:952
 msgid "Not Critical"
 msgstr "Nicht-kritisch"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-cert.c:973
 msgid "Extensions"
 msgstr "Erweiterungen"
 
@@ -20503,40 +20519,40 @@ msgstr "Erweiterungen"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-cert.c:1051
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-cert.c:1107 ../smime/lib/e-cert.c:1230
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-cert.c:1116
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-cert.c:1171
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-cert.c:1190
 msgid "Subject Unique ID"
 msgstr "Eindeutige Empfängerkennung"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-cert.c:1236
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
-#: ../smime/lib/e-pkcs12.c:256
+#: ../smime/lib/e-pkcs12.c:255
 msgid "PKCS12 File Password"
 msgstr "PKCS12-Dateipasswort"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:256
 msgid "Enter password for PKCS12 file:"
 msgstr "Geben Sie das Passwort für die PKCS12-Datei ein:"
 
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:362
 msgid "Imported Certificate"
 msgstr "Importierte Zertifikate"
 
@@ -20640,8 +20656,8 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern "
-"und wählen Sie eine Zeitzone.\n"
+"Benutzen Sie die linke Maustaste, um einen Kartenausschnitt zu vergrößern und "
+"wählen Sie eine Zeitzone.\n"
 "Mit der rechten Maustaste können Sie die Ansicht verkleinern."
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
@@ -20696,15 +20712,19 @@ msgstr "Art der Ansicht"
 msgid "Type of view:"
 msgstr "Art der Ansicht:"
 
-#: ../widgets/misc/e-account-manager.c:353
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr "Die von Evolution _vorgegebene Reihenfolge für Konten verwenden"
+
+#: ../widgets/misc/e-account-manager.c:438
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:404
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:435
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -20721,7 +20741,7 @@ msgid "MIME Type:"
 msgstr "MIME-Typ:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-store.c:440
 msgid "_Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage _vorschlagen"
 
@@ -20757,32 +20777,32 @@ msgstr "Wird geladen"
 msgid "Saving"
 msgstr "Wird gespeichert"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:102
 msgid "Hide Attachment _Bar"
 msgstr "Anla_genleiste verbergen"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:104
+#: ../widgets/misc/e-attachment-paned.c:716
 msgid "Show Attachment _Bar"
 msgstr "Anla_genleiste anzeigen"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:428
 msgid "Add Attachment"
 msgstr "Anlage hinzufügen"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:431
 msgid "A_ttach"
 msgstr "Bei_legen"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:494
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Anlage speichern"
 msgstr[1] "Anlagen speichern"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+#: ../widgets/misc/e-attachment-store.c:523 ../widgets/misc/e-attachment.c:1809
+#: ../widgets/misc/e-attachment.c:2347
 msgid "attachment.dat"
 msgstr "Anlage.dat"
 
@@ -20832,44 +20852,44 @@ msgstr "Diese Anlage mit »%s« öffnen"
 msgid "Attached message"
 msgstr "Beigelegte Nachricht"
 
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2649
 msgid "A load operation is already in progress"
 msgstr "Ein Ladevorgang läuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2657
 msgid "A save operation is already in progress"
 msgstr "Ein Speichervorgang läuft bereits"
 
-#: ../widgets/misc/e-attachment.c:1953
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "»%s« konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:1956
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Die Anlage konnte nicht geladen werden"
 
-#: ../widgets/misc/e-attachment.c:2232
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "»%s« konnte nicht geöffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2235
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Die Anlage konnte nicht geöffnet werden"
 
-#: ../widgets/misc/e-attachment.c:2670
+#: ../widgets/misc/e-attachment.c:2665
 msgid "Attachment contents not loaded"
 msgstr "Anlagen wurden nicht geladen"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2741
 #, c-format
 msgid "Could not save '%s'"
 msgstr "»%s« konnte nicht gespeichert werden"
 
-#: ../widgets/misc/e-attachment.c:2749
+#: ../widgets/misc/e-attachment.c:2744
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Die Anlage konnte nicht gespeichert werden"
@@ -20880,7 +20900,7 @@ msgid "Ctrl-click to open a link"
 msgstr "Drücken Sie Strg und klicken Sie, um einen Link zu öffnen"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1250
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -21448,7 +21468,7 @@ msgid "A_vailable Fields:"
 msgstr "_Verfügbare Felder:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -21461,7 +21481,7 @@ msgid "Clear _All"
 msgstr "Alles _entfernen"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Descending"
 msgstr "Absteigend"
 
@@ -21564,60 +21584,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Objekt)"
 msgstr[1] "%s (%d Objekte)"
 
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "Customize Current View"
 msgstr "Aktuelle Ansicht anpassen"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Sort _Ascending"
 msgstr "A_ufsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Sort _Descending"
 msgstr "A_bsteigend sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1589
 msgid "_Unsort"
 msgstr "_Nicht sortieren"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "Group By This _Field"
 msgstr "Nach diesem _Feld gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Group By _Box"
 msgstr "Nach Fäc_hern gruppieren"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Remove This _Column"
 msgstr "_Diese Spalte entfernen"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Add a C_olumn..."
 msgstr "Spalte hin_zufügen …"
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1606
 msgid "A_lignment"
 msgstr "Aus_richtung"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../widgets/table/e-table-header-item.c:1609
 msgid "B_est Fit"
 msgstr "_Optimal"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Format Column_s..."
 msgstr "Spalten for_matieren …"
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1616
 msgid "Custo_mize Current View..."
 msgstr "A_ktuelle Ansicht anpassen …"
 
-#: ../widgets/table/e-table-header-item.c:1674
+#: ../widgets/table/e-table-header-item.c:1678
 msgid "_Sort By"
 msgstr "_Sortieren nach"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1692
+#: ../widgets/table/e-table-header-item.c:1696
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
@@ -21653,14 +21673,26 @@ msgstr "Klicken"
 msgid "sort"
 msgstr "Sortieren"
 
-#: ../widgets/text/e-text.c:2327
+#: ../widgets/text/e-text.c:2325
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../widgets/text/e-text.c:2339
+#: ../widgets/text/e-text.c:2337
 msgid "Input Methods"
 msgstr "Eingabemethoden"
 
+#~ msgid "Composer load/attach directory"
+#~ msgstr "Vorgabeordner für Anlagen im Nachrichteneditor"
+
+#~ msgid "Directory for loading/attaching files to composer."
+#~ msgstr "Vorgabeordner für Anlagen im Nachrichteneditor."
+
+#~ msgid "Initial file chooser folder"
+#~ msgstr "Ausgangsordner des Dateiwählers"
+
+#~ msgid "Initial folder for GtkFileChooser dialogs."
+#~ msgstr "Ausgangsordner des GtkFileChooser-Dialogs."
+
 #~ msgid "Local Folders"
 #~ msgstr "Lokale Ordner"
 
@@ -21786,8 +21818,7 @@ msgstr "Eingabemethoden"
 #~ msgstr "Wert der Kopfzeile enthält:"
 
 #~ msgid "%s plugin is available and the binary is installed."
-#~ msgstr ""
-#~ "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
+#~ msgstr "%s-Plugin ist verfügbar und das zugehörige Programm ist installiert."
 
 #~ msgid ""
 #~ "%s plugin is not available. Please check whether the package is installed."
@@ -21945,8 +21976,7 @@ msgstr "Eingabemethoden"
 #~ msgstr "Versandoptionen einfügen"
 
 #~ msgid "The participants will receive the following notification.\n"
-#~ msgstr ""
-#~ "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
+#~ msgstr "Die berechtigten Nutzer werden folgende Benachrichtigung erhalten.\n"
 
 #~ msgid "Add Send Options to GroupWise messages"
 #~ msgstr "Versandoptionen zu GroupWise-Nachrichten hinzufügen"
@@ -21993,8 +22023,8 @@ msgstr "Eingabemethoden"
 
 #~ msgid "You have to specify a valid user name to give proxy rights."
 #~ msgstr ""
-#~ "Sie müssen einen gültigen Benutzernamen eingeben, um Zugriff auf den "
-#~ "Proxy zu gewähren."
+#~ "Sie müssen einen gültigen Benutzernamen eingeben, um Zugriff auf den Proxy "
+#~ "zu gewähren."
 
 #~ msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
 #~ msgstr ""
@@ -22002,8 +22032,8 @@ msgstr "Eingabemethoden"
 
 #~ msgid "You have to specify a user name which you want to add to the list"
 #~ msgstr ""
-#~ "Sie müssen einen Benutzernamen festlegen, der zur Liste hinzugefügt "
-#~ "werden soll"
+#~ "Sie müssen einen Benutzernamen festlegen, der zur Liste hinzugefügt werden "
+#~ "soll"
 
 #~ msgid "Do you want to resend the meeting?"
 #~ msgstr "Wollen Sie diese Besprechung erneut verschicken?"
@@ -22217,8 +22247,8 @@ msgstr "Eingabemethoden"
 #~ "Der ausgewählte Kalender enthält bereits ein Ereignis für die vorliegende "
 #~ "E-Mail. Möchten Sie dennoch ein neues Ereignis erstellen?"
 #~ msgstr[1] ""
-#~ "Der ausgewählte Kalender enthält bereits Ereignisse für die vorliegenden "
-#~ "E-Mails. Möchten Sie dennoch neue Ereignisse erstellen?"
+#~ "Der ausgewählte Kalender enthält bereits Ereignisse für die vorliegenden E-"
+#~ "Mails. Möchten Sie dennoch neue Ereignisse erstellen?"
 
 #~ msgid ""
 #~ "Selected task list contains a task for the given mail already. Would you "
diff --git a/po/es.po b/po/es.po
index f11a486425..4e560f609f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,14 +12,14 @@
 # Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:566
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-09-28 08:36+0000\n"
-"PO-Revision-Date: 2011-09-28 10:39+0200\n"
+"POT-Creation-Date: 2011-10-07 14:28+0000\n"
+"PO-Revision-Date: 2011-10-08 14:47+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -296,7 +296,7 @@ msgstr "Aniversario"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:714
 #: ../calendar/gui/e-calendar-view.c:2063 ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
+#: ../shell/main.c:138
 msgid "Birthday"
 msgstr "Cumpleaños"
 
@@ -316,14 +316,14 @@ msgid "Calendar:"
 msgstr "Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:991
+#: ../addressbook/importers/evolution-vcard-importer.c:990
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:654
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:676
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2925
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -333,7 +333,7 @@ msgstr "Editor de contactos"
 #: ../addressbook/gui/widgets/eab-contact-display.c:633
 #: ../addressbook/gui/widgets/eab-contact-display.c:641
 #: ../addressbook/gui/widgets/eab-contact-display.c:1019
-#: ../smime/lib/e-cert.c:837
+#: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "Correo-e"
 
@@ -578,20 +578,20 @@ msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:670
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2919
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3416
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3399
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3417
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3730
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3744
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,23 +599,23 @@ msgstr ""
 "Los datos del contacto son inválidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3749
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "«%s» tiene un formato inválido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3757
 #, 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:3756
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» está vacío"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3785
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3799
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
@@ -722,7 +722,7 @@ msgid "_List name:"
 msgstr "_Nombre de la lista:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
@@ -802,7 +802,7 @@ msgstr "Combinar contacto"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
@@ -1235,7 +1235,7 @@ msgstr "Charla por vídeo"
 #: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:517
+#: ../modules/calendar/e-cal-shell-view.c:523
 #: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:528
@@ -1471,11 +1471,11 @@ msgstr "Formato de intercambio de datos LDAP (.ldif)"
 msgid "Evolution LDIF importer"
 msgstr "Importador de LDIF de Evolution"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:658
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:659
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "Evolution vCard Importer"
 msgstr "Importador de vCard de Evolution"
 
@@ -1503,7 +1503,7 @@ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
 #: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:662
 #: ../plugins/caldav/caldav-browse-server.c:220
 #: ../plugins/caldav/caldav-browse-server.c:1469 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:314
+#: ../smime/gui/certificate-manager.c:313
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1690,19 +1690,19 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "¿Seguro que quiere eliminar esta cita?"
 
 #: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:191
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "¿Seguro que quiere eliminar esta reunión?"
 
 #: ../calendar/calendar.error.xml.h:26
-#: ../calendar/gui/dialogs/delete-comp.c:197
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "¿Seguro que quiere eliminar esta nota?"
 
 #: ../calendar/calendar.error.xml.h:27
-#: ../calendar/gui/dialogs/delete-comp.c:194
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "¿Seguro que quiere eliminar esta tarea?"
@@ -1980,7 +1980,7 @@ msgstr "Sus tareas no estarán disponibles hasta que reinicie Evolution."
 msgid "_Discard Changes"
 msgstr "_Descartar cambios"
 
-#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:317
+#: ../calendar/calendar.error.xml.h:87 ../composer/e-composer-actions.c:316
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -1989,7 +1989,7 @@ msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
 #: ../calendar/calendar.error.xml.h:89
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:167
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Enviar"
@@ -2014,7 +2014,7 @@ msgstr[1] "horas"
 #. * (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/alarm-notify/alarm-notify-dialog.c:133
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
@@ -2034,8 +2034,8 @@ msgstr "Descartar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1739
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1749
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
 #: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Lugar:"
@@ -2084,33 +2084,33 @@ msgstr "lugar de la cita"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1588
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1599
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1607
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 msgid "No location information available."
 msgstr "No hay información del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Tiene un recordatorio"
 msgstr[1] "Tiene %d recordatorios"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1853
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1857
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2122,7 +2122,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:1894
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1893
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2139,7 +2139,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1909
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -2149,7 +2149,7 @@ msgstr "hora inválida"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:71 ../calendar/gui/e-alarm-list.c:405
-#: ../calendar/gui/misc.c:118
+#: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2158,7 +2158,7 @@ msgstr[1] "%d horas"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/e-alarm-list.c:411
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2169,26 +2169,26 @@ msgstr[1] "%d minutos"
 #. 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:81 ../calendar/gui/e-alarm-list.c:417
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:111
 msgid "Day View"
 msgstr "Vista diaria"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:114
 msgid "Work Week View"
 msgstr "Vista de la semana laboral"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Week View"
 msgstr "Vista semanal"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Month View"
 msgstr "Vista mensual"
 
@@ -2241,44 +2241,60 @@ msgstr "La descripción contiene"
 msgid "Do Not Exist"
 msgstr "No existen"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:11
+msgid "Exactly"
+msgstr "Exactamente"
+
+#: ../calendar/gui/caltypes.xml.h:12 ../calendar/gui/memotypes.xml.h:10
 #: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Existen"
 
-#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:13
+msgid "Less Than"
+msgstr "Menor que"
+
+#: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:863
+#: ../plugins/publish-calendar/publish-calendar.c:855
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Lugar"
 
-#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:15
+msgid "More Than"
+msgstr "Más que"
+
+#: ../calendar/gui/caltypes.xml.h:16
+msgid "Occurs"
+msgstr "Sucede"
+
+#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/e-cal-list-view.c:242
 #: ../calendar/gui/e-cal-model.c:777 ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/e-cal-list-view.c:241
 #: ../calendar/gui/e-cal-model.c:768 ../calendar/gui/e-cal-model.c:775
 #: ../calendar/gui/e-task-table.c:502 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Público"
 
-#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/caltypes.xml.h:20
 #: ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/caltypes.xml.h:21
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
@@ -2287,51 +2303,51 @@ msgstr "Repetición"
 msgid "Summary"
 msgstr "Resumen"
 
-#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "El resumen contiene"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/caltypes.xml.h:23 ../calendar/gui/memotypes.xml.h:16
 #: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "contiene"
 
-#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "no contiene"
 
-#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/caltypes.xml.h:25 ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "es"
 
-#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "no es"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:636
+#: ../calendar/gui/dialogs/alarm-dialog.c:635
 msgid "Edit Reminder"
 msgstr "Editar recordatorio"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
 #: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Mostrar una alerta emergente"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
 #: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
 #: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:830
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
 #: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Enviar un correo-e"
@@ -2422,7 +2438,7 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "inicio de la cita"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:245
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -2441,11 +2457,11 @@ msgid "Type:"
 msgstr "Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:185
-#: ../modules/addressbook/addressbook-config.c:530
+#: ../modules/addressbook/addressbook-config.c:527
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:155
+#: ../calendar/gui/dialogs/calendar-setup.c:248 ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
@@ -2481,10 +2497,10 @@ msgstr "Colo_r:"
 #: ../calendar/gui/dialogs/calendar-setup.c:460
 #: ../calendar/gui/dialogs/calendar-setup.c:471
 #: ../mail/em-folder-properties.c:235 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1080
-#: ../modules/addressbook/autocompletion-config.c:228
+#: ../modules/addressbook/addressbook-config.c:1077
+#: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3045
+#: ../plugins/itip-formatter/itip-formatter.c:3038
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2523,48 +2539,48 @@ msgstr "Propiedades de lista de notas"
 msgid "New Memo List"
 msgstr "Lista de notas nueva"
 
-#: ../calendar/gui/dialogs/changed-comp.c:62
+#: ../calendar/gui/dialogs/changed-comp.c:61
 msgid "This event has been deleted."
 msgstr "Se ha borrado este acontecimiento."
 
-#: ../calendar/gui/dialogs/changed-comp.c:66
+#: ../calendar/gui/dialogs/changed-comp.c:65
 msgid "This task has been deleted."
 msgstr "Se ha borrado esta tarea."
 
-#: ../calendar/gui/dialogs/changed-comp.c:70
+#: ../calendar/gui/dialogs/changed-comp.c:69
 msgid "This memo has been deleted."
 msgstr "Se ha borrado esta nota."
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ha hecho cambios. ¿Quiere olvidar esos cambios y cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:81
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿quiere cerrar el editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:86
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Este acontecimiento ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:90
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Esta tarea ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:94
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Esta nota ha cambiado."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Ha realizado cambios. ¿Quiere olvidar esos cambios y actualizar el "
 "editor?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿quiere actualizar el editor?"
@@ -2693,7 +2709,7 @@ msgid "_Insert"
 msgstr "_Insertar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1225
-#: ../composer/e-composer-actions.c:340
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Opciones"
 
@@ -2703,12 +2719,12 @@ msgid "_View"
 msgstr "_Ver"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../composer/e-composer-actions.c:289
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "_Adjunto…"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1244
-#: ../composer/e-composer-actions.c:291
+#: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
@@ -2791,12 +2807,12 @@ msgid "Recent _Documents"
 msgstr "_Documentos recientes"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2078
-#: ../composer/e-composer-actions.c:508
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2428
-#: ../calendar/gui/dialogs/comp-editor.c:2591
+#: ../calendar/gui/dialogs/comp-editor.c:2426
+#: ../calendar/gui/dialogs/comp-editor.c:2589
 #: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
@@ -2828,74 +2844,74 @@ msgstr "No se puede crear el objeto"
 msgid "Could not open source"
 msgstr "No se puede abrir el origen"
 
-#: ../calendar/gui/dialogs/delete-comp.c:214
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "¿_Eliminar este elemento de todos los otros buzones del destinatario?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:217
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Retract comment"
 msgstr "Co_ntraer comentario"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:57
+#: ../calendar/gui/dialogs/delete-error.c:56
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "No se pudo eliminar el acontecimiento debido a un error de dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:61
+#: ../calendar/gui/dialogs/delete-error.c:60
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "No se pudo eliminar la tarea debido a un error de dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:65
+#: ../calendar/gui/dialogs/delete-error.c:64
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "No se pudo eliminar la nota debido a un error de dbus: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:69
+#: ../calendar/gui/dialogs/delete-error.c:68
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "No se pudo eliminar el elemento debido a un error de dbus: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "No se pudo eliminar el acontecimiento porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "No se pudo eliminar la tarea porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "No se pudo eliminar la nota porque se ha denegado el permiso"
 
-#: ../calendar/gui/dialogs/delete-error.c:85
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "No se pudo eliminar el elemento porque se ha denegado el permiso"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:93
+#: ../calendar/gui/dialogs/delete-error.c:92
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "No se pudo eliminar el acontecimiento debido a un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:97
+#: ../calendar/gui/dialogs/delete-error.c:96
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "No se pudo eliminar la tarea debido a un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:101
+#: ../calendar/gui/dialogs/delete-error.c:100
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "No se pudo eliminar la nota debido a un error: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:105
+#: ../calendar/gui/dialogs/delete-error.c:104
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "No se pudo eliminar el elemento debido a un error: %s"
@@ -2962,7 +2978,7 @@ msgstr "_Disponibilidad"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar información de disponibilidad para los participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3310
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3308
 msgid "Appointment"
 msgstr "Cita"
 
@@ -3225,7 +3241,7 @@ msgstr "Seleccionar _hoy"
 msgid "September"
 msgstr "Septiembre"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3314
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3312
 msgid "Memo"
 msgstr "Nota"
 
@@ -3277,52 +3293,52 @@ msgstr "_Para:"
 msgid "_List:"
 msgstr "_Lista:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr ""
 "Está modificando un acontecimiento que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:57
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Está delegando un acontecimiento que se repite. ¿Qué quiere delegar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:61
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 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:65
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Está modificando una nota que se repite. ¿Qué quiere modificar?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Esta instancia únicamente"
 
-#: ../calendar/gui/dialogs/recur-comp.c:95
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Esta instancia y las anteriores"
 
-#: ../calendar/gui/dialogs/recur-comp.c:101
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Esta instancia y las futuras"
 
-#: ../calendar/gui/dialogs/recur-comp.c:106
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que Evolution no puede editar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:964
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición es inválida"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1004
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "La fecha de finalización de la repetición es anterior al inicio del "
@@ -3330,7 +3346,7 @@ 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:1034
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "on"
 msgstr "en"
 
@@ -3338,7 +3354,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 msgid "first"
 msgstr "primer"
 
@@ -3347,7 +3363,7 @@ msgstr "primer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1103
+#: ../calendar/gui/dialogs/recurrence-page.c:1101
 msgid "second"
 msgstr "segundo"
 
@@ -3355,7 +3371,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "third"
 msgstr "tercer"
 
@@ -3363,7 +3379,7 @@ msgstr "tercer"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3371,7 +3387,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "fifth"
 msgstr "quinto"
 
@@ -3379,13 +3395,13 @@ msgstr "quinto"
 #. * (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:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "last"
 msgstr "último"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1147
+#: ../calendar/gui/dialogs/recurrence-page.c:1145
 msgid "Other Date"
 msgstr "Otra fecha"
 
@@ -3393,7 +3409,7 @@ msgstr "Otra fecha"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1153
+#: ../calendar/gui/dialogs/recurrence-page.c:1151
 msgid "1st to 10th"
 msgstr "del 1 al 10"
 
@@ -3401,7 +3417,7 @@ msgstr "del 1 al 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1159
+#: ../calendar/gui/dialogs/recurrence-page.c:1157
 msgid "11th to 20th"
 msgstr "del 11 al 20"
 
@@ -3409,41 +3425,41 @@ msgstr "del 11 al 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1163
 msgid "21st to 31st"
 msgstr "del 21 al 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "lunes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "martes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "miércoles"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "jueves"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "viernes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "sábado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "domingo"
@@ -3451,31 +3467,31 @@ msgstr "domingo"
 #. 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:1321
+#: ../calendar/gui/dialogs/recurrence-page.c:1319
 msgid "on the"
 msgstr "en el"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1496
+#: ../calendar/gui/dialogs/recurrence-page.c:1494
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2214
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Add exception"
 msgstr "Añadir excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2255
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Could not get a selection to modify."
 msgstr "No es posible obtener una selección que modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2261
+#: ../calendar/gui/dialogs/recurrence-page.c:2257
 msgid "Modify exception"
 msgstr "Modificar excepción"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2305
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Could not get a selection to delete."
 msgstr "No es posible obtener una selección que eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2439
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
@@ -3537,11 +3553,11 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:197
 msgid "Send my reminders with this event"
 msgstr "Enviar mis recordatorios con este evento"
 
-#: ../calendar/gui/dialogs/send-comp.c:200
+#: ../calendar/gui/dialogs/send-comp.c:199
 msgid "Notify new attendees _only"
 msgstr "Notificar sól_o a los participantes"
 
@@ -3560,7 +3576,7 @@ msgstr "Página web"
 #: ../calendar/gui/e-cal-model-tasks.c:440
 #: ../calendar/gui/e-cal-model-tasks.c:725 ../calendar/gui/e-task-table.c:219
 #: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:606
-#: ../calendar/gui/print.c:3400 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/print.c:3398 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3573,7 +3589,7 @@ msgstr "Cancelado"
 #: ../calendar/gui/e-cal-model-tasks.c:723
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3397
+#: ../calendar/gui/e-task-table.c:605 ../calendar/gui/print.c:3395
 #: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "Terminado"
@@ -3593,7 +3609,7 @@ msgstr "Alta"
 #: ../calendar/gui/e-cal-model-tasks.c:721
 #: ../calendar/gui/e-cal-model-tasks.c:799 ../calendar/gui/e-task-table.c:215
 #: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:604
-#: ../calendar/gui/print.c:3394
+#: ../calendar/gui/print.c:3392
 msgid "In Progress"
 msgstr "En proceso"
 
@@ -3620,7 +3636,7 @@ msgstr "Normal"
 #: ../calendar/gui/e-cal-model-tasks.c:434
 #: ../calendar/gui/e-cal-model-tasks.c:719 ../calendar/gui/e-task-table.c:213
 #: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:603
-#: ../calendar/gui/print.c:3391 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/print.c:3389 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
@@ -3676,7 +3692,7 @@ msgstr "Pulse para cambiar o ver los detalles del estado de la tarea"
 msgid "_Send Options"
 msgstr "Opciones de _envío"
 
-#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3312
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3310
 #: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Tarea"
@@ -3918,11 +3934,11 @@ msgstr "No"
 #: ../calendar/gui/e-cal-model.c:781 ../calendar/gui/e-meeting-list-view.c:178
 #: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
-#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1151
-#: ../calendar/gui/print.c:1168 ../e-util/e-charset.c:52
+#: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1166 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:469
-#: ../plugins/itip-formatter/itip-formatter.c:2697
+#: ../plugins/itip-formatter/itip-formatter.c:2690
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -3942,14 +3958,14 @@ msgstr "Abriendo %s"
 #: ../calendar/gui/e-cal-model.c:3416
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2685
+#: ../plugins/itip-formatter/itip-formatter.c:2678
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-cal-model.c:3417
 #: ../calendar/gui/e-meeting-list-view.c:215
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2691
+#: ../plugins/itip-formatter/itip-formatter.c:2684
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -3963,7 +3979,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-cal-model.c:3419
 #: ../calendar/gui/e-meeting-list-view.c:217
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2694
+#: ../plugins/itip-formatter/itip-formatter.c:2687
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4055,7 +4071,7 @@ msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/print.c:3346
+#: ../calendar/gui/e-calendar-view.c:1928 ../calendar/gui/print.c:3344
 #, c-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -4120,7 +4136,7 @@ msgstr "Seleccionar…"
 #. * order but don't change the specifiers or add
 #. * anything.
 #: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1821
-#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1968
+#: ../calendar/gui/e-week-view-main-item.c:215 ../calendar/gui/print.c:1966
 msgid "%A %d %B"
 msgstr "%A %e de %B"
 
@@ -4151,15 +4167,15 @@ msgstr "%e de %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:1021 ../calendar/gui/e-week-view.c:757
-#: ../calendar/gui/print.c:977 ../calendar/gui/print.c:996
-#: ../calendar/gui/print.c:2484 ../calendar/gui/print.c:2504
+#: ../calendar/gui/print.c:975 ../calendar/gui/print.c:994
+#: ../calendar/gui/print.c:2482 ../calendar/gui/print.c:2502
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1024 ../calendar/gui/e-week-view.c:760
-#: ../calendar/gui/print.c:982 ../calendar/gui/print.c:998
-#: ../calendar/gui/print.c:2489 ../calendar/gui/print.c:2506
+#: ../calendar/gui/print.c:980 ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2487 ../calendar/gui/print.c:2504
 msgid "pm"
 msgstr "pm"
 
@@ -4187,49 +4203,49 @@ msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1147
+#: ../calendar/gui/e-meeting-store.c:1047 ../calendar/gui/print.c:1145
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1148 ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/print.c:1146 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1147
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1150
+#: ../calendar/gui/print.c:1148
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1164
+#: ../calendar/gui/print.c:1162
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1165
+#: ../calendar/gui/e-meeting-store.c:1050 ../calendar/gui/print.c:1163
 msgid "Required Participant"
 msgstr "Participante requerido"
 
 #: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1166
+#: ../calendar/gui/print.c:1164
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1167
+#: ../calendar/gui/print.c:1165
 msgid "Non-Participant"
 msgstr "No participan"
 
@@ -4269,7 +4285,7 @@ msgstr "Razón del fallo: %s"
 #: ../calendar/gui/e-meeting-store.c:1891
 #: ../plugins/caldav/caldav-browse-server.c:957
 #: ../plugins/google-account-setup/google-source.c:460
-#: ../plugins/publish-calendar/publish-calendar.c:345
+#: ../plugins/publish-calendar/publish-calendar.c:337
 #: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Introduzca contraseña"
@@ -4437,7 +4453,7 @@ msgstr "Pulse aquí para añadir una nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2273
+#: ../calendar/gui/e-task-table.c:652 ../calendar/gui/print.c:2271
 #: ../calendar/importers/icalendar-importer.c:85
 #: ../calendar/importers/icalendar-importer.c:1044
 #: ../modules/calendar/e-calendar-preferences.ui.h:41
@@ -4477,7 +4493,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:232 ../calendar/gui/print.c:1949
+#: ../calendar/gui/e-week-view-main-item.c:232 ../calendar/gui/print.c:1947
 msgid "%d %B"
 msgstr "%e de %B"
 
@@ -4756,226 +4772,226 @@ msgstr "No se pudo reservar un recurso, error: "
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante en el acontecimiento."
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:581
+#: ../calendar/gui/print.c:579
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:582
+#: ../calendar/gui/print.c:580
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:583
+#: ../calendar/gui/print.c:581
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:584
+#: ../calendar/gui/print.c:582
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:585
+#: ../calendar/gui/print.c:583
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:586
+#: ../calendar/gui/print.c:584
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:587
+#: ../calendar/gui/print.c:585
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:644
+#: ../calendar/gui/print.c:642
 msgid "We"
 msgstr "Mi"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Th"
 msgstr "Ju"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Fr"
 msgstr "Vi"
 
-#: ../calendar/gui/print.c:645
+#: ../calendar/gui/print.c:643
 msgid "Sa"
 msgstr "Sa"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3139
+#: ../calendar/gui/print.c:3137
 msgid " to "
 msgstr " a "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3149
+#: ../calendar/gui/print.c:3147
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3155
+#: ../calendar/gui/print.c:3153
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3165
+#: ../calendar/gui/print.c:3163
 msgid " (Due "
 msgstr " (Vence "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3172
+#: ../calendar/gui/print.c:3170
 msgid "Due "
 msgstr "Vence "
 
-#: ../calendar/gui/print.c:3337
+#: ../calendar/gui/print.c:3335
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumen: %s"
 
-#: ../calendar/gui/print.c:3364
+#: ../calendar/gui/print.c:3362
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3407
+#: ../calendar/gui/print.c:3405
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3422
+#: ../calendar/gui/print.c:3420
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridad: %s"
 
-#: ../calendar/gui/print.c:3440
+#: ../calendar/gui/print.c:3438
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaje completado: %i"
 
-#: ../calendar/gui/print.c:3451
+#: ../calendar/gui/print.c:3449
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3464
+#: ../calendar/gui/print.c:3462
 #, c-format
 msgid "Categories: %s"
 msgstr "Categorías: %s"
 
-#: ../calendar/gui/print.c:3475
+#: ../calendar/gui/print.c:3473
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -6736,160 +6752,160 @@ msgstr "Pacífico/Yap"
 msgid "Save as..."
 msgstr "Guardar como…"
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:295
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "Cierra el archivo actual"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "_Mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr "Abrir la ventana de mensaje nuevo"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "Guardar _como…"
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr "_Codificación de caracteres"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "_Imprimir…"
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "Vist_a previa de impresión"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "Guardar como _borrador"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "Guardar como borrador"
 
-#: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:353
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:353
 msgid "S_end"
 msgstr "_Enviar"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
 msgstr "Enviar este mensaje"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr "Cif_rar con PGP"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr "Cifrar este mensaje con PGP"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr "_Firmar con PGP"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con su clave GPG"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr "_Galería de imágenes"
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:398
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Mostrar una colección de imágenes que puede arrastrar hasta su mensaje"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr "_Priorizar mensaje"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr "Establecer la prioridad del mensaje a alta"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr "_Solicitar confirmación de lectura"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr "Obtener notificación de entrega cuando su mensaje sea leído"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "C_ifrar con S/MIME"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Cifrar este mensaje con su certificado de cifrado S/MIME"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "Fi_rmar con S/MIME"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Firmar este mensaje con su certificado de firma S/MIME"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "Campo «Cc_o»"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Cco»"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "Campo «_Cc»"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Cc»"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "Campo «_Responder a»"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Conmutador que indica si se muestra el campo «Responder a»"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 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-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6897,35 +6913,35 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:1018
 msgid "Fr_om:"
 msgstr "_De:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Reply-To:"
 msgstr "_Responder a:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1031
 msgid "_To:"
 msgstr "_Para:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:1036
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:1041
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:1046
 msgid "_Post To:"
 msgstr "_Publicar en:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:1050
 msgid "S_ubject:"
 msgstr "_Asunto:"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:1059
 msgid "Si_gnature:"
 msgstr "_Firma:"
 
@@ -6957,7 +6973,7 @@ msgstr "Buscar y reemplazar texto"
 msgid "Save draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:815
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6965,7 +6981,7 @@ msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:824
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6974,17 +6990,17 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1702 ../composer/e-msg-composer.c:2086
+#: ../composer/e-msg-composer.c:1702 ../composer/e-msg-composer.c:2091
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:4231
+#: ../composer/e-msg-composer.c:4260
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no puede "
 "editarse."
 
-#: ../composer/e-msg-composer.c:4936
+#: ../composer/e-msg-composer.c:4964
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
@@ -7093,7 +7109,7 @@ 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."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:126
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "El error devuelto fue «{0}»."
 
@@ -7274,7 +7290,7 @@ msgstr ""
 "obtener su correo."
 
 #: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2289 ../mail/em-account-editor.c:2425
+#: ../mail/em-account-editor.c:2290 ../mail/em-account-editor.c:2426
 msgid "Identity"
 msgstr "Identidad"
 
@@ -7326,7 +7342,7 @@ msgid "Back - Receiving options"
 msgstr "Atrás - Opciones de recepción"
 
 #: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3377
+#: ../mail/em-account-editor.c:3378
 msgid "Defaults"
 msgstr "Predeterminados"
 
@@ -7447,7 +7463,7 @@ msgstr "Notificaciones de acontecimientos del calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alertas de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:999
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1000
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
@@ -7587,7 +7603,7 @@ msgstr "visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1856
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7667,19 +7683,19 @@ msgstr "Usar los valores predeterminados del sistema"
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(Nombre del archivo desconocido)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:154
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Escribiendo «%s»"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:160
+#: ../e-util/e-file-utils.c:159
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Escribiendo «%s» a «%s»"
@@ -7730,7 +7746,7 @@ msgstr "¿Quiere sobreescribirlo?"
 msgid "File exists \"{0}\"."
 msgstr "El archivo existe «{0}»."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:166
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
@@ -7777,7 +7793,7 @@ msgstr "Cco"
 #: ../em-format/em-format-quote.c:464 ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1151
+#: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Asunto"
 
@@ -8058,7 +8074,7 @@ msgstr "Falta la fecha."
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:91
 msgid "Missing name."
 msgstr "Falta el nombre."
 
@@ -8170,24 +8186,24 @@ msgid "Ask for each message"
 msgstr "Preguntar por cada mensaje"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1833 ../widgets/misc/e-account-tree-view.c:265
+#: ../mail/em-account-editor.c:1832 ../widgets/misc/e-account-tree-view.c:265
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../mail/em-account-editor.c:2237
+#: ../mail/em-account-editor.c:2233
 msgid "Fil_e:"
 msgstr "_Archivo:"
 
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.ui.h:157
+#: ../mail/em-account-editor.c:2233 ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "R_uta:"
 
-#: ../mail/em-account-editor.c:2286
+#: ../mail/em-account-editor.c:2287
 msgid "Mail Configuration"
 msgstr "Configuración del correo"
 
-#: ../mail/em-account-editor.c:2287
+#: ../mail/em-account-editor.c:2288
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8197,7 +8213,7 @@ msgstr ""
 "\n"
 "Para comenzar, pulse «Continuar»."
 
-#: ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2291
 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 "
@@ -8207,19 +8223,19 @@ msgstr ""
 "hace falta que los rellene, a menos que quiera incluir esta información en "
 "el correo-e que envíe."
 
-#: ../mail/em-account-editor.c:2292 ../mail/em-account-editor.c:2484
+#: ../mail/em-account-editor.c:2293 ../mail/em-account-editor.c:2485
 msgid "Receiving Email"
 msgstr "Recepción de correo"
 
-#: ../mail/em-account-editor.c:2293
+#: ../mail/em-account-editor.c:2294
 msgid "Please configure the following account settings."
 msgstr "Configure las siguientes opciones de la cuenta."
 
-#: ../mail/em-account-editor.c:2295 ../mail/em-account-editor.c:3081
+#: ../mail/em-account-editor.c:2296 ../mail/em-account-editor.c:3082
 msgid "Sending Email"
 msgstr "Envío de correo"
 
-#: ../mail/em-account-editor.c:2296
+#: ../mail/em-account-editor.c:2297
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -8228,11 +8244,11 @@ msgstr ""
 "seguro, pregúntele a su administrador de sistemas o a su Proveedor de "
 "Servicios de Internet."
 
-#: ../mail/em-account-editor.c:2298 ../mail/mail-config.ui.h:1
+#: ../mail/em-account-editor.c:2299 ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Información de la cuenta"
 
-#: ../mail/em-account-editor.c:2299
+#: ../mail/em-account-editor.c:2300
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8240,11 +8256,11 @@ msgstr ""
 "Introduzca un nombre descriptivo para esta cuenta en el espacio de abajo.\n"
 "Este nombre se usará sólo para mostrarlo."
 
-#: ../mail/em-account-editor.c:2303
+#: ../mail/em-account-editor.c:2304
 msgid "Done"
 msgstr "Hecho"
 
-#: ../mail/em-account-editor.c:2304
+#: ../mail/em-account-editor.c:2305
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8258,44 +8274,44 @@ msgstr ""
 "\n"
 "Pulse «Aplicar» para guardar su configuración."
 
-#: ../mail/em-account-editor.c:2843
+#: ../mail/em-account-editor.c:2844
 msgid "Check for _new messages every"
 msgstr "Comprobar si hay mensajes _nuevos cada"
 
-#: ../mail/em-account-editor.c:2851
+#: ../mail/em-account-editor.c:2852
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:3520 ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3521 ../mail/mail-config.ui.h:102
 msgid "Security"
 msgstr "Seguridad"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3575 ../mail/em-account-editor.c:3658
+#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
 msgid "Receiving Options"
 msgstr "Opciones de recepción"
 
-#: ../mail/em-account-editor.c:3576 ../mail/em-account-editor.c:3659
+#: ../mail/em-account-editor.c:3577 ../mail/em-account-editor.c:3660
 msgid "Checking for New Messages"
 msgstr "Comprobando si hay mensajes nuevos"
 
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1416 ../mail/mail-config.ui.h:14
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../mail/em-format-html-display.c:1418 ../mail/mail-config.ui.h:14
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:174
+#: ../widgets/misc/e-attachment-paned.c:179
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
 #: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../widgets/misc/e-attachment-paned.c:700
 msgid "Icon View"
 msgstr "Vista de icono"
 
 #: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../widgets/misc/e-attachment-paned.c:702
 msgid "List View"
 msgstr "Vista de lista"
 
@@ -8333,52 +8349,52 @@ msgstr "Enviar un mensaje de respuesta a esta dirección"
 msgid "Create Search _Folder"
 msgstr "Crear carpeta de _búsqueda"
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../mail/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Guardando mensaje en la carpeta «%s»"
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../mail/e-mail-folder-utils.c:270
 msgid "Forwarded messages"
 msgstr "Mensajes reenviados"
 
-#: ../mail/e-mail-folder-utils.c:391
+#: ../mail/e-mail-folder-utils.c:385
 msgid "Scanning messages for duplicates"
 msgstr "Buscando mensajes duplicados"
 
-#: ../mail/e-mail-folder-utils.c:584
+#: ../mail/e-mail-folder-utils.c:576
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaje"
 msgstr[1] "Descargando %d mensajes"
 
-#: ../mail/e-mail-folder-utils.c:834
+#: ../mail/e-mail-folder-utils.c:824
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Eliminando carpeta «%s»"
 
-#: ../mail/e-mail-folder-utils.c:968
+#: ../mail/e-mail-folder-utils.c:956
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Se ha quitado el archivo «%s»."
 
-#: ../mail/e-mail-folder-utils.c:972
+#: ../mail/e-mail-folder-utils.c:960
 msgid "File has been removed."
 msgstr "Se quitó el archivo."
 
-#: ../mail/e-mail-folder-utils.c:1031
+#: ../mail/e-mail-folder-utils.c:1019
 msgid "Removing attachments"
 msgstr "Quitando adjuntos"
 
-#: ../mail/e-mail-folder-utils.c:1195
+#: ../mail/e-mail-folder-utils.c:1181
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Guardando %d mensaje"
 msgstr[1] "Guardando %d mensajes"
 
-#: ../mail/e-mail-folder-utils.c:1539 ../mail/em-folder-utils.c:628
+#: ../mail/e-mail-folder-utils.c:1525 ../mail/em-folder-utils.c:628
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "URI « %s» de la carpeta no válida"
@@ -8896,7 +8912,7 @@ msgstr "Quitar correos _duplicados"
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar los mensajes seleccionados para buscar duplicados"
 
-#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2113 ../mail/mail.error.xml.h:110
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
@@ -8906,7 +8922,7 @@ msgstr "Responder a _todos"
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2120 ../mail/mail.error.xml.h:111
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
@@ -9174,30 +9190,30 @@ msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
-#: ../mail/e-mail-session.c:878
+#: ../mail/e-mail-session.c:798
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../mail/e-mail-session.c:882
+#: ../mail/e-mail-session.c:802
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../mail/e-mail-session.c:886
+#: ../mail/e-mail-session.c:806
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../mail/e-mail-session.c:890
+#: ../mail/e-mail-session.c:810
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../mail/e-mail-session.c:941
+#: ../mail/e-mail-session.c:861
 #, c-format
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
-#: ../mail/e-mail-session.c:1054
+#: ../mail/e-mail-session.c:974
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -9205,23 +9221,23 @@ msgstr ""
 "No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
 "mensaje."
 
-#: ../mail/e-mail-session.c:1063
+#: ../mail/e-mail-session.c:983
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje."
 
-#: ../mail/e-mail-session-utils.c:419
+#: ../mail/e-mail-session-utils.c:415
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "No se puede obtener el servicio de transporte para la cuenta «%s»"
 
-#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:638
+#: ../mail/e-mail-session-utils.c:500 ../mail/mail-ops.c:638
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
-#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/e-mail-session-utils.c:524 ../mail/e-mail-session-utils.c:558
 #: ../mail/mail-ops.c:657 ../mail/mail-ops.c:691
 #, c-format
 msgid ""
@@ -9231,32 +9247,32 @@ msgstr ""
 "Falló al anexar a %s: %s\n"
 "En su lugar se anexará a la carpeta local «Correo enviado»."
 
-#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:711
+#: ../mail/e-mail-session-utils.c:578 ../mail/mail-ops.c:711
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Falló anexar a la carpeta local «Correo enviado»: %s"
 
-#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:832
+#: ../mail/e-mail-session-utils.c:788 ../mail/mail-ops.c:832
 #: ../mail/mail-ops.c:928
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: ../mail/e-mail-session-utils.c:873
+#: ../mail/e-mail-session-utils.c:862
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Desuscribiéndose de la carpeta «%s»"
 
-#: ../mail/e-mail-store-utils.c:168
+#: ../mail/e-mail-store-utils.c:166
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Desconectando de «%s»"
 
-#: ../mail/e-mail-store-utils.c:259
+#: ../mail/e-mail-store-utils.c:255
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Reconectándose con «%s»"
 
-#: ../mail/e-mail-store-utils.c:334
+#: ../mail/e-mail-store-utils.c:328
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando la cuenta «%s» para desconexión"
@@ -9758,7 +9774,7 @@ msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
 #: ../mail/em-format-html.c:2968
-#: ../plugins/mail-notification/mail-notification.c:401
+#: ../plugins/mail-notification/mail-notification.c:403
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
@@ -9856,7 +9872,7 @@ msgstr "_Ver certificado"
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:566
+#: ../mail/em-format-html-display.c:568
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -9864,39 +9880,39 @@ msgstr ""
 "Evolution no puede mostrar este correo debido a que es demasiado grande para "
 "procesarlo. Puede verlo sin formato o con un editor de texto externo."
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:758
 msgid "Save Image"
 msgstr "Guardar imagen"
 
-#: ../mail/em-format-html-display.c:804
+#: ../mail/em-format-html-display.c:806
 msgid "Save _Image..."
 msgstr "Guardar _imagen…"
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-format-html-display.c:808
 msgid "Save the image to a file"
 msgstr "Guardar la imagen en un archivo"
 
-#: ../mail/em-format-html-display.c:1034
+#: ../mail/em-format-html-display.c:1036
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:1046
+#: ../mail/em-format-html-display.c:1048
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1054
+#: ../mail/em-format-html-display.c:1056
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1335 ../mail/em-format-html-display.c:1386
+#: ../mail/em-format-html-display.c:1337 ../mail/em-format-html-display.c:1388
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:1337
+#: ../mail/em-format-html-display.c:1339
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1408
+#: ../mail/em-format-html-display.c:1410
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -10109,14 +10125,10 @@ msgid "Composer Window default width"
 msgstr "Anchura predeterminada de la ventana de redacción de mensajes"
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "Carpeta de carga/adjuntos del editor"
-
-#: ../mail/evolution-mail.schemas.in.h:27
 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.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -10124,7 +10136,7 @@ msgstr ""
 "Comprime la visualización de direcciones en A/CC/CCO al número especificado "
 "en address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10132,11 +10144,11 @@ msgstr ""
 "Controla la frecuencia con la que los cambios locales se sincronizan con el "
 "servidor de correo-e remoto. El intervalo debe ser de al menos 30 segundos."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10144,57 +10156,57 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to compose messages"
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages."
 msgstr "Conjunto de caracteres predeterminado para redactar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to display messages"
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages."
 msgstr "Conjunto de caracteres predeterminado para mostrar mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default forward style"
 msgstr "Estilo de reenvío predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default height of the Composer Window."
 msgstr "Altura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the mail browser window."
 msgstr "Altura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default maximized state of the mail browser window."
 msgstr ""
 "Anchura predeterminada en estado maximizado de la ventana del examinador de "
 "correo."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default reply style"
 msgstr "Estilo de respuesta predeterminado"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para el estado de expansión de la conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default width of the Composer Window."
 msgstr "Anchura predeterminada de la ventana del editor de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the mail browser window."
 msgstr "Anchura predeterminada de la ventana del examinador de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
@@ -10203,7 +10215,7 @@ msgstr ""
 "contraer o expandir de manera predeterminada. «0» = expandidas «1» = "
 "contraídas"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10211,13 +10223,13 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -10229,12 +10241,12 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -10244,7 +10256,7 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -10252,51 +10264,47 @@ msgstr ""
 "Determina si se debe usar la misma tipografía para las líneas «De» y "
 "«Asunto» en la columna «Mensajes» de la vista vertical."
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "Carpeta para cargar/adjuntar archivos en el editor."
-
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for saving mail component files."
 msgstr "Carpeta para guardar archivos enviados por correo."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr ""
 "Desactivar o activar la elipsis de los nombres de las carpetas en la barra "
 "lateral"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Display only message texts not exceeding certain size"
 msgstr "Mostrar sólo los mensajes de texto que no excedan de cierto tamaño"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "No añadir un delimitador de firma"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:54
 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.h:57
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -10304,36 +10312,35 @@ msgstr ""
 "Activar imágenes animadas en correos HTML. Muchos usuarios consideran "
 "molestas las imágenes animadas y prefieren ver una imagen estática."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:60
 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.h:63
-#| msgid "All local folders"
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable local folders"
 msgstr "Activar carpetas locales"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "Activa o desactiva la barra espaciadora mágica"
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:64
 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.h:67
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "Activar las carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "Activar las carpetas de búsqueda al inicio."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -10341,7 +10348,7 @@ msgstr ""
 "Activar la característica barra de búsqueda lateral para permitir búsquedas "
 "interactivas de nombres de carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -10349,7 +10356,7 @@ msgstr ""
 "Activar esto para usar la barra espaciadora para desplazarse en la vista "
 "previa del mensaje, lista de mensajes y carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
@@ -10357,27 +10364,27 @@ msgstr ""
 "Activar el mostrado exclusivo de mensajes de texto que no excedan el tamaño "
 "definido en la clave «message_text_part_limit»."
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Activar para usar una ajuste de vista de lista de mensajes similar para "
 "todas las carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "Activar/desactivar modo cursor"
 
-#: ../mail/evolution-mail.schemas.in.h:75 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:73 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Codificar nombres de archivo de la forma Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid ""
 "Encode file names in the mail headers same as Outlook or GMail do, to let "
 "them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -10389,31 +10396,31 @@ msgstr ""
 "localizados enviados por Evolution, ya que no siguen el RFC 2231, pero usan "
 "el estándar incorrecto RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "Limpiar la bandeja de salida después de filtrar"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Forward message."
 msgstr "Reenviar mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "Responder al grupo responde a la lista"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "Altura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "Altura del panel de vista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Oculta la vista previa por carpeta y elimina la selección"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -10421,7 +10428,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.h:84
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "
@@ -10432,11 +10439,11 @@ msgstr ""
 "visor de componentes bonobo en la base de datos de GNOME puede usarse para "
 "mostrar el contenido."
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "Ignorar «Responder a:» para listas:"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Initial height of the \"Filter Editor\" window. The value updates as the "
 "user resizes the window vertically."
@@ -10444,7 +10451,7 @@ msgstr ""
 "Altura inicial de la ventana «Editor de filtros». El valor se actualiza "
 "según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10452,7 +10459,7 @@ msgstr ""
 "Altura inicial de la ventana «Suscripciones de carpetas». El valor se "
 "actualiza según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10460,7 +10467,7 @@ msgstr ""
 "Altura inicial de la ventana «Editor de carpetas de búsqueda». El valor se "
 "actualiza según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -10468,7 +10475,7 @@ msgstr ""
 "Altura inicial de la ventana «Enviar y recibir correo». El valor se "
 "actualiza según el usuario redimensiona verticalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid ""
 "Initial maximize state of the \"Filter Editor\" window. The value updates "
 "when the user maximizes or unmaximizes the window. Note, this particular "
@@ -10480,7 +10487,7 @@ msgstr ""
 "usa este valor en particular ya que la ventana «Editor de filtros» no se "
 "puede maximizar. Esta clave existe sólo como un detalle de implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid ""
 "Initial maximize state of the \"Folder Subscriptions\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10493,7 +10500,7 @@ msgstr ""
 "de carpetas» no se puede maximizar. Esta clave existe sólo como un detalle "
 "de implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid ""
 "Initial maximize state of the \"Search Folder Editor\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10506,7 +10513,7 @@ msgstr ""
 "carpetas de búsqueda» no se puede maximizar. Esta clave existe sólo como un "
 "detalle de implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -10520,7 +10527,7 @@ msgstr ""
 "no se puede maximizar. Esta clave existe sólo como un detalle de "
 "implementación."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid ""
 "Initial width of the \"Filter Editor\" window. The value updates as the user "
 "resizes the window horizontally."
@@ -10528,7 +10535,7 @@ msgstr ""
 "Anchura inicial de la ventana «Editor de filtros». El valor se actualiza "
 "según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10536,7 +10543,7 @@ msgstr ""
 "Anchura inicial de la ventana «Suscripciones de carpetas». El valor se "
 "actualiza según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Search Folder Editor\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10544,7 +10551,7 @@ msgstr ""
 "Anchura inicial de la ventana «Editor de carpetas de búsqueda». El valor se "
 "actualiza según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -10552,7 +10559,7 @@ msgstr ""
 "Anchura inicial de la ventana «Enviar y recibir correo». El valor se "
 "actualiza según el usuario redimensiona horizontalmente la ventana."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -10564,7 +10571,7 @@ msgstr ""
 "responder sólo a la lista de correo a través de la que recibe copias de los "
 "correos a los que está respondiendo."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -10574,7 +10581,7 @@ msgstr ""
 "correos de una carpeta de búsqueda borra permanentemente el correo, no sólo "
 "los elimina de los resultados de la búsqueda."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -10583,7 +10590,7 @@ msgstr ""
 "que está enviando una respuesta privada a un correo que llegó a través de "
 "una lista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -10591,7 +10598,7 @@ msgstr ""
 "Desactiva o activa los mensajes repetitivos para avisarle de que está "
 "enviando una respuesta a mucha gente."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -10602,7 +10609,7 @@ msgstr ""
 "una lista de correo, pero la lista establece una cabecera «Responder a:» que "
 "redirecciona su respuesta de nuevo a la lista."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -10611,40 +10618,40 @@ msgstr ""
 "que está enviando un mensaje a destinatarios no introducidos como una "
 "dirección de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "Estilo de la distribución"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:107
 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.h:110
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "Lista de licencias aceptadas"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "Lista de cuentas"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -10653,16 +10660,16 @@ msgstr ""
 "lista contiene cadenas nombrando subcarpetas relativas a /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:111
 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.h:114
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Lista de los códigos de diccionario usados para la corrección ortográfica."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:113
 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."
@@ -10671,15 +10678,15 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:114
 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.h:117
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "Cargar imágenes para mensajes HTML sobre HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -10690,89 +10697,89 @@ msgstr ""
 "remitente está en la libreta de direcciones; «2»: Siempre cargar imágenes "
 "desde la red."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:118
 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.h:121
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "Archivo de registro para registrar las acciones de filtrado"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "Archivo de registro para registrar las acciones de filtrado."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "Altura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "Examinador de correo maximizado"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "Anchura del examinador de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "Marcar como visto después del tiempo especificado"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "Marcar como visto después del tiempo especificado."
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marcar citas textuales en la vista previa del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marcar citas textuales en la «vista previa» del mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "Límite del texto del mensaje para mostrarlo"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:129
 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.h:132
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:131
 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.h:134
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:133
 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.h:136
+#: ../mail/evolution-mail.schemas.in.h:134
 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.h:137
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "Mensaje original."
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Path where picture gallery should search for its content"
 msgstr "Ruta donde la galería de imágenes debería buscar su contenido"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
@@ -10781,118 +10788,118 @@ msgstr ""
 "del examinador; «always» (siempre) para cerrar siempre la ventana del "
 "examinador; «ask» (preguntar) o cualquier otro valor, preguntarán al usuario"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a los destinatarios no introducidos como "
 "direcciones de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Preguntar si el asunto está en blanco"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intente purgar una carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intente enviar un correo sin un asunto."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "Preguntar al eliminar correos en carpetas de búsqueda"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "Preguntar al responder de forma privada a correos de una lista"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "Preguntar al responder a muchos desinatarios"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "Preguntar cuando el usuario compacte"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Preguntar cuando el usuario sólo rellene el campo Cco"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:148
 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.h:151
+#: ../mail/evolution-mail.schemas.in.h:149
 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.h:152
+#: ../mail/evolution-mail.schemas.in.h:150
 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.h:153
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Preguntar cuando el usuario intente enviar HTML no deseado"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "Preguntar cuando se marquen varios correos"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "Poner firmas personalizas en la parte superior de las respuestas"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "Comenzar a escribir en la parte final al responder"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Reconocer emoticonos en el texto y reemplazarlos con imágenes."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "Reconocer enlaces en el texto y reemplazarlos."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "Carpeta donde guardar"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "Buscar la foto del remitente en libretas de direcciones locales"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "Enviar correo en HTML de forma predeterminada"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "Enviar el correo en HTML de forma predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "Columna del correo-e del remitente en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización con el servidor"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -10900,63 +10907,63 @@ msgstr ""
 "Establézcalo a verdadero si no quiere añadir un delimitador de firma antes "
 "de su firma al editar un correo."
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Mostrar el campo «Cco» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Mostrar el campo «Cc» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Mostrar el campo «De» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Mostrar el campo «Responder a» al publicar en un grupo de noticias"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Mostrar el campo «Responder a» al enviar un mensaje de correo"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "Mostrar animaciones"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "Mostrar todas las cabeceras del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "Mostrar todas las cabeceras al ver mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "Mostrar las imágenes animadas como animaciones."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Mostrar los mensajes borrados (tachados) en la lista de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "Mostrar los mensajes borrados en la lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "Mostrar imágenes animadas"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar el valor original de la cabecera «Fecha»."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "Mostrar la foto del remitente"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10964,7 +10971,7 @@ msgstr ""
 "Mostrar el campo «Cco» al enviar un mensaje de correo. Esto se controla "
 "desde el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -10972,7 +10979,7 @@ msgstr ""
 "Mostrar el campo «Cc» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -10980,7 +10987,7 @@ msgstr ""
 "Mostrar el campo «De» al enviar un mensaje de correo. Esto se controla desde "
 "el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -10988,7 +10995,7 @@ msgstr ""
 "Mostrar el campo «Responder a» al publicar en un grupo de noticias. Esto se "
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -10996,7 +11003,7 @@ msgstr ""
 "Mostrar el campo «Responder a» al enviar un mensaje de correo. Esto se "
 "controla desde el menú Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11004,7 +11011,7 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11015,11 +11022,11 @@ msgstr ""
 "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -11038,27 +11045,27 @@ msgstr ""
 "mismo. Funciona comparando la cabecera «Responder a:» con una cabecara «List-"
 "Post:», si existe."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenar cuentas alfabéticamente en un árbol de carpetas"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Comprobación ortográfica en línea"
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
 msgstr "Color de la corrección ortográfica"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Spell checking languages"
 msgstr "Comprobación ortográfica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "State of message headers in paned view"
 msgstr "Estado de las cabeceras del mensaje en la vista con paneles"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -11070,29 +11077,29 @@ msgstr ""
 "alfabéticamente, con la excepción de En este equipo y Carpetas de búsqueda, "
 "de lo contrario las carpetas se ordenan por el orden dado por el usuario."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Terminal font"
 msgstr "Tipografía del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La última vez que se vació el SPAM, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "La última vez que se vació la papelera, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11104,11 +11111,11 @@ msgstr ""
 "vista previa debajo de la lista de correos. «1» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de correos."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "The terminal font for mail display."
 msgstr "La tipografía de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
@@ -11116,7 +11123,7 @@ msgstr ""
 "El texto insertado al reenviar un mensaje, diciendo que el a continuación "
 "está el mensaje reenviado."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
@@ -11124,7 +11131,7 @@ msgstr ""
 "El texto insertado al responder a un mensaje (publicando por encima), "
 "atribuyendo el mensaje a su autor original."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
@@ -11132,11 +11139,11 @@ msgstr ""
 "El texto insertado al responder a un mensaje, atribuyendo el mensaje a su "
 "autor original."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "The variable width font for mail display."
 msgstr "La tipografía de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11144,7 +11151,7 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
 "«2» para mensajes de depuración."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "This decides the max size of the message text that will be displayed under "
 "Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
@@ -11155,7 +11162,7 @@ msgstr ""
 "(4MiB). Este valor sólo se usa cuando la clave 'force_message_limit' está "
 "activada."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11165,7 +11172,7 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado está "
 "desactivado, entonces no usará los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11174,7 +11181,7 @@ msgstr ""
 "«false». Esto deselecciona el correo en la lista y elimina la vista previa "
 "para esa carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:208
 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;"
@@ -11186,7 +11193,7 @@ 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.h:211
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11197,11 +11204,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opción ayudará a mejorar la velocidad de obtención."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11209,7 +11216,7 @@ 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.h:214
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
@@ -11218,7 +11225,7 @@ msgstr ""
 "deberían estar en estado expandido o contraído. Evolution necesita "
 "reiniciarse para aplicarlo."
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11228,7 +11235,7 @@ msgstr ""
 "último mensaje de cada conversación, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid ""
 "This value can be an empty string, which means it'll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -11238,37 +11245,37 @@ msgstr ""
 "Imágenes del sistema, habitualmente ~/Imágenes. También se usará esta "
 "carpeta cuando la ruta configurada no apunte a la carpeta existente."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:215
 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.h:218
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Timeout for marking message as seen."
 msgstr "Tiempo para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subrayado para las palabras mal escritas cuando se use corrección "
 "en línea."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts"
 msgstr "Usar tipografía personalizada"
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografía personalizada para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11278,7 +11285,7 @@ msgstr ""
 "mensaje. Esto determina si el cursor se posiciona en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11288,17 +11295,17 @@ msgstr ""
 "mensaje. Esto determina si la firma se ubica en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Variable width font"
 msgstr "Tipografía de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica si se debe añadir una solicitud de lectura de forma predeterminada a "
 "cada mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -11309,7 +11316,7 @@ msgstr ""
 "mensajes nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se "
 "usa junto con la opción «send_recv_on_start»."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
@@ -11317,13 +11324,13 @@ msgstr ""
 "Indica si se debe comprobar si hay mensajes nuevos al iniciar Evolution. "
 "Incluye también el envío de mensajes en la bandeja de salida."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica si se debe desactivar la característica de elipsis de los nombres de "
 "las carpetas en la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11331,13 +11338,13 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras «In-Reply-To» o «References»."
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica si ordenar las conversaciones basándose en el último mensaje de esa "
 "conversación"
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -11348,17 +11355,17 @@ msgstr ""
 "algún filtro de acción «Reenviar a» y, aproximadamente, un minuto después de "
 "la última invocación a una acción."
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Whether to show local folders (On This Computer) in a folder tree."
 msgstr ""
 "Indica si se deben mostrar las carpetas locales (En este equipo) en un árbol "
 "de carpetas."
 
-#: ../mail/evolution-mail.schemas.in.h:235
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
@@ -11408,7 +11415,7 @@ msgid "From"
 msgstr "De"
 
 #: ../mail/importers/evolution-mbox-importer.c:482
-#: ../shell/e-shell-utils.c:221
+#: ../shell/e-shell-utils.c:187
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Buzón Berkeley (mbox)"
 
@@ -11438,7 +11445,7 @@ msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
 #: ../mail/importers/pine-importer.c:463
-#: ../modules/addressbook/addressbook-config.c:1081
+#: ../modules/addressbook/addressbook-config.c:1078
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
@@ -11548,7 +11555,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Aplicar los mismos ajustes de _vista a todas las carpetas"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1088
+#: ../modules/addressbook/addressbook-config.c:1085
 msgid "Authentication"
 msgstr "Autenticación"
 
@@ -11846,142 +11853,146 @@ msgstr "SHA384"
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+#: ../mail/mail-config.ui.h:94
+msgid "SOC_KS Proxy:"
+msgstr "Proxy SOC_KS:"
+
+#: ../mail/mail-config.ui.h:95 ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SSL is not supported in this build of Evolution"
 msgstr "Esta compilación de Evolution no soporta SSL"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Bu_scar la foto del remitente sólo en libretas de direcciones locales"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_elect..."
 msgstr "S_eleccionar…"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_end message receipts:"
 msgstr "_Enviar confirmaciones de mensajes:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "S_tandard Font:"
 msgstr "Tipografía _estándar:"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME seguro (S/MIME)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Selecciona letra de anchura fija para HTML"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Selecciona letra de anchura variable en HTML"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Sender Photograph"
 msgstr "Foto del remitente"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Enviando una respuesta priva_da a una lista de correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "Enviando un mensaje con destinata_rios no introducidos como direcciones de "
 "correo"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a message with an _empty subject line"
 msgstr "Enviando un correo con una línea de asunto _vacía"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Enviando la respuesta sólo a los destinatarios definidos en _Cco"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Enviando la respuesta a un gran _número de destinatarios"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _mensajes enviados:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requiere autenticación"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "_Tipo de servidor:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Set custom junk header"
 msgstr "Establecer cabecera de SPAM personalizada"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:121
 msgid "Si_gning algorithm:"
 msgstr "Algoritmo de _firma:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_natures"
 msgstr "_Firmas"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid "Sig_ning certificate:"
 msgstr "Certificado de _firma:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid "Signat_ure:"
 msgstr "_Firma:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:125
 msgid "Signatures"
 msgstr "Firmas"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:126
 msgid "Signing _algorithm:"
 msgstr "_Algoritmo de firma:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid "Special Folders"
 msgstr "Carpetas especiales"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:128
 msgid "Spell Checking"
 msgstr "Ortografía"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Start _typing at the bottom on replying"
 msgstr "Comenzar a _escribir en la parte final al responder"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Start up"
 msgstr "Inicio"
 
-#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+#: ../mail/mail-config.ui.h:131 ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -11989,7 +12000,7 @@ msgstr ""
 "La lista de idiomas de aquí refleja únicamente los idiomas para los cuáles "
 "hay instalado un diccionario."
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11999,7 +12010,7 @@ msgstr ""
 "El nombre que especifique se usará únicamente \n"
 "para mostrarlo por pantalla. "
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -12007,7 +12018,7 @@ msgstr ""
 "Para evitar accidentes y situaciones embarazosas con el correo-e, pedir "
 "confirmación antes de realizar las siguientes acciones marcadas:"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12015,139 +12026,139 @@ msgstr ""
 "Teclee el nombre por el que quiere identificar a esta cuenta.\n"
 "Por ejemplo: «Trabajo» o «Personal»"
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "Us_ername:"
 msgstr "_Usuario:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticación"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "User _Name:"
 msgstr "_Nombre de usuario:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Add Signature"
 msgstr "_Añadir firma"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Always load images from the Internet"
 msgstr "_Siempre cargar las imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Authentication Type"
 msgstr "Tipo de _autenticación"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "Conexión _directa a Internet"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr ""
 "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "_Estilo de reenvío:"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "Carpeta de _SPAM:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "_Mantener la firma por encima del mensaje original al responder"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "_Idiomas"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "Cargar i_mágenes en los mensajes de mis contactos"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "_Buscar sólo en la libreta de direcciones local"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "_Hacer que ésta sea mi cuenta predeterminada"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "Configuración _manual del proxy:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar imágenes desde Internet"
 
-#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Preguntar al enviar mensajes en HTML a contactos que no los quieren"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "Estilo de _respuesta:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Script:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:164 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "_Mostrar las imágenes animadas"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Mostrar la foto del remitente en la vista previa del mensaje"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "Carpeta de p_apelera:"
 
-#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+#: ../mail/mail-config.ui.h:170 ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "Usar _conexión segura:"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "_Usar los valores predeterminados del sistema"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografías que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "am"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
 # Esta traducción debe mantenerse así
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "color"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "descripción"
 
@@ -12733,10 +12744,14 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "La carpeta «{0}» no contiene ningún correo duplicado."
 
 #: ../mail/mail.error.xml.h:75
+msgid "Hidden file is attached."
+msgstr "Existe un archivo oculto adjunto."
+
+#: ../mail/mail.error.xml.h:76
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -12744,16 +12759,16 @@ msgstr ""
 "Si elimina la carpeta, todo su contenido y el de sus subcarpetas se "
 "eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Si borra la carpeta, se eliminará permanentemente todo su contenido."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Si continúa, las cuentas proxy se eliminarán permanentemente."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12761,11 +12776,11 @@ msgstr ""
 "Si continúa, la información de la cuenta y toda la\n"
 "información del proxy se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se eliminará permanentemente."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -12773,23 +12788,23 @@ msgstr ""
 "Si sale, estos mensajes no se enviarán hasta que Evolution sea iniciado de "
 "nuevo."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Invalid authentication"
 msgstr "Autenticación inválida"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Mail filters automatically updated."
 msgstr "Filtros de correo actualizados automáticamente."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 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 "
@@ -12801,7 +12816,7 @@ msgstr ""
 "listará todos los destinatarios de su mensaje de todas formas. Para evitar "
 "esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -12812,35 +12827,35 @@ msgstr ""
 "carpetas en las que están físicamente. ¿Realmente quiere borrar estos "
 "mensajes?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "N_ever"
 msgstr "_Nunca"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No duplicate messages found."
 msgstr "No se encontró ningún correo duplicado."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "No sources selected."
 msgstr "No se ha seleccionado ningún origen."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Opening too many messages at once may take a long time."
 msgstr "Abrir demasiados mensajes a la vez puede llevar mucho tiempo."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please check your account settings and try again."
 msgstr "Compruebe su configuración de la cuenta e inténtelo otra vez."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envíe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 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."
@@ -12849,7 +12864,7 @@ msgstr ""
 "direcciones de correo pulsando en el botón «Para:» al lado de la caja de "
 "entrada."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -12859,65 +12874,65 @@ msgstr ""
 "recibir correo-e en HTML:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Please wait."
 msgstr "Por favor espere."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Se está consultando al servidor por una lista de mecanismos de autenticación "
 "soportados."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Read receipt requested."
 msgstr "Se solicitó una notificación de lectura."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "¿Seguro que quiere eliminar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Really delete folder \"{0}\"?"
 msgstr "¿Realmente quiere borrar la carpeta «{0}»?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Remove duplicate messages?"
 msgstr "¿Quitar mensajes duplicados?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid "Reply _Privately"
 msgstr "Responder pri_vadamente"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Search Folders automatically updated."
 msgstr "Carpetas de búsqueda autoactualizadas."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send private reply?"
 msgstr "¿Enviar una respuesta privada?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Send reply to all recipients?"
 msgstr "¿Enviar respuesta a todos los destinatarios?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid "Synchronize folders locally for offline usage?"
 msgstr "¿Sincronizar las carpetas localmente para usarse sin conexión?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -12925,7 +12940,15 @@ msgstr ""
 "Evolution requiere las carpetas de sistema para funcionar correctamente y no "
 "pueden renombrarse, moverse o eliminarse."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
+msgid ""
+"The attachment named {0} is a hidden file and may contain sensitive data. "
+"Please review it before sending."
+msgstr ""
+"El adjunto de nombre {0} es un archivo oculto y puede contener datos "
+"sensibles. Revíselo antes de enviarlo."
+
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12941,7 +12964,7 @@ msgstr ""
 "destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
 "destinatario a Para: o Cc: "
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12949,7 +12972,7 @@ msgstr ""
 "No se reconoció el siguiente destinatario como dirección de correo válida:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12958,15 +12981,15 @@ msgstr ""
 "válidas:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "The script file must exist and be executable."
 msgstr "El archivo de script debe existir y ser ejecutable."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "These messages are not copies."
 msgstr "Estos mensajes no son copias."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12975,7 +12998,7 @@ msgstr ""
 "vaya al editor de carpetas de búsqueda para añadirla explícitamente, si es "
 "necesario."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -12983,13 +13006,13 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 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:131
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -12997,11 +13020,11 @@ msgstr ""
 "Este servidor no soporta este tipo de autenticación requerido y quizá no "
 "soporte ningún tipo de autenticación."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid "This signature has been changed, but has not been saved."
 msgstr "Esta firma ha cambiado, pero no ha sido guardada."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:135
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
@@ -13009,16 +13032,16 @@ msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada y sus "
 "subcarpetas."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr ""
 "Esto marcará todos los mensajes como leídos en la carpeta seleccionada."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to connect to the GroupWise server."
 msgstr "No es posible conectarse con el servidor GroupWise."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -13026,27 +13049,27 @@ msgstr ""
 "No es posible abrir la carpeta de borradores para esta cuenta. ¿Quiere usar "
 "la carpeta de borradores del sistema?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "Unable to read license file."
 msgstr "No es posible leer el archivo de licencia."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
 msgid "Unable to retrieve message."
 msgstr "No se pudo obtener el mensaje."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "Use _Default"
 msgstr "Usar _predeterminada"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "Use default drafts folder?"
 msgstr "¿Desea usar la carpeta de borradores predeterminada?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:143
 msgid "Would you like to close the message window?"
 msgstr "¿Quiere seleccionar la ventana de mensaje?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -13056,7 +13079,7 @@ msgstr ""
 "lista de correo, pero la lista está intentando redireccionar su respuesta de "
 "nuevo a la lista. ¿Está seguro de que quiere proceder?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:145
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -13066,7 +13089,7 @@ msgstr ""
 "pero está respondiendo de forma privada al remitente, no a la lista. ¿Está "
 "seguro de que quiere proceder?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:146
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -13074,31 +13097,31 @@ msgstr ""
 "Está respondiendo a un correo-e que se envió a muchos destinatarios. ¿Está "
 "seguro de que quiere responder a TODOS ellos?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:148
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:149
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:150
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:151
 msgid "You must name this Search Folder."
 msgstr "Debe dar un nombre a esta carpeta de búsqueda."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:152
 msgid "You must specify a folder."
 msgstr "Debe especificar una carpeta."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:153
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -13108,65 +13131,65 @@ msgstr ""
 "Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas "
 "las carpetas locales, todas las carpetas remotas, o ambas."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:155
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Always"
 msgstr "_Siempre"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:157
 msgid "_Append"
 msgstr "_Agregar"
 
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../mail/mail.error.xml.h:158
+#: ../plugins/publish-calendar/publish-calendar.c:611
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:160
 #: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Exit Evolution"
 msgstr "_Salir de Evolution"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:162
 msgid "_Expunge"
 msgstr "_Purgar"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:163
 msgid "_Migrate Now"
 msgstr "_Migrar ahora"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "_No"
 msgstr "_No"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "_Send Receipt"
 msgstr "_Enviar confirmación"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "_Synchronize"
 msgstr "_Sincronizar"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "_Yes"
 msgstr "_Sí"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
@@ -13328,7 +13351,7 @@ msgstr "El asunto contiene"
 msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:204
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
@@ -13336,7 +13359,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta SSL."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:206
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
@@ -13344,7 +13367,7 @@ msgstr ""
 "Seleccionar esta opción significa que Evolution sólo conectará con su "
 "servidor LDAP si su servidor LDAP soporta TLS."
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:208
 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 "
@@ -13354,15 +13377,15 @@ msgstr ""
 "Esto significa que su conexión será insegura, y que usted será vulnerable a "
 "fallos de seguridad."
 
-#: ../modules/addressbook/addressbook-config.c:641
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "U_sar en el calendario Cumpleaños y aniversarios"
 
-#: ../modules/addressbook/addressbook-config.c:683
+#: ../modules/addressbook/addressbook-config.c:680
 msgid "Copy _book content locally for offline operation"
 msgstr "Copiar la li_breta localmente para trabajar desconectado"
 
-#: ../modules/addressbook/addressbook-config.c:798
+#: ../modules/addressbook/addressbook-config.c:795
 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 "
@@ -13372,7 +13395,7 @@ msgstr ""
 "Se ha proporcionado una lista de puertos estándar. Pregunte a su "
 "administrador del sistema qué puerto debería especificar."
 
-#: ../modules/addressbook/addressbook-config.c:879
+#: ../modules/addressbook/addressbook-config.c:876
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13382,7 +13405,7 @@ msgstr ""
 "establecer esto a «Dirección de correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: ../modules/addressbook/addressbook-config.c:962
+#: ../modules/addressbook/addressbook-config.c:959
 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 "
@@ -13394,29 +13417,29 @@ msgstr ""
 "incluirá todas las entradas por debajo de su base de búsqueda. Un ámbito de "
 "«uno» sólo incluirá las entradas un nivel bajo su base."
 
-#: ../modules/addressbook/addressbook-config.c:1086
+#: ../modules/addressbook/addressbook-config.c:1083
 msgid "Server Information"
 msgstr "Información del servidor"
 
-#: ../modules/addressbook/addressbook-config.c:1091
+#: ../modules/addressbook/addressbook-config.c:1088
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalles"
 
-#: ../modules/addressbook/addressbook-config.c:1092
+#: ../modules/addressbook/addressbook-config.c:1089
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Búsqueda"
 
-#: ../modules/addressbook/addressbook-config.c:1094
+#: ../modules/addressbook/addressbook-config.c:1091
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/addressbook/addressbook-config.c:1309
+#: ../modules/addressbook/addressbook-config.c:1306
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: ../modules/addressbook/addressbook-config.c:1311
+#: ../modules/addressbook/addressbook-config.c:1308
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
@@ -13445,34 +13468,39 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "XML EFolderList para la lista de URI de completado."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+#| msgid "Calendar information"
+msgid "Enable address formatting"
+msgstr "Activar formateado de direcciones"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr ""
 "Posición del panel de vista previa de contactos cuando está orientado "
 "horizontalmente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr ""
 "Posición del panel de vista previa de contactos cuando está orientado "
 "verticalmente."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Primary address book"
 msgstr "Libreta de direcciones primaria"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show autocompleted name with an address"
 msgstr "Mostrar el nombre autocompletado con la dirección"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show maps"
 msgstr "Mostrar mapas"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Show preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
@@ -13480,7 +13508,7 @@ msgstr ""
 "El UID de la libreta de direcciones seleccionada (o «primaria») en la barra "
 "lateral de la vista de «Contactos»."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. \"0\" (Classic View) places the preview pane below the "
@@ -13492,7 +13520,7 @@ msgstr ""
 "vista previa debajo de la lista de contactos. «1» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de contactos."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
@@ -13500,19 +13528,27 @@ msgstr ""
 "El número de caracteres que deben teclearse antes de que Evolution intente "
 "autocompletar."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "URI para la carpeta usada por última vez en el diálogo de selección de "
 "nombres"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "URI for the folder last used in the select names dialog."
 msgstr ""
 "URI para la carpeta usada por última vez en el diálogo de selección de "
 "nombres."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid ""
+"Whether addresses should be formatted according to standard in their "
+"destination country."
+msgstr ""
+"Indica si se deben formatear las direcciones según el estándar del país de "
+"destino."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
@@ -13520,11 +13556,11 @@ msgstr ""
 "Indica si se debe forzar el mostrado de la dirección de corre-e con el "
 "nombre autocompletado del contacto en la entrada."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Whether to show maps in preview pane."
 msgstr "Indica si se muestran los mapas en el panel de vista previa."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
@@ -13535,10 +13571,19 @@ msgid "_Table column:"
 msgstr "Columna de _tabla:"
 
 #: ../modules/addressbook/autocompletion-config.c:197
+#| msgid "Free/Busy information"
+msgid "Address formatting"
+msgstr "Formateado de direcciones"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "_Formatear direcciones según el estándar del país de destino"
+
+#: ../modules/addressbook/autocompletion-config.c:209
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: ../modules/addressbook/autocompletion-config.c:200
+#: ../modules/addressbook/autocompletion-config.c:212
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Siempre mostrar la dirección del contacto autocompletado"
 
@@ -13793,18 +13838,18 @@ msgid "Any Category"
 msgstr "Cualquier categoría"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "No coincidente"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
 #: ../modules/mail/e-mail-shell-view-actions.c:1545
-#: ../shell/e-shell-content.c:665
+#: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
@@ -15229,27 +15274,31 @@ msgstr "Citas activas"
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los próximos 7 días"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr "Sucede menos de 5 veces"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
 #: ../modules/calendar/e-memo-shell-view-actions.c:795
 #: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
 #: ../modules/calendar/e-memo-shell-view-actions.c:802
 #: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar el calendario que imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1782
+#: ../modules/calendar/e-cal-shell-view-actions.c:1789
 #: ../modules/calendar/e-cal-shell-view-memopad.c:294
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:381
 #: ../modules/calendar/e-memo-shell-view-actions.c:843
@@ -15257,7 +15306,7 @@ msgstr "Previsualizar el calendario que imprimir"
 msgid "_Save as iCalendar..."
 msgstr "G_uardar como iCalendar…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1859
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 msgid "Go To"
 msgstr "Ir a"
 
@@ -15686,19 +15735,19 @@ msgstr "_Carpeta de correo"
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:409
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:417
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:425
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:433
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
@@ -16078,7 +16127,7 @@ msgstr "Enviar / Recibir"
 
 #: ../modules/mail/em-composer-prefs.c:498
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:857
+#: ../plugins/publish-calendar/publish-calendar.c:849
 #: ../widgets/misc/e-account-tree-view.c:385
 msgid "Enabled"
 msgstr "Activado"
@@ -16387,24 +16436,24 @@ msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
-#: ../plugins/backup-restore/backup-restore.c:192
+#: ../plugins/backup-restore/backup-restore.c:223
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:225
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution después del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:251
+#: ../plugins/backup-restore/backup-restore.c:283
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution que restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:264
+#: ../plugins/backup-restore/backup-restore.c:296
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution después de la restauración"
 
-#: ../plugins/backup-restore/backup-restore.c:337
+#: ../plugins/backup-restore/backup-restore.c:383
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16414,35 +16463,35 @@ msgstr ""
 "todos los correos, calendarios, tareas, notas, libreta de direcciones. "
 "También restaura su configuración personal, filtros de correo, etc."
 
-#: ../plugins/backup-restore/backup-restore.c:344
+#: ../plugins/backup-restore/backup-restore.c:393
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:403
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:407
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:421
 msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:402
+#: ../plugins/backup-restore/backup-restore.c:468
 msgid "_Back up Evolution Data..."
 msgstr "Re_spaldar datos de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:404
+#: ../plugins/backup-restore/backup-restore.c:470
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Respaldar los datos y configuración de Evolution a un archivador"
 
-#: ../plugins/backup-restore/backup-restore.c:409
+#: ../plugins/backup-restore/backup-restore.c:475
 msgid "R_estore Evolution Data..."
 msgstr "R_estaurar datos de Evolution…"
 
-#: ../plugins/backup-restore/backup-restore.c:411
+#: ../plugins/backup-restore/backup-restore.c:477
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Respaldar y restaurar los datos y la configuración desde un archivador"
 
@@ -16467,86 +16516,85 @@ msgid "With Graphical User Interface"
 msgstr "Con interfaz gráfica de usuario"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:299
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:300
+#: ../plugins/backup-restore/backup.c:424
 msgid "Shutting down Evolution"
 msgstr "Cerrando Evolution"
 
-#: ../plugins/backup-restore/backup.c:308
+#: ../plugins/backup-restore/backup.c:309
 msgid "Backing Evolution accounts and settings"
 msgstr "Respaldar las cuentas y la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:318
+#: ../plugins/backup-restore/backup.c:321
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Respaldar los datos de Evolution (correos, contactos, calendario, tareas, "
 "notas)"
 
-#: ../plugins/backup-restore/backup.c:331
+#: ../plugins/backup-restore/backup.c:337
 msgid "Back up complete"
 msgstr "Respaldo completado"
 
-#: ../plugins/backup-restore/backup.c:338
-#: ../plugins/backup-restore/backup.c:527
+#: ../plugins/backup-restore/backup.c:344
+#: ../plugins/backup-restore/backup.c:560
 msgid "Restarting Evolution"
 msgstr "Reiniciando Evolution"
 
-#: ../plugins/backup-restore/backup.c:424
+#: ../plugins/backup-restore/backup.c:430
 msgid "Back up current Evolution data"
 msgstr "Respaldar los datos actuales de Evolution"
 
-#: ../plugins/backup-restore/backup.c:432
+#: ../plugins/backup-restore/backup.c:438
 msgid "Extracting files from back up"
 msgstr "Extrayendo archivos del respaldo"
 
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:505
 msgid "Loading Evolution settings"
 msgstr "Carga la configuración de Evolution"
 
-#: ../plugins/backup-restore/backup.c:508
+#: ../plugins/backup-restore/backup.c:541
 msgid "Removing temporary back up files"
 msgstr "Eliminando archivos temporales de respaldo"
 
-#: ../plugins/backup-restore/backup.c:520
+#: ../plugins/backup-restore/backup.c:553
 msgid "Ensuring local sources"
 msgstr "Asegurando fuentes locales"
 
-#: ../plugins/backup-restore/backup.c:707
+#: ../plugins/backup-restore/backup.c:748
+msgid "Evolution Back Up"
+msgstr "Respaldo de Evolution"
+
+#: ../plugins/backup-restore/backup.c:749
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Respaldando a la carpeta %s"
 
-#: ../plugins/backup-restore/backup.c:712
+#: ../plugins/backup-restore/backup.c:754
+msgid "Evolution Restore"
+msgstr "Restaurador de Evolution"
+
+#: ../plugins/backup-restore/backup.c:755
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restaurando desde la carpeta %s"
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Back up"
-msgstr "Respaldo de Evolution"
-
-#: ../plugins/backup-restore/backup.c:736
-msgid "Evolution Restore"
-msgstr "Restaurador de Evolution"
-
-#: ../plugins/backup-restore/backup.c:774
+#: ../plugins/backup-restore/backup.c:824
 msgid "Backing up Evolution Data"
 msgstr "Respaldando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:775
+#: ../plugins/backup-restore/backup.c:825
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Espere mientras Evolution respalda sus datos."
 
-#: ../plugins/backup-restore/backup.c:777
+#: ../plugins/backup-restore/backup.c:827
 msgid "Restoring Evolution Data"
 msgstr "Restaurando los datos de Evolution"
 
-#: ../plugins/backup-restore/backup.c:778
+#: ../plugins/backup-restore/backup.c:828
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Espere mientras Evolution restaura sus datos."
 
-#: ../plugins/backup-restore/backup.c:796
+#: ../plugins/backup-restore/backup.c:846
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Esto puede llevar un tiempo dependiendo de la cantidad de datos en su cuenta."
@@ -17487,44 +17535,44 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2672
+#: ../plugins/itip-formatter/itip-formatter.c:2665
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2688
+#: ../plugins/itip-formatter/itip-formatter.c:2681
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2806
+#: ../plugins/itip-formatter/itip-formatter.c:2799
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2809
+#: ../plugins/itip-formatter/itip-formatter.c:2802
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2812
+#: ../plugins/itip-formatter/itip-formatter.c:2805
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3036
+#: ../plugins/itip-formatter/itip-formatter.c:3029
 msgid "Meeting Invitations"
 msgstr "Invitaciones a reuniones"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3061
+#: ../plugins/itip-formatter/itip-formatter.c:3054
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3071
-#: ../plugins/itip-formatter/itip-formatter.c:3104
+#: ../plugins/itip-formatter/itip-formatter.c:3064
+#: ../plugins/itip-formatter/itip-formatter.c:3097
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3086
+#: ../plugins/itip-formatter/itip-formatter.c:3079
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -17748,8 +17796,8 @@ msgstr "%s ha cancelado la siguiente reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
-msgid "%s has canceled the following meeting."
-msgstr "%s ha cancelado la siguiente reunión."
+msgid "%s has canceled the following meeting:"
+msgstr "%s ha cancelado la siguiente reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
@@ -17758,8 +17806,8 @@ msgstr "%s ha propuesto los siguientes cambios para la reunión a través de %s.
 
 #: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
-msgid "%s has proposed the following meeting changes."
-msgstr "%s ha propuesto los siguientes cambios para la reunión."
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s ha propuesto los siguientes cambios para la reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
@@ -17768,8 +17816,8 @@ msgstr "%s ha rehusado los siguientes cambios para la reunión a través de %s:"
 
 #: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
-msgid "%s has declined the following meeting changes."
-msgstr "%s ha rehusado los siguientes cambios para la reunión."
+msgid "%s has declined the following meeting changes:"
+msgstr "%s ha rehusado los siguientes cambios para la reunión:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
@@ -18094,7 +18142,7 @@ msgstr ""
 "Indica si se deben notificar sólo los mensajes en la carpeta bandeja de "
 "entrada."
 
-#: ../plugins/mail-notification/mail-notification.c:390
+#: ../plugins/mail-notification/mail-notification.c:392
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18111,56 +18159,56 @@ msgstr[1] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:415
+#: ../plugins/mail-notification/mail-notification.c:417
 #, c-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:428
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ha recibido %d mensaje nuevo."
 msgstr[1] "Ha recibido %d mensajes nuevos."
 
-#: ../plugins/mail-notification/mail-notification.c:435
-#: ../plugins/mail-notification/mail-notification.c:443
-#: ../plugins/mail-notification/mail-notification.c:446
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:448
 msgid "New email"
 msgstr "Nuevo correo-e"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:467
+#: ../plugins/mail-notification/mail-notification.c:469
 #, c-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
-#: ../plugins/mail-notification/mail-notification.c:672
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "_Play sound when a new message arrives"
 msgstr "_Reproducir un sonido cuando llegue correo nuevo"
 
-#: ../plugins/mail-notification/mail-notification.c:702
+#: ../plugins/mail-notification/mail-notification.c:704
 msgid "_Beep"
 msgstr "_Pitar"
 
-#: ../plugins/mail-notification/mail-notification.c:715
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "Use sound _theme"
 msgstr "Usar un _tema de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Play _file:"
 msgstr "_Reproducir un archivo:"
 
-#: ../plugins/mail-notification/mail-notification.c:743
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Select sound file"
 msgstr "Seleccione un arhivo de sonido"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Notificar nuevos mensajes sólo para la _bandeja de entrada"
 
-#: ../plugins/mail-notification/mail-notification.c:810
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr "Mostrar _notificaciones cuando llegue correo nuevo"
 
@@ -18610,7 +18658,7 @@ msgid "Publish calendars to the web."
 msgstr "Publicar calendarios en la web."
 
 #: ../plugins/publish-calendar/publish-calendar.c:216
-#: ../plugins/publish-calendar/publish-calendar.c:471
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "No se pudo abrir «%s»:"
@@ -18630,28 +18678,28 @@ msgstr "Hubo un error al publicar en %s:"
 msgid "Publishing to %s finished successfully"
 msgstr "La publicación en %s finalizó correctamente"
 
-#: ../plugins/publish-calendar/publish-calendar.c:288
+#: ../plugins/publish-calendar/publish-calendar.c:284
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Falló al montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:619
+#: ../plugins/publish-calendar/publish-calendar.c:611
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_Activar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:767
+#: ../plugins/publish-calendar/publish-calendar.c:759
 msgid "Are you sure you want to remove this location?"
 msgstr "¿Seguro que quiere eliminar este lugar?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1099
+#: ../plugins/publish-calendar/publish-calendar.c:1091
 msgid "Could not create publish thread."
 msgstr "No se pudo publicar el hilo de publicación."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1107
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "_Publish Calendar Information"
 msgstr "_Publicar información del calendario"
 
@@ -18688,8 +18736,8 @@ msgid "Publishing _Frequency:"
 msgstr "_Frecuencia de publicación:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "FTP seguro (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "FTP seguro (SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
@@ -18837,7 +18885,7 @@ msgstr "_Encapsular valores con:"
 msgid "Comma separated values (.csv)"
 msgstr "Valores separados por comas (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:173 ../shell/e-shell-utils.c:191
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -19060,15 +19108,6 @@ msgid "Initial attachment view"
 msgstr "Vista inicial de adjunto"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "Carpeta inicial del selector de archivos"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr ""
-"La carpeta inicial para los diálogos GtkFileChooser (selector de archivos)."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
 "View."
@@ -19076,46 +19115,46 @@ msgstr ""
 "Vista inicial para los widgets de la barra de adjuntos. «0» es para Vista de "
 "icono, «1» es para Vista de lista."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Última versión de la configuración actualizada"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 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"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Servidores que no sean proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Contraseña para pasar como autenticación al hacer HTTP proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Modo de configuración del proxy"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "Nombre del servidor proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "Puerto del proxy SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Nombre del servidor proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Puerto del proxy HTTP seguro"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19127,23 +19166,23 @@ msgstr ""
 "\"usar configuración manual del proxy\" y \"usar la configuración "
 "proporcionada en la URL de autoconfiguración del proxy\" respectivamente."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "La barra lateral es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Saltar el diálogo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:310
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "La barra de estado es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -19151,27 +19190,27 @@ 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.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default X coordinate for the main window."
 msgstr "La coordenada X predeterminada para la ventana principal."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The default Y coordinate for the main window."
 msgstr "La coordenada Y predeterminada para la ventana principal."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 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.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 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.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 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.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -19179,19 +19218,19 @@ 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.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "El nombre de la máquina por la que se hace proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "El nombre de la máquina por la que se hace proxy HTTP seguro."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "El nombre de la máquina por la que se hace proxy socks."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -19199,7 +19238,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "http_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -19207,7 +19246,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "secure_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -19215,7 +19254,7 @@ msgstr ""
 "El puerto de la máquina definida por \"/apps/evolution/shell/network_config/"
 "socks_host\" que hace de proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -19225,7 +19264,7 @@ msgstr ""
 "\", \"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.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19238,68 +19277,68 @@ msgstr ""
 "foo.com), direcciones IP de servidores (tanto IPv4 como IPv6) y direcciones "
 "de red con una máscara (algo como 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "La barra de herramientas es visible"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL que proporciona las variables de configuración del proxy."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Usar proxy HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Nombre de usuario que pasar como autenticación al usar el proxy HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 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.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Indica si la ventana debe o no maximizarse."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Indica si la barra lateral debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Indica si la barra de estado debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Indica si la barra de herramientas debe ser visible."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 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.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Indica si la los botones de la ventana deben ser visibles."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Estilo de los botones de ventana"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
-#: ../shell/e-shell-content.c:728 ../shell/e-shell-content.c:729
+#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Búsquedas"
 
-#: ../shell/e-shell-content.c:772
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Guardar búsqueda"
 
@@ -19308,27 +19347,27 @@ msgstr "Guardar búsqueda"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "M_ostrar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:970
 msgid "Sear_ch:"
 msgstr "B_uscar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1033
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:189
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:212
 msgid "All Files (*)"
 msgstr "Todos los archivos (*)"
 
@@ -19626,24 +19665,24 @@ msgstr "Ejecutar estos parámetros de búsqueda"
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:442
+#: ../shell/e-shell-window.c:445
 msgid "New"
 msgstr "Nuevo"
 
-#: ../shell/e-shell.c:365
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Preparándose para desconectarse…"
 
-#: ../shell/e-shell.c:418
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Preparándose para conectarse…"
 
-#: ../shell/e-shell.c:480
+#: ../shell/e-shell.c:434
 msgid "Preparing to quit..."
 msgstr "Preparándose para salir…"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19679,7 +19718,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribución.\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19687,13 +19726,13 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:224
 msgid "Do not tell me again"
 msgstr "No preguntarme más veces"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:304
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19701,51 +19740,51 @@ msgstr ""
 "Iniciar Evolution mostrando el componente especificado. Las opciones "
 "disponibles son «mail», «calendar», «contacts», «tasks» y «memos»."
 
-#: ../shell/main.c:312
+#: ../shell/main.c:308
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar la geometría proporcionada a la ventana principal"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:312
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid "Ignore network availability"
 msgstr "Ignorar la disponibilidad de la red"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:316
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo «exprés»"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 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:328
+#: ../shell/main.c:324
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar la vista previa del correo, contactos y tareas."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar que el proceso de ejecución de Evolution finalice"
 
-#: ../shell/main.c:512 ../shell/main.c:520
+#: ../shell/main.c:508 ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19754,7 +19793,7 @@ msgstr ""
 "%s: --online y --offline no se pueden usar a la vez.\n"
 "  Ejecute «%s --help» para obtener más información\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:585
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19944,7 +19983,7 @@ msgstr "Expedido a la unidad organizativa (OU)"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:569
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Número de serie"
 
@@ -20010,7 +20049,7 @@ msgstr "Todos los archivos"
 msgid "Failed to import certificate"
 msgstr "Falló al importar el certificado"
 
-#: ../smime/gui/certificate-manager.c:991
+#: ../smime/gui/certificate-manager.c:992
 msgid "All PKCS12 files"
 msgstr "Todos los archivos PKCS12"
 
@@ -20018,7 +20057,7 @@ msgstr "Todos los archivos PKCS12"
 msgid "All email certificate files"
 msgstr "Todos los archivos de certificado de correos-e"
 
-#: ../smime/gui/certificate-manager.c:1027
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
@@ -20084,7 +20123,7 @@ msgstr ""
 "Antes de confiar en esta AC para cualquier propósito, debería examinar su "
 "certificado y su directiva y procedimientos (si están disponibles)."
 
-#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1097
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1093
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -20160,11 +20199,11 @@ msgstr "Organización (O)"
 msgid "Organizational Unit (OU)"
 msgstr "Unidad organizativa (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:829
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:825
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:833
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:829
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
@@ -20220,157 +20259,157 @@ msgstr "_Respaldo"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
-#: ../smime/lib/e-cert-db.c:912
+#: ../smime/lib/e-cert-db.c:910
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
-#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:226 ../smime/lib/e-cert.c:236
 msgid "%d/%m/%Y"
 msgstr "%e/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:417
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:418
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "Versión"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "Versión 2"
 
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "Versión 3"
 
-#: ../smime/lib/e-cert.c:634
+#: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:637
+#: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:640
+#: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:643
+#: ../smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:646
+#: ../smime/lib/e-cert.c:642
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:645
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:676
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:679
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Uso de la clave del certificado"
 
-#: ../smime/lib/e-cert.c:682
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:685
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de la clave de la autoridad del certificado"
 
-#: ../smime/lib/e-cert.c:697
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: ../smime/lib/e-cert.c:749
+#: ../smime/lib/e-cert.c:745
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:753
 msgid "Algorithm Parameters"
 msgstr "Parámetros del algoritmo"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:775
 msgid "Subject Public Key Info"
 msgstr "Información del propósito de la clave pública"
 
-#: ../smime/lib/e-cert.c:784
+#: ../smime/lib/e-cert.c:780
 msgid "Subject Public Key Algorithm"
 msgstr "Propósito del algoritmo de clave pública"
 
-#: ../smime/lib/e-cert.c:799
+#: ../smime/lib/e-cert.c:795
 msgid "Subject's Public Key"
 msgstr "Clave pública del propósito"
 
-#: ../smime/lib/e-cert.c:820 ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:816 ../smime/lib/e-cert.c:866
 msgid "Error: Unable to process extension"
 msgstr "Erro: No es posible procesar la extensión"
 
-#: ../smime/lib/e-cert.c:841 ../smime/lib/e-cert.c:853
+#: ../smime/lib/e-cert.c:837 ../smime/lib/e-cert.c:849
 msgid "Object Signer"
 msgstr "Firmante del objeto"
 
-#: ../smime/lib/e-cert.c:845
+#: ../smime/lib/e-cert.c:841
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: ../smime/lib/e-cert.c:849
+#: ../smime/lib/e-cert.c:845
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:874
 msgid "Signing"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:878
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:882
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:886
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:894
+#: ../smime/lib/e-cert.c:890
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../smime/lib/e-cert.c:898
+#: ../smime/lib/e-cert.c:894
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: ../smime/lib/e-cert.c:902
+#: ../smime/lib/e-cert.c:898
 msgid "CRL Signer"
 msgstr "Firmante de la LRC"
 
-#: ../smime/lib/e-cert.c:951
+#: ../smime/lib/e-cert.c:947
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../smime/lib/e-cert.c:953 ../smime/lib/e-cert.c:956
+#: ../smime/lib/e-cert.c:949 ../smime/lib/e-cert.c:952
 msgid "Not Critical"
 msgstr "No crítico"
 
-#: ../smime/lib/e-cert.c:977
+#: ../smime/lib/e-cert.c:973
 msgid "Extensions"
 msgstr "Extensiones"
 
@@ -20382,40 +20421,40 @@ msgstr "Extensiones"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1055
+#: ../smime/lib/e-cert.c:1051
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1111 ../smime/lib/e-cert.c:1234
+#: ../smime/lib/e-cert.c:1107 ../smime/lib/e-cert.c:1230
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
 
-#: ../smime/lib/e-cert.c:1120
+#: ../smime/lib/e-cert.c:1116
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1175
+#: ../smime/lib/e-cert.c:1171
 msgid "Issuer Unique ID"
 msgstr "ID único del emisor"
 
-#: ../smime/lib/e-cert.c:1194
+#: ../smime/lib/e-cert.c:1190
 msgid "Subject Unique ID"
 msgstr "ID único del propósito"
 
-#: ../smime/lib/e-cert.c:1240
+#: ../smime/lib/e-cert.c:1236
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
-#: ../smime/lib/e-pkcs12.c:257
+#: ../smime/lib/e-pkcs12.c:255
 msgid "PKCS12 File Password"
 msgstr "Contraseña del archivo PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:258
+#: ../smime/lib/e-pkcs12.c:256
 msgid "Enter password for PKCS12 file:"
 msgstr "Introduzca la contraseña para el archivo PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:364
+#: ../smime/lib/e-pkcs12.c:362
 msgid "Imported Certificate"
 msgstr "Certificado importado"
 
@@ -20603,7 +20642,7 @@ msgid "MIME Type:"
 msgstr "Tipo MIME:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-store.c:440
 msgid "_Suggest automatic display of attachment"
 msgstr "_Sugerir mostrar automáticamente el adjunto"
 
@@ -20639,32 +20678,32 @@ msgstr "Cargando"
 msgid "Saving"
 msgstr "Guardando"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:102
 msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:104
+#: ../widgets/misc/e-attachment-paned.c:716
 msgid "Show Attachment _Bar"
 msgstr "Mostrar _barra de adjuntos"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:428
 msgid "Add Attachment"
 msgstr "Añadir adjunto"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:431
 msgid "A_ttach"
 msgstr "_Adjuntar"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:494
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Guarda el adjunto"
 msgstr[1] "Guardar los adjuntos"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
-#: ../widgets/misc/e-attachment.c:1810 ../widgets/misc/e-attachment.c:2352
+#: ../widgets/misc/e-attachment-store.c:523
+#: ../widgets/misc/e-attachment.c:1809 ../widgets/misc/e-attachment.c:2347
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -20714,44 +20753,44 @@ msgstr "Abrir este adjunto en %s"
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
-#: ../widgets/misc/e-attachment.c:1853 ../widgets/misc/e-attachment.c:2654
+#: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2649
 msgid "A load operation is already in progress"
 msgstr "Existe una operación de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1861 ../widgets/misc/e-attachment.c:2662
+#: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2657
 msgid "A save operation is already in progress"
 msgstr "Existe una operación de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1953
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar «%s»"
 
-#: ../widgets/misc/e-attachment.c:1956
+#: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2232
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir «%s»"
 
-#: ../widgets/misc/e-attachment.c:2235
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2670
+#: ../widgets/misc/e-attachment.c:2665
 msgid "Attachment contents not loaded"
 msgstr "No se cargó el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2741
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar «%s»"
 
-#: ../widgets/misc/e-attachment.c:2749
+#: ../widgets/misc/e-attachment.c:2744
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
@@ -21328,7 +21367,7 @@ msgid "A_vailable Fields:"
 msgstr "Campos _disponibles:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -21341,7 +21380,7 @@ msgid "Clear _All"
 msgstr "Quitar _todo"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1717
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Descending"
 msgstr "Descendente"
 
@@ -21444,60 +21483,60 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d elemento)"
 msgstr[1] "%s (%d elementos)"
 
-#: ../widgets/table/e-table-header-item.c:1557
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "Customize Current View"
 msgstr "Personalizar vista actual"
 
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Sort _Ascending"
 msgstr "Ordenar _ascendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Sort _Descending"
 msgstr "Ordenar _descendentemente"
 
-#: ../widgets/table/e-table-header-item.c:1585
+#: ../widgets/table/e-table-header-item.c:1589
 msgid "_Unsort"
 msgstr "_Desordenar"
 
-#: ../widgets/table/e-table-header-item.c:1588
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "Group By This _Field"
 msgstr "Agrupar por _este campo"
 
-#: ../widgets/table/e-table-header-item.c:1591
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Group By _Box"
 msgstr "Agrupar por _caja"
 
-#: ../widgets/table/e-table-header-item.c:1595
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Remove This _Column"
 msgstr "Quitar esta c_olumna"
 
-#: ../widgets/table/e-table-header-item.c:1598
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Add a C_olumn..."
 msgstr "Añadir una c_olumna…"
 
-#: ../widgets/table/e-table-header-item.c:1602
+#: ../widgets/table/e-table-header-item.c:1606
 msgid "A_lignment"
 msgstr "A_lineación"
 
-#: ../widgets/table/e-table-header-item.c:1605
+#: ../widgets/table/e-table-header-item.c:1609
 msgid "B_est Fit"
 msgstr "Ajust_e automático"
 
-#: ../widgets/table/e-table-header-item.c:1608
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Format Column_s..."
 msgstr "Formatear columna_s…"
 
-#: ../widgets/table/e-table-header-item.c:1612
+#: ../widgets/table/e-table-header-item.c:1616
 msgid "Custo_mize Current View..."
 msgstr "Perso_nalizar vista actual…"
 
-#: ../widgets/table/e-table-header-item.c:1674
+#: ../widgets/table/e-table-header-item.c:1678
 msgid "_Sort By"
 msgstr "_Ordenar por"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1692
+#: ../widgets/table/e-table-header-item.c:1696
 msgid "_Custom"
 msgstr "_Personalizado"
 
@@ -21533,14 +21572,28 @@ msgstr "pulsar"
 msgid "sort"
 msgstr "ordenar"
 
-#: ../widgets/text/e-text.c:2327
+#: ../widgets/text/e-text.c:2325
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../widgets/text/e-text.c:2339
+#: ../widgets/text/e-text.c:2337
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
+#~ msgid "Composer load/attach directory"
+#~ msgstr "Carpeta de carga/adjuntos del editor"
+
+#~ msgid "Directory for loading/attaching files to composer."
+#~ msgstr "Carpeta para cargar/adjuntar archivos en el editor."
+
+#~ msgid "Initial file chooser folder"
+#~ msgstr "Carpeta inicial del selector de archivos"
+
+#~ msgid "Initial folder for GtkFileChooser dialogs."
+#~ msgstr ""
+#~ "La carpeta inicial para los diálogos GtkFileChooser (selector de "
+#~ "archivos)."
+
 #~ msgid "Local Folders"
 #~ msgstr "Carpetas locales"
 
diff --git a/po/lt.po b/po/lt.po
index 4f840b7dd9..c991f9a256 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,19 +4,21 @@
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2004.
 # Žygimantas Beru�ka <zygis@gnome.org>, 2004-2006, 2008-2010, 2011.
 # Gintautas Miliauskas <gintas@akl.lt>, 2006, 2007, 2008.
+# Algimantas Margevi�ius <gymka@mail.ru>, 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-08-31 15:48+0000\n"
-"PO-Revision-Date: 2011-09-04 18:56+0300\n"
+"POT-Creation-Date: 2011-10-08 13:43+0000\n"
+"PO-Revision-Date: 2011-10-09 00:32+0300\n"
 "Last-Translator: Aurimas ÄŒernius <aurisc4@gmail.com>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lietuvių <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Virtaal 0.5.2\n"
 
 #. For Translators: {0} is the name of the address book source
@@ -73,7 +75,7 @@ msgid "Delete address book '{0}'?"
 msgstr "Ištrinti adresų knygą „{0}“?"
 
 #: ../addressbook/addressbook.error.xml.h:15
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:37
 #: ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "_Neištrinti"
@@ -87,7 +89,7 @@ msgid "Failed to authenticate with LDAP server."
 msgstr "Nepavyko patvirtinti tapatybÄ—s LDAP serveryje."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1278
 msgid "Failed to delete contact"
 msgstr "Nepavyko atverti kontakto"
 
@@ -189,7 +191,7 @@ msgid "Your contacts for {0} will not be available until Evolution is restarted.
 msgstr "Jūsų {0} kontaktai bus neprieinami, kol Evolution nebus paleista iš naujo."
 
 #: ../addressbook/addressbook.error.xml.h:44
-#: ../mail/em-vfolder-rule.c:608
+#: ../mail/em-vfolder-rule.c:594
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_PridÄ—ti"
@@ -211,8 +213,8 @@ msgid "_Use as it is"
 msgstr "_Naudoti tokį, koks yra"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:710
-#: ../calendar/gui/e-calendar-view.c:2078
+#: ../addressbook/gui/widgets/eab-contact-display.c:715
+#: ../calendar/gui/e-calendar-view.c:2064
 msgid "Anniversary"
 msgstr "Jubiliejus"
 
@@ -222,10 +224,10 @@ msgstr "Jubiliejus"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:709
-#: ../calendar/gui/e-calendar-view.c:2077
+#: ../addressbook/gui/widgets/eab-contact-display.c:714
+#: ../calendar/gui/e-calendar-view.c:2063
 #: ../capplet/anjal-settings-main.c:79
-#: ../shell/main.c:140
+#: ../shell/main.c:138
 msgid "Birthday"
 msgstr "Gimtadienis"
 
@@ -245,24 +247,24 @@ msgid "Calendar:"
 msgstr "Kalendorius:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/importers/evolution-vcard-importer.c:979
+#: ../addressbook/importers/evolution-vcard-importer.c:990
 msgid "Contact"
 msgstr "Kontaktas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:654
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:676
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2943
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:382
+#: ../addressbook/gui/merging/eab-contact-merging.c:390
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:638
-#: ../addressbook/gui/widgets/eab-contact-display.c:1004
-#: ../smime/lib/e-cert.c:832
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
+#: ../addressbook/gui/widgets/eab-contact-display.c:1019
+#: ../smime/lib/e-cert.c:833
 msgid "Email"
 msgstr "El. paštas"
 
@@ -277,7 +279,7 @@ msgstr "Vis_as vardas..."
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
 #: ../addressbook/gui/widgets/eab-contact-display.c:78
-#: ../addressbook/gui/widgets/eab-contact-display.c:1306
+#: ../addressbook/gui/widgets/eab-contact-display.c:1323
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "Namų"
@@ -318,8 +320,8 @@ msgstr "Pastabos"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
 #: ../addressbook/gui/widgets/eab-contact-display.c:79
-#: ../addressbook/gui/widgets/eab-contact-display.c:408
-#: ../calendar/gui/e-calendar-view.c:1783
+#: ../addressbook/gui/widgets/eab-contact-display.c:409
+#: ../calendar/gui/e-cal-model.c:3421
 msgid "Other"
 msgstr "Kitas"
 
@@ -346,8 +348,8 @@ msgstr "Tinklalapiai"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
 #: ../addressbook/gui/widgets/eab-contact-display.c:77
-#: ../addressbook/gui/widgets/eab-contact-display.c:690
-#: ../addressbook/gui/widgets/eab-contact-display.c:1303
+#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-display.c:1320
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Darbinis"
@@ -375,7 +377,7 @@ msgstr "_Tinklaraštis:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:710
 #: ../calendar/gui/dialogs/event-page.ui.h:10
-#: ../plugins/itip-formatter/itip-view.c:1923
+#: ../plugins/itip-formatter/itip-view.c:1963
 msgid "_Calendar:"
 msgstr "_Kalendorius:"
 
@@ -454,47 +456,47 @@ msgid "_Zip/Postal Code:"
 msgstr "_Zip/Pašto kodas:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:658
+#: ../addressbook/gui/widgets/eab-contact-display.c:661
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:654
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:653
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:662
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:220
-#: ../addressbook/gui/widgets/eab-gui-util.c:451
+#: ../addressbook/gui/widgets/eab-gui-util.c:473
 msgid "Error adding contact"
 msgstr "Klaida įtraukiant kontaktą"
 
@@ -506,21 +508,21 @@ msgstr "Klaida kei�iant kontaktą"
 msgid "Error removing contact"
 msgstr "Klaida Å¡alinant kontaktÄ…"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:670
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2937
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktų rengyklė – %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3416
 msgid "Please select an image for this contact"
 msgstr "Prašau parinkti šiam kontaktui paveikslėlį"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3417
 msgid "_No image"
 msgstr "_NÄ—ra paveikslÄ—lio"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3744
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -528,43 +530,43 @@ msgstr ""
 "Kontakto duomenys netinkami:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3749
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ yra netinkamo formato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3757
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ yra netinkamo formato"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3770
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' yra tuš�ias"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3799
 msgid "Invalid contact."
 msgstr "Netinkamas kontaktas."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridÄ—jimas"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "_Edit Full"
 msgstr "_Keisti pilnÄ…"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:490
 msgid "_Full name"
 msgstr "_Visas vardas"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "E_l. paštas"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:512
 msgid "_Select Address Book"
 msgstr "_Pasirinkti adresų knygą"
 
@@ -634,7 +636,7 @@ msgid "_Suffix:"
 msgstr "_Galūnė:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:746
 msgid "Contact List Editor"
 msgstr "Kontaktų sąrašo redaktorius"
 
@@ -651,7 +653,7 @@ msgid "_List name:"
 msgstr "_Rodomas vardas:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:164
 msgid "_Select..."
 msgstr "P_asirinkti..."
 
@@ -659,26 +661,26 @@ msgstr "P_asirinkti..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Įrašykite _el. pašto adresą arba nutempkite kontaktą į žemiau esantį sąrašą:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:869
 msgid "Contact List Members"
 msgstr "Susisiekti su sąrašo nariais"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1402
+msgid "_Members"
+msgstr "_Nariai"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1514
 msgid "Error adding list"
 msgstr "Klaida pridedant sąrašą"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1529
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant sąrašą"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1544
 msgid "Error removing list"
 msgstr "Klaida pašalinant sąrašą"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
-msgid "_Members"
-msgstr "_Nariai"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Pakeistas kontaktas:"
@@ -714,11 +716,11 @@ msgstr ""
 "aplanke.  Ar vis tiek norėtumėte jį pridėti?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:328
+#: ../addressbook/gui/merging/eab-contact-merging.c:336
 msgid "_Merge"
 msgstr "_Sujungti"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:311
+#: ../addressbook/gui/merging/eab-contact-merging.c:319
 msgid "Merge Contact"
 msgstr "Sujungti kontaktus"
 
@@ -727,9 +729,9 @@ msgstr "Sujungti kontaktus"
 #: ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:1059
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
 msgstr "Bet kuriame laukelyje yra"
 
@@ -755,15 +757,15 @@ msgstr[0] "%d kontaktas"
 msgstr[1] "%d kontaktai"
 msgstr[2] "%d kontaktų"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:354
+#: ../addressbook/gui/widgets/e-addressbook-model.c:357
 msgid "Error getting book view"
 msgstr "Klaida gaunant knygos peržiūrą"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:768
+#: ../addressbook/gui/widgets/e-addressbook-model.c:774
 msgid "Search Interrupted"
 msgstr "Paieška nutraukta"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:158
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortelÄ™"
 
@@ -788,34 +790,34 @@ msgstr "Ištrinti pažymėtus kontaktus"
 msgid "Select all visible contacts"
 msgstr "Pažymėti visus matomus kontaktus"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ar tikrai norite ištrinti šiuos kontaktų sąrašus?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ar tikrai norite ištrinti šį kontaktų sąrašą?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ar tikrai norite ištrinti šį kontaktų sąrašą (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1340
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ar tikrai norite ištrinti šiuos kontaktus?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1344
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ar tikrai norite ištrinti šį kontaktą?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1348
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ar tikrai norite ištrinti šį kontaktą (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1504
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -833,16 +835,16 @@ msgstr[2] ""
 "Atvėrus %d kontaktų bus atverta %d naujų langų.\n"
 "Ar tikrai norite peržiūrėti visus šiuos kontaktus?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1512
 msgid "_Don't Display"
 msgstr "_Nerodyti"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 msgid "Display _All Contacts"
 msgstr "Rodyti _visus kontaktus"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:681
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
 msgid "Assistant"
 msgstr "Asistento"
 
@@ -879,7 +881,7 @@ msgid "Categories"
 msgstr "Kategorijos"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Company"
 msgstr "Kompanija"
 
@@ -928,22 +930,22 @@ msgid "Journal"
 msgstr "Žurnalas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:680
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 msgid "Manager"
 msgstr "Vadybininkas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:707
+#: ../addressbook/gui/widgets/eab-contact-display.c:712
 msgid "Mobile Phone"
 msgstr "Mobilusis telefonas"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Nickname"
 msgstr "PravardÄ—"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:733
+#: ../addressbook/gui/widgets/eab-contact-display.c:739
 msgid "Note"
 msgstr "Pastaba"
 
@@ -972,13 +974,13 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:585
+#: ../calendar/gui/e-meeting-list-view.c:610
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "RolÄ—"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:711
+#: ../addressbook/gui/widgets/eab-contact-display.c:716
 msgid "Spouse"
 msgstr "Sutuoktinis"
 
@@ -1075,13 +1077,13 @@ msgid "Home Email"
 msgstr "Namų el. paštas"
 
 #: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:807
+#: ../addressbook/gui/widgets/e-minicard.c:819
 msgid "Other Email"
 msgstr "Kitas el. paštas"
 
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:97
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:106
-#: ../addressbook/gui/widgets/ea-minicard-view.c:187
+#: ../addressbook/gui/widgets/ea-minicard-view.c:189
 msgid "evolution address book"
 msgstr "evolution adresų knyga"
 
@@ -1093,7 +1095,7 @@ msgstr "Naujas kontaktas"
 msgid "New Contact List"
 msgstr "Naujas kontaktų sąrašas"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:170
+#: ../addressbook/gui/widgets/ea-minicard-view.c:172
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1136,68 +1138,68 @@ msgstr "_Siųsti naują laišką adresatui..."
 msgid "Send a mail message to this address"
 msgstr "Siųsti el. laišką šiuo adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:213
+#: ../addressbook/gui/widgets/eab-contact-display.c:215
 msgid "Open map"
 msgstr "Atverti žemėlapį"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:526
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/widgets/eab-contact-display.c:528
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "List Members:"
 msgstr "Sąrašo nariai:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:677
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Department"
 msgstr "Padalinys"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:678
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Profession"
 msgstr "Profesija"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:679
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
 msgid "Position"
 msgstr "Postas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:682
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Video Chat"
 msgstr "Vaizdo pokalbis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:683
-#: ../calendar/gui/dialogs/calendar-setup.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../calendar/gui/dialogs/calendar-setup.c:449
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
-#: ../modules/calendar/e-cal-shell-view.c:511
+#: ../modules/calendar/e-cal-shell-view.c:523
 #: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
-#: ../widgets/misc/e-send-options.c:519
+#: ../widgets/misc/e-send-options.c:528
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:684
+#: ../addressbook/gui/widgets/eab-contact-display.c:688
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Užimtumas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:685
-#: ../addressbook/gui/widgets/eab-contact-display.c:706
+#: ../addressbook/gui/widgets/eab-contact-display.c:689
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Phone"
 msgstr "Telefonas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:686
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
 msgid "Fax"
 msgstr "Faksas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:687
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
+#: ../addressbook/gui/widgets/eab-contact-display.c:691
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
 msgid "Address"
 msgstr "Adresas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Home Page"
 msgstr "Namų tinklalapis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 msgid "Web Log"
 msgstr "Tinklaraštis"
 
@@ -1205,8 +1207,8 @@ msgstr "Tinklaraštis"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:713
-#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:718
+#: ../capplet/settings/mail-capplet-shell.c:385
 #: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
 #: ../modules/calendar/e-cal-shell-backend.c:138
@@ -1218,50 +1220,50 @@ msgstr "Tinklaraštis"
 msgid "Personal"
 msgstr "Asmeninis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:971
+#: ../addressbook/gui/widgets/eab-contact-display.c:986
 msgid "List Members"
 msgstr "Parodyti sąrašą"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:989
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1026
+#: ../addressbook/gui/widgets/eab-contact-display.c:1041
 msgid "Home page"
 msgstr "Namų puslapis"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1035
+#: ../addressbook/gui/widgets/eab-contact-display.c:1050
 msgid "Blog"
 msgstr "Žurnalas"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../addressbook/gui/widgets/eab-contact-display.c:1248
 #: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Spustelėkite, norėdami rašyti %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
 msgstr "Nepavyko atverti šios adresų knygos. Tai reiškia, kad ši knyga nėra pažymėta naudojimui atsijungus arba dar tam nėra parsiųsta jos duomenų. Kai būsite prisijungę prie tinklo, įkelkite šią adresų knygą, kad būtų atsiųstas jos turinys."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:148
 #, c-format
 msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
 msgstr "Nepavyko atverti šios adresų knygos. Patikrinkite, ar kelias %s egzistuoja ir ar turite jos prieigos teises."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:161
 msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
 msgstr "Šioje Evolution versijoje neįkompiliuotas LDAP palaikymas. Jei norite naudoti LDAP su Evolution, jums teks įdiegti Evolution paketą su LDAP palaikymu."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
 msgstr "Nepavyko atverti šios adresų knygos. Tai reiškia, kad įvedėte neteisingą URI arba nurodytasis serveris yra nepasiekiamas."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:170
+#: ../addressbook/gui/widgets/eab-gui-util.c:178
 msgid "Detailed error message:"
 msgstr "Išsamus klaidos pranešimas:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:200
+#: ../addressbook/gui/widgets/eab-gui-util.c:209
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1273,7 +1275,7 @@ msgstr ""
 "savo paiešką arba padidinkite šios adresų knygos rezultatų ribą\n"
 "aplanko serverio nustatymuose."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:207
+#: ../addressbook/gui/widgets/eab-gui-util.c:216
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1286,50 +1288,50 @@ msgstr ""
 "nustatymuose."
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 #, c-format
 msgid "The backend for this address book was unable to parse this query. %s"
 msgstr "Šios adresų knygos posistemei nepavyko apdoroti šios užklausos. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:229
 #, c-format
 msgid "The backend for this address book refused to perform this query. %s"
 msgstr "Šios adresų knygos posistemė atsisakė atlikti šią užklausą. %s"
 
 #. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#: ../addressbook/gui/widgets/eab-gui-util.c:232
+#: ../addressbook/gui/widgets/eab-gui-util.c:235
+#: ../addressbook/gui/widgets/eab-gui-util.c:241
 #, c-format
 msgid "This query did not complete successfully. %s"
 msgstr "Ši užklausa nebuvo atlikta. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:254
+#: ../addressbook/gui/widgets/eab-gui-util.c:263
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:294
+#: ../addressbook/gui/widgets/eab-gui-util.c:308
 msgid "Select Address Book"
 msgstr "Pasirinkti adresų knygą"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:357
+#: ../addressbook/gui/widgets/eab-gui-util.c:375
 msgid "list"
 msgstr "sąrašas"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:533
+#: ../addressbook/gui/widgets/eab-gui-util.c:559
 msgid "Move contact to"
 msgstr "Perkelti kontaktą į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:535
+#: ../addressbook/gui/widgets/eab-gui-util.c:561
 msgid "Copy contact to"
 msgstr "Nukopijuoti kontaktą į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:538
+#: ../addressbook/gui/widgets/eab-gui-util.c:564
 msgid "Move contacts to"
 msgstr "Perkelti kontaktus į"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:540
+#: ../addressbook/gui/widgets/eab-gui-util.c:566
 msgid "Copy contacts to"
 msgstr "Nukopijuoti kontaktus į"
 
@@ -1337,65 +1339,65 @@ msgstr "Nukopijuoti kontaktus į"
 msgid "Card View"
 msgstr "Kortelių rodinys"
 
-#: ../addressbook/importers/evolution-csv-importer.c:741
-#: ../addressbook/importers/evolution-ldif-importer.c:539
-#: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:401
-#: ../calendar/importers/icalendar-importer.c:868
-#: ../calendar/importers/icalendar-importer.c:907
+#: ../addressbook/importers/evolution-csv-importer.c:748
+#: ../addressbook/importers/evolution-ldif-importer.c:546
+#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../calendar/importers/icalendar-importer.c:413
+#: ../calendar/importers/icalendar-importer.c:903
+#: ../calendar/importers/icalendar-importer.c:942
 #: ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Importuojama..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1040
+#: ../addressbook/importers/evolution-csv-importer.c:1075
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV arba Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1076
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV ir Tab importavimas"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1049
+#: ../addressbook/importers/evolution-csv-importer.c:1084
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV arba Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1085
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV ir Tab importavimas"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1058
+#: ../addressbook/importers/evolution-csv-importer.c:1093
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV arba Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1094
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV ir Tab importavimas"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:777
+#: ../addressbook/importers/evolution-ldif-importer.c:796
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP duomenų apsikeitimo formatas (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:778
+#: ../addressbook/importers/evolution-ldif-importer.c:797
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importavimas"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:648
+#: ../addressbook/importers/evolution-vcard-importer.c:657
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:649
+#: ../addressbook/importers/evolution-vcard-importer.c:658
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard importavimas"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:716
+#: ../addressbook/printing/e-contact-print.c:719
 #, c-format
 msgid "Page %d"
 msgstr "%d puslapis"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:654
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:689
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
 msgstr "Nepavyko atverti failo."
@@ -1407,16 +1409,14 @@ msgstr "Nepavyko gauti adresų knygų sąrašo: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/event-page.c:2894
-#: ../calendar/gui/dialogs/memo-page.c:932
-#: ../calendar/gui/dialogs/task-page.c:1739
-#: ../em-format/em-format.c:2316
+#: ../calendar/gui/dialogs/memo-page.c:938
+#: ../em-format/em-format.c:2324
 #: ../mail/em-folder-tree.c:678
-#: ../mail/mail-ops.c:658
-#: ../plugins/caldav/caldav-browse-server.c:209
-#: ../plugins/caldav/caldav-browse-server.c:1406
-#: ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:312
+#: ../mail/mail-ops.c:662
+#: ../plugins/caldav/caldav-browse-server.c:220
+#: ../plugins/caldav/caldav-browse-server.c:1469
+#: ../plugins/face/face.c:174
+#: ../smime/gui/certificate-manager.c:313
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
@@ -1457,377 +1457,386 @@ msgstr "Kortelių kiekis viename išvedimo faile naudojant asinchroninę veiksen
 msgid "NUMBER"
 msgstr "SKAIÄŒIUS"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:138
+#: ../addressbook/tools/evolution-addressbook-export.c:139
 msgid "Command line arguments error, please use --help option to see the usage."
 msgstr "Komandinės eilutės parametrų klaida. Norėdami pamatyti kaip naudotis, naudokite parinktį --help."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:152
+#: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Only support csv or vcard format."
 msgstr "Palaiko tik csv arba vcard formatus."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:162
 msgid "In async mode, output must be file."
 msgstr "Asinchroninėje veiksenoje išvestis turi būti failas."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:169
+#: ../addressbook/tools/evolution-addressbook-export.c:170
 msgid "In normal mode, there is no need for the size option."
 msgstr "Normalioje veiksenoje dydžio parametras nėra būtinas."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:200
+#: ../addressbook/tools/evolution-addressbook-export.c:201
 msgid "Unhandled error"
 msgstr "Neapdorota klaida"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
+msgid "'{0}' does not support assigned tasks, please select a different task list."
+msgstr "'{0}' nepalaiko pateiktų užduo�ių, pasirinkite kitą užduo�ių sąrašą."
+
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:4
 msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
 msgstr "„{0}“ yra tik skaitomas kalendorius ir jo negalima taisyti. Šoninės juostos Kalendoriaus rodinyje pasirinkite kitą kalendorių."
 
 #. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
 msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
 msgstr "„{0}“ yra tik skaitymui skirtas kalendorius, kurio negalima taisyti. Pasirinkite kitą kalendorių, kuris galintį priimti paskyrimus."
 
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
 msgid "Adding a meaningful summary to your appointment will give you an idea of what your appointment is about."
 msgstr "Pridėdami reikšmingą paskyrimo santrauką galėsite grei�iau suprasti, apie ką šis paskyrimas."
 
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
 msgid "Adding a meaningful summary to your task will give you an idea of what your task is about."
 msgstr "Pridėdami reikšmingą užduoties santrauką galėsite lengviau suprasti, apie ką ši užduotis."
 
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
 msgid "All information in these memos will be deleted and can not be restored."
 msgstr "Visa informacija šiuose rašteliuose bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
 msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Visa informacija šiame raštelyje bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
 msgid "All information on these appointments will be deleted and can not be restored."
 msgstr "Visa informacija apie šiuos įvykius bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
 msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Visa informacija apie šias užduotis bus ištrina ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
 msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Visa šio paskyrimo informacija bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
 msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Visa informacija apie šį susitikimą bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
 msgid "All information on this memo will be deleted and can not be restored."
 msgstr "Visa informacija šiame raštelyje bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "Visa šios užduoties informacija bus ištrinta ir negalės būti atkurta."
 
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "Ar tikrai norite ištrinti užduotį „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Ar tikrai norite ištrinti įvykį „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "Ar tikrai norite ištrinti susitikimą „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "Ar tikrai norite ištrinti raštelį „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "Ar tikrai norite ištrinti šiuos {0} įvykius?"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "Ar tikrai norite ištrinti šiuos {0} raštelius?"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "Ar tikrai norite ištrinti šias {0} užduotis?"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
 msgid "Are you sure you want to delete this appointment?"
 msgstr "Ar tikrai norite pašalinti šį susitikimą?"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:187
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:190
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Ar tikrai norite pašalinti šį susitikimą?"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Ar tikrai norite ištrinti šį raštelį?"
 
-#: ../calendar/calendar.error.xml.h:25
-#: ../calendar/gui/dialogs/delete-comp.c:190
+#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Ar tikrai norite pašalinti šią užduotį?"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Ar tikrai norite įrašyti paskyrimą be santraukos?"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Ar tikrai norite išsaugoti raštelį neparašę santraukos?"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:30
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Ar tikrai norite įrašyti užduotį be santraukos?"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot create a new event"
 msgstr "Negalima sukurti naujo įvykio"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
 msgid "Cannot save event"
 msgstr "Negalima išsaugoti įvykio"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
+msgid "Cannot save task"
+msgstr "Negalima išsaugoti užduoties"
+
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete calendar '{0}'?"
 msgstr "Ištrinti kalendorių „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:35
 msgid "Delete memo list '{0}'?"
 msgstr "Ištrinti raštelių sąrašą „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:36
 msgid "Delete task list '{0}'?"
 msgstr "Ištrinti užduo�ių sąrašą „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:38
 msgid "Do _not Send"
 msgstr "_Nesiųsti"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:39
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Šiuo metu atsiun�iama. Ar norite išsaugoti šį susitikimą?"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:40
 msgid "Download in progress. Do you want to save the task?"
 msgstr "Šiuo metu atsiun�iama. Ar norite išsaugoti šią užduotį?"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:41
 msgid "Editor could not be loaded."
 msgstr "Nepavyko atverti redaktoriaus.."
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:42
 msgid "Email invitations will be sent to all participants and allow them to accept this task."
 msgstr "Visiems dalyviams pakvietimai bus išsiųsti el. paštu ir jie galės priimti šią užduotį."
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:43
 msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr "Visiems dalyviams pakvietimai bus išsiųsti el. paštu ir jie galės atsakyti."
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:44
 msgid "Error loading calendar"
 msgstr "Klaida įkeliant kalendorių"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error loading memo list"
 msgstr "Klaida įkeliant raštelių sąrašą"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:46
 msgid "Error loading task list"
 msgstr "Klaida įkeliant užduo�ių sąrašą"
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:49
 msgid "Error on {0}: {1}"
 msgstr "Klaida {0}: {1}"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
 msgstr "Jeigu neišsiųsite perspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, kad susitikimas atšauktas."
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
 msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
 msgstr "Jeigu neišsiųsite perspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, kad šis raštelis buvo ištrintas."
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:52
 msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
 msgstr "Jeigu neišsiųsite perspėjimo apie atšaukimą, kiti dalyviai gali nežinoti, kad ši užduotis buvo ištrinta."
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
 msgid "Sending updated information allows other participants to keep their calendars up to date."
 msgstr "Atnaujintos informacijos išsiuntimas leidžia kitiems dalyviams turėti jų kalendorius atnaujintus."
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:54
 msgid "Sending updated information allows other participants to keep their task lists up to date."
 msgstr "Atnaujintos informacijos išsiuntimas leidžia kitiems dalyviams turėti jų užduo�ių sąrašus atnaujintus."
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:55
 msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
 msgstr "Šiuo metu atsiun�iami prisegti failai. Jeigu išsaugosite paskyrimą, šie prisegti failai bus prarasti."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:56
 msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
 msgstr "Šiuo metu atsiun�iami prisegti failai. Jeigu išsaugosite užduotį, šie prisegti failai bus prarasti."
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:57
 msgid "Some features may not work properly with your current server."
 msgstr "Kai kurios funkcijos gali veikti nekorektiškai su nurodytu serveriu."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:58
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution kalendorius netikėtai užsidarė."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:59
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution kalendoriai netikėtai užsidarė."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution raštelis netikėtai užsidarė."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution užduotys netikėtai užsidarė."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:62
 msgid "The calendar is not marked for offline usage."
 msgstr "Kalendorius nepažymėtas naudojimui atsijungus."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:63
 msgid "The memo list is not marked for offline usage."
 msgstr "Raštelių sąrašas nepažymėtas naudojimui atsijungus."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:64
 msgid "The task list is not marked for offline usage."
 msgstr "Užduo�ių sąrašas nepažymėtas naudojimui atsijungus."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:65
 msgid "This calendar will be removed permanently."
 msgstr "Šis kalendorius bus ištrintas visam laikui."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:66
 msgid "This memo list will be removed permanently."
 msgstr "Šis raštelių sąrašas bus ištrintas visam laikui."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:67
 msgid "This task list will be removed permanently."
 msgstr "Šis užduo�ių sąrašas bus ištrintas visam laikui."
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Ar norite išsaugoti pakeitimus atliktus šiam įvykiui?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Ar norėtumėte išsaugoti šio susitikimo pakeitimus?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to save your changes to this memo?"
 msgstr "Ar norite išsaugoti šiame raštelyje atliktus pakeitimus?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this task?"
 msgstr "Ar norite išsaugoti pakeitimus atliktus šiai užduo�iai?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Ar norite išsiųsti perspėjimą apie šio raštelio atšaukimą?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Ar norite išsiųsti visiems dalyviams perspėjimą apie atšaukimą?"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Ar norite išsiųsti susitikimo dalyviams pakvietimus?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send this task to participants?"
 msgstr "Ar norite dalyviams išsiųsti šią užduotį?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Ar norite dalyviams išsiųsti atnaujintą susitikimo informaciją?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send updated task information to participants?"
 msgstr "Ar norite dalyviams išsiųsti atnaujintą užduoties informaciją?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
 msgstr "Jungiatės prie nepalaikomo GroupWise serverio, todėl gali kilti problemų naudojantis Evolution. Norint pasiekti geriausių rezultatų, serveris turėtų būti atnaujintas iki palaikomos versijos."
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Pakeitėte šį paskyrimą, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Pakeitėte šį susitikimą, ta�iau dar jo neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid "You have changed this task, but not yet saved it."
 msgstr "Pakeitėte šią užduotį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Pakeitėte šį raštelį, bet pakeitimų dar neišsaugojote."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalendoriai bus neprieinami kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:84
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Rašteliai nebus prieinami, kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:85
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Užduotys nebus prieinamos, kol Evolution nebus paleista iš naujo."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:86
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "_Atsisakyti pakeitimų"
 
-#: ../calendar/calendar.error.xml.h:84
-#: ../composer/e-composer-actions.c:317
+#: ../calendar/calendar.error.xml.h:87
+#: ../composer/e-composer-actions.c:316
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:88
 msgid "_Save Changes"
 msgstr "Į_rašyti pakeitimus"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:89
 #: ../composer/mail-composer.error.xml.h:34
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:167
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Siųsti"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:90
 msgid "_Send Notice"
 msgstr "_Siųsti perspėjimą"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:107
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minutÄ—"
 msgstr[1] "minutes"
 msgstr[2] "minu�ių"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "valanda"
@@ -1835,17 +1844,17 @@ msgstr[1] "valandos"
 msgstr[2] "valandų"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-#. (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1189
+#. * (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/alarm-notify/alarm-notify-dialog.c:133
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
 msgid "day"
 msgid_plural "days"
 msgstr[0] "diena"
 msgstr[1] "dienos"
 msgstr[2] "dienų"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:313
 msgid "Start time"
 msgstr "Pradžios laikas"
 
@@ -1859,9 +1868,9 @@ msgstr "Atsisakyti _visų"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1738
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1748
+#: ../plugins/itip-formatter/itip-view.c:1052
 msgid "Location:"
 msgstr "Vieta:"
 
@@ -1870,7 +1879,7 @@ msgid "Snooze _time:"
 msgstr "Snūs_telėjimo laikas:"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
-#: ../e-util/e-alert.c:916
+#: ../e-util/e-alert.c:919
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:5
 msgid "_Dismiss"
 msgstr "_Atsisakyti"
@@ -1883,10 +1892,10 @@ msgstr "_Snūstelti"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:428
+#: ../e-util/e-plugin-util.c:454
 #: ../filter/filter.ui.h:14
 #: ../modules/calendar/e-cal-shell-view-actions.c:350
-#: ../plugins/google-account-setup/google-contacts-source.c:379
+#: ../plugins/google-account-setup/google-contacts-source.c:387
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
 msgid "days"
 msgstr "dienos"
@@ -1894,9 +1903,9 @@ msgstr "dienos"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 #: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../e-util/e-plugin-util.c:427
+#: ../e-util/e-plugin-util.c:453
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:378
+#: ../plugins/google-account-setup/google-contacts-source.c:386
 msgid "hours"
 msgstr "valandų"
 
@@ -1908,28 +1917,28 @@ msgstr "paskyrimo vieta"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 #: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../e-util/e-plugin-util.c:426
+#: ../e-util/e-plugin-util.c:452
 #: ../filter/filter.ui.h:17
 #: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-contacts-source.c:385
 msgid "minutes"
 msgstr "minu�ių"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1587
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
 msgid "No summary available."
 msgstr "NÄ—ra jokios santraukos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No description available."
 msgstr "Nėra jokio aprašymo."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1606
 msgid "No location information available."
 msgstr "NÄ—ra vietos informacijos."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1652
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1937,12 +1946,12 @@ msgstr[0] "Turite %d perspÄ—jimÄ…"
 msgstr[1] "Turite %d perspÄ—jimus"
 msgstr[2] "Turite %d perspėjimų"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1887
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1856
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1954,7 +1963,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1893
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
@@ -1969,17 +1978,17 @@ msgstr ""
 "\n"
 "Ar esate tikri, kad ši komanda turi būti paleista?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1908
 msgid "Do not ask me about this program again."
 msgstr "KitÄ… kartÄ… nebeklausti apie Å¡iÄ… programÄ…."
 
-#: ../calendar/gui/alarm-notify/util.c:44
+#: ../calendar/gui/alarm-notify/util.c:45
 msgid "invalid time"
 msgstr "netinkamas laikas"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:396
+#: ../calendar/gui/alarm-notify/util.c:71
+#: ../calendar/gui/e-alarm-list.c:405
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -1989,8 +1998,8 @@ 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/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:402
+#: ../calendar/gui/alarm-notify/util.c:77
+#: ../calendar/gui/e-alarm-list.c:411
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2002,8 +2011,8 @@ msgstr[2] "%d minu�ių"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/alarm-notify/util.c:81
+#: ../calendar/gui/e-alarm-list.c:417
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2012,19 +2021,19 @@ msgstr[0] "%d sekundÄ—"
 msgstr[1] "%d sekundÄ—s"
 msgstr[2] "%d sekundžių"
 
-#: ../calendar/gui/calendar-view-factory.c:116
+#: ../calendar/gui/calendar-view-factory.c:111
 msgid "Day View"
 msgstr "Dienos rodinys"
 
-#: ../calendar/gui/calendar-view-factory.c:119
+#: ../calendar/gui/calendar-view-factory.c:114
 msgid "Work Week View"
 msgstr "Darbo savaitÄ—s rodinys"
 
-#: ../calendar/gui/calendar-view-factory.c:122
+#: ../calendar/gui/calendar-view-factory.c:117
 msgid "Week View"
 msgstr "SavaitÄ—s rodinys"
 
-#: ../calendar/gui/calendar-view-factory.c:125
+#: ../calendar/gui/calendar-view-factory.c:120
 msgid "Month View"
 msgstr "MÄ—nesio rodinys"
 
@@ -2059,9 +2068,9 @@ msgid "Classification"
 msgstr "Klasifikacija"
 
 #: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:774
-#: ../calendar/gui/e-task-table.c:495
+#: ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:779
+#: ../calendar/gui/e-task-table.c:504
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
@@ -2071,7 +2080,7 @@ msgstr "Konfidencialus"
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../modules/plugin-manager/evolution-plugin-manager.c:71
+#: ../modules/plugin-manager/evolution-plugin-manager.c:70
 #: ../widgets/misc/e-attachment-tree-view.c:526
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
@@ -2091,116 +2100,132 @@ msgid "Do Not Exist"
 msgstr "Neegzistuoja"
 
 #: ../calendar/gui/caltypes.xml.h:11
+msgid "Exactly"
+msgstr "Tiksliai"
+
+#: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/memotypes.xml.h:10
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Egzistuoja"
 
-#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:13
+msgid "Less Than"
+msgstr "Mažesnis už"
+
+#: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
 #: ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:835
+#: ../plugins/publish-calendar/publish-calendar.c:855
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Location"
 msgstr "Vieta"
 
-#: ../calendar/gui/caltypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15
+msgid "More Than"
+msgstr "Daugiau nei"
+
+#: ../calendar/gui/caltypes.xml.h:16
+msgid "Occurs"
+msgstr "Pasitaiko"
+
+#: ../calendar/gui/caltypes.xml.h:17
 #: ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizatorius"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:772
-#: ../calendar/gui/e-task-table.c:494
+#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:777
+#: ../calendar/gui/e-task-table.c:503
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Asmeniškas"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:763
-#: ../calendar/gui/e-cal-model.c:770
-#: ../calendar/gui/e-task-table.c:493
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:768
+#: ../calendar/gui/e-cal-model.c:775
+#: ../calendar/gui/e-task-table.c:502
 #: ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Viešas"
 
-#: ../calendar/gui/caltypes.xml.h:16
+#: ../calendar/gui/caltypes.xml.h:20
 #: ../calendar/gui/dialogs/event-editor.c:317
 #: ../calendar/gui/dialogs/event-editor.c:338
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: ../calendar/gui/caltypes.xml.h:17
+#: ../calendar/gui/caltypes.xml.h:21
 #: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6
 #: ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Summary"
 msgstr "Apžvalga"
 
-#: ../calendar/gui/caltypes.xml.h:18
+#: ../calendar/gui/caltypes.xml.h:22
 #: ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Santraukoje yra"
 
-#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:23
 #: ../calendar/gui/memotypes.xml.h:16
 #: ../calendar/gui/tasktypes.xml.h:25
 #: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "susideda iš"
 
-#: ../calendar/gui/caltypes.xml.h:20
+#: ../calendar/gui/caltypes.xml.h:24
 #: ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:26
 #: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "nesusideda iš"
 
-#: ../calendar/gui/caltypes.xml.h:21
+#: ../calendar/gui/caltypes.xml.h:25
 #: ../calendar/gui/memotypes.xml.h:18
 #: ../calendar/gui/tasktypes.xml.h:27
 #: ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "yra"
 
-#: ../calendar/gui/caltypes.xml.h:22
+#: ../calendar/gui/caltypes.xml.h:26
 #: ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
 #: ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "nÄ—ra"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:626
+#: ../calendar/gui/dialogs/alarm-dialog.c:635
 msgid "Edit Reminder"
 msgstr "Keisti priminimÄ…"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:817
-#: ../calendar/gui/e-alarm-list.c:438
+#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/e-alarm-list.c:447
 msgid "Pop up an alert"
 msgstr "Parodyti perspÄ—jimÄ…"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:818
-#: ../calendar/gui/e-alarm-list.c:434
+#: ../calendar/gui/dialogs/alarm-dialog.c:827
+#: ../calendar/gui/e-alarm-list.c:443
 msgid "Play a sound"
 msgstr "Groti garsÄ…"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:819
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/dialogs/alarm-dialog.c:828
+#: ../calendar/gui/e-alarm-list.c:455
 msgid "Run a program"
 msgstr "Paleisti programÄ…"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:820
-#: ../calendar/gui/e-alarm-list.c:442
+#: ../calendar/gui/dialogs/alarm-dialog.c:829
+#: ../calendar/gui/e-alarm-list.c:451
 msgid "Send an email"
 msgstr "Siųsti laišką"
 
@@ -2291,7 +2316,7 @@ msgstr "minutÄ™(es)"
 msgid "start of appointment"
 msgstr "paskyrimo pradžią"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
 msgstr "Veiksmas / priežastis"
 
@@ -2305,190 +2330,189 @@ msgstr "Pri_dÄ—ti"
 msgid "Reminders"
 msgstr "Priminimai"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:164
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "Type:"
 msgstr "Tipas:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:180
-#: ../modules/addressbook/addressbook-config.c:516
+#: ../calendar/gui/dialogs/calendar-setup.c:185
+#: ../modules/addressbook/addressbook-config.c:527
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:242
-#: ../mail/mail-config.ui.h:155
+#: ../calendar/gui/dialogs/calendar-setup.c:248
+#: ../mail/mail-config.ui.h:156
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "Pavadi_nimas:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:291
+#: ../calendar/gui/dialogs/calendar-setup.c:300
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_Kopijuoti kalendoriaus turinį į vietinį kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:293
+#: ../calendar/gui/dialogs/calendar-setup.c:302
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "K_opijuoti užduo�ių sąrašą į vietinį kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:295
+#: ../calendar/gui/dialogs/calendar-setup.c:304
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Ko_pijuoti raštelių sąrašo turinį į vietinį kompiuterį darbui neprisijungus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:340
-#| msgid "Show display reminders in notification tray"
+#: ../calendar/gui/dialogs/calendar-setup.c:350
 msgid "Sh_ow reminder notifications"
 msgstr "_Rodyti priminimų pranešimus"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:413
+#: ../calendar/gui/dialogs/calendar-setup.c:425
 msgid "Colo_r:"
 msgstr "Sp_alva:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:436
 #: ../calendar/gui/dialogs/calendar-setup.c:448
-#: ../calendar/gui/dialogs/calendar-setup.c:459
-#: ../mail/em-folder-properties.c:233
+#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:471
+#: ../mail/em-folder-properties.c:235
 #: ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1052
-#: ../modules/addressbook/autocompletion-config.c:218
+#: ../modules/addressbook/addressbook-config.c:1077
+#: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
-#: ../plugins/itip-formatter/itip-formatter.c:3001
+#: ../plugins/itip-formatter/itip-formatter.c:3038
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "EsmÄ—"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../calendar/gui/dialogs/calendar-setup.c:461
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Task List"
 msgstr "Užduo�ių sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:460
+#: ../calendar/gui/dialogs/calendar-setup.c:472
 msgid "Memo List"
 msgstr "Raštelių sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:548
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "Calendar Properties"
 msgstr "Kalendoriaus savybÄ—s"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:548
+#: ../calendar/gui/dialogs/calendar-setup.c:564
 msgid "New Calendar"
 msgstr "Naujas kalendorius"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:607
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Task List Properties"
 msgstr "Užduo�ių sąrašo savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:607
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Task List"
 msgstr "Naujas užduo�ių sąrašas"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:666
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "Memo List Properties"
 msgstr "Raštelių sąrašo savybės"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:666
+#: ../calendar/gui/dialogs/calendar-setup.c:684
 msgid "New Memo List"
 msgstr "Naujas raštelių sąrašas"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
+#: ../calendar/gui/dialogs/changed-comp.c:61
 msgid "This event has been deleted."
 msgstr "Šis įvykis buvo ištrintas."
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
+#: ../calendar/gui/dialogs/changed-comp.c:65
 msgid "This task has been deleted."
 msgstr "Ši užduotis buvo ištrinta."
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
+#: ../calendar/gui/dialogs/changed-comp.c:69
 msgid "This memo has been deleted."
 msgstr "Šis raštelis buvo ištrintas."
 
-#: ../calendar/gui/dialogs/changed-comp.c:76
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Padarėte pakeitimų. Užmiršti šiuos pakeitimus ir užverti redaktorių?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Nieko nepakeitėte, užverti redaktorių?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:83
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Šis įvykis buvo pakeistas."
 
-#: ../calendar/gui/dialogs/changed-comp.c:87
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Ši užduotis buvo pakeista."
 
-#: ../calendar/gui/dialogs/changed-comp.c:91
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Šis raštelis buvo pakeistas."
 
-#: ../calendar/gui/dialogs/changed-comp.c:100
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Padarėte pakeitimų. Užmiršti šiuos pakeitimus ir atnaujinti redaktorių?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nieko nepakeitėte, atnaujinti redaktorių?"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:458
+#: ../calendar/gui/dialogs/comp-editor-page.c:461
 #, c-format
 msgid "Validation error: %s"
 msgstr "Tikrinimo klaida: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:273
+#: ../calendar/gui/dialogs/comp-editor.c:274
 msgid "Could not save attachments"
 msgstr "Nepavyko įrašyti priedų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:611
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: ../calendar/gui/dialogs/comp-editor.c:739
+#: ../calendar/gui/dialogs/comp-editor.c:748
 msgid "Edit Appointment"
 msgstr "Keisti paskyrimÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:746
+#: ../calendar/gui/dialogs/comp-editor.c:755
 #, c-format
 msgid "Meeting - %s"
 msgstr "Susitikimas – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:748
+#: ../calendar/gui/dialogs/comp-editor.c:757
 #, c-format
 msgid "Appointment - %s"
 msgstr "Paskyrimas – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:754
+#: ../calendar/gui/dialogs/comp-editor.c:763
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Priskirta užduotis – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:756
+#: ../calendar/gui/dialogs/comp-editor.c:765
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Memo - %s"
 msgstr "Raštelis – %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "No Summary"
 msgstr "NÄ—ra santraukos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:898
+#: ../calendar/gui/dialogs/comp-editor.c:907
 msgid "Keep original item?"
 msgstr "Palikti originalų elementą?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "Close the current window"
 msgstr "Užverti esamą langą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1127
 #: ../mail/e-mail-browser.c:141
 #: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117
@@ -2498,7 +2522,7 @@ msgstr "Užverti esamą langą"
 msgid "Copy the selection"
 msgstr "Kopijuoti pažymėjimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 #: ../mail/e-mail-browser.c:148
 #: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110
@@ -2507,18 +2531,18 @@ msgstr "Kopijuoti pažymėjimą"
 msgid "Cut the selection"
 msgstr "Iškirpti pažymėjimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 #: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131
 #: ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
 msgstr "Ištrinti pažymėjimą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1127
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "View help"
 msgstr "Rodyti pagalbÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 #: ../mail/e-mail-browser.c:155
 #: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124
@@ -2527,11 +2551,11 @@ msgstr "Rodyti pagalbÄ…"
 msgid "Paste the clipboard"
 msgstr "Įdėti iš krepšio"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1155
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Save current changes"
 msgstr "Įrašyti dabartinius pakeitimus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1162
+#: ../calendar/gui/dialogs/comp-editor.c:1183
 #: ../mail/e-mail-browser.c:162
 #: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138
@@ -2539,11 +2563,11 @@ msgstr "Įrašyti dabartinius pakeitimus"
 msgid "Select all text"
 msgstr "Pažymėti visą tekstą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1169
+#: ../calendar/gui/dialogs/comp-editor.c:1190
 msgid "_Classification"
 msgstr "_Klasifikacija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1176
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6
 #: ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
@@ -2553,163 +2577,163 @@ msgstr "_Klasifikacija"
 msgid "_Edit"
 msgstr "_Keisti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1183
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 #: ../mail/e-mail-browser.c:169
 #: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "_Failas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../calendar/gui/dialogs/comp-editor.c:1211
 #: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1197
+#: ../calendar/gui/dialogs/comp-editor.c:1218
 msgid "_Insert"
 msgstr "Įt_erpti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
-#: ../composer/e-composer-actions.c:340
+#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../composer/e-composer-actions.c:339
 msgid "_Options"
 msgstr "_Parinktys"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1211
+#: ../calendar/gui/dialogs/comp-editor.c:1232
 #: ../mail/e-mail-browser.c:183
 #: ../shell/e-shell-window-actions.c:1651
 #: ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "R_odymas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221
-#: ../composer/e-composer-actions.c:289
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../composer/e-composer-actions.c:288
 msgid "_Attachment..."
 msgstr "P_riedÄ…..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
-#: ../composer/e-composer-actions.c:291
+#: ../calendar/gui/dialogs/comp-editor.c:1244
+#: ../composer/e-composer-actions.c:290
 #: ../widgets/misc/e-attachment-view.c:439
 msgid "Attach a file"
 msgstr "Prisegti failÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "_Categories"
 msgstr "_Kategorijos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1233
+#: ../calendar/gui/dialogs/comp-editor.c:1254
 msgid "Toggles whether to display categories"
 msgstr "Perjungia kategorijų matomumą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1239
+#: ../calendar/gui/dialogs/comp-editor.c:1260
 msgid "Time _Zone"
 msgstr "Laiko j_uosta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
+#: ../calendar/gui/dialogs/comp-editor.c:1262
 msgid "Toggles whether the time zone is displayed"
 msgstr "Perjungia laiko juostos matomumÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1271
 msgid "Pu_blic"
 msgstr "_Viešas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1273
 msgid "Classify as public"
 msgstr "Klasifikuoti kaip viešą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257
+#: ../calendar/gui/dialogs/comp-editor.c:1278
 msgid "_Private"
 msgstr "_Asmeniškas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Classify as private"
 msgstr "Klasifikuoti kaip privatų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../calendar/gui/dialogs/comp-editor.c:1285
 msgid "_Confidential"
 msgstr "_Konfidencialus"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1266
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Classify as confidential"
 msgstr "Klasifikuoti kaip konfidencialų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1274
+#: ../calendar/gui/dialogs/comp-editor.c:1295
 msgid "R_ole Field"
 msgstr "Vai_dmens laukas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276
+#: ../calendar/gui/dialogs/comp-editor.c:1297
 msgid "Toggles whether the Role field is displayed"
 msgstr "Perjungia vaidmens laukelio matomumÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../calendar/gui/dialogs/comp-editor.c:1303
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../calendar/gui/dialogs/comp-editor.c:1305
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Perjungia RSVP laukelio matomumÄ…"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1290
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "_Status Field"
 msgstr "_BÅ«senos laukelis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1313
 msgid "Toggles whether the Status field is displayed"
 msgstr "Perjungia būsenos laukelio matomumą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1319
 msgid "_Type Field"
 msgstr "_Tipo laukelis"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1300
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Perjungia dalyvių tipo laukelio matomumą"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1345
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "Paskutinieji _dokumentai"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2053
-#: ../composer/e-composer-actions.c:508
+#: ../calendar/gui/dialogs/comp-editor.c:2078
+#: ../composer/e-composer-actions.c:507
 msgid "Attach"
 msgstr "Prisegti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2389
-#: ../calendar/gui/dialogs/comp-editor.c:2552
-#: ../calendar/gui/dialogs/comp-editor.c:3533
+#: ../calendar/gui/dialogs/comp-editor.c:2426
+#: ../calendar/gui/dialogs/comp-editor.c:2589
+#: ../calendar/gui/dialogs/comp-editor.c:3581
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Šio elemento pakeitimai bus prarasti, jei bus atnaujinimų"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3497
-#: ../plugins/prefer-plain/prefer-plain.c:64
+#: ../calendar/gui/dialogs/comp-editor.c:3545
+#: ../plugins/prefer-plain/prefer-plain.c:67
 msgid "attachment"
 msgstr "priedas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3565
+#: ../calendar/gui/dialogs/comp-editor.c:3613
 msgid "Unable to use current version!"
 msgstr "Nepavyko naudoti dabartinÄ—s versijos!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:111
+#: ../calendar/gui/dialogs/copy-source-dialog.c:114
 msgid "Could not open destination"
 msgstr "Nepavyko atverti paskirties vietos"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:127
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Paskirties vieta yra tik skaitoma"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:161
+#: ../calendar/gui/dialogs/copy-source-dialog.c:164
 msgid "Cannot create object"
 msgstr "Nepavyko sukurti objekto"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:190
+#: ../calendar/gui/dialogs/copy-source-dialog.c:193
 msgid "Could not open source"
 msgstr "Nepavyko atverti Å¡altinio"
 
-#: ../calendar/gui/dialogs/delete-comp.c:210
+#: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ištrinti šį elementą iš visų kitų gavėjų dėžu�ių?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:213
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Retract comment"
 msgstr "_Atsisakyti komentaro"
 
@@ -2840,13 +2864,13 @@ msgid "Query free / busy information for the attendees"
 msgstr "Užklausti dalyvių užimtumo informacijos"
 
 #: ../calendar/gui/dialogs/event-editor.c:314
-#: ../calendar/gui/print.c:3184
+#: ../calendar/gui/print.c:3308
 msgid "Appointment"
 msgstr "Paskyrimas"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
 #: ../calendar/gui/dialogs/event-page.ui.h:2
-#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-list-view.c:161
 msgid "Attendees"
 msgstr "Dalyviai"
 
@@ -2867,7 +2891,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Negalima taisyti visų įvykio ypatybių, kadangi nesate jo organizatorius"
 
 #: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3049
+#: ../calendar/gui/dialogs/event-page.c:3082
 msgid "This event has reminders"
 msgstr "Šiam įvykiui yra perspėjimų"
 
@@ -2877,70 +2901,70 @@ msgstr "Šiam įvykiui yra perspėjimų"
 msgid "Or_ganizer:"
 msgstr "Or_ganizatorius:"
 
-#: ../calendar/gui/dialogs/event-page.c:1262
+#: ../calendar/gui/dialogs/event-page.c:1263
 msgid "Event with no start date"
 msgstr "Įvykis be pradžios datos"
 
-#: ../calendar/gui/dialogs/event-page.c:1265
+#: ../calendar/gui/dialogs/event-page.c:1266
 msgid "Event with no end date"
 msgstr "Įvykis be pabaigos datos"
 
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:707
-#: ../calendar/gui/dialogs/task-page.c:819
+#: ../calendar/gui/dialogs/event-page.c:1439
+#: ../calendar/gui/dialogs/memo-page.c:708
+#: ../calendar/gui/dialogs/task-page.c:825
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
 
-#: ../calendar/gui/dialogs/event-page.c:1448
+#: ../calendar/gui/dialogs/event-page.c:1449
 msgid "End date is wrong"
 msgstr "Klaidinga pabaigos data"
 
-#: ../calendar/gui/dialogs/event-page.c:1471
+#: ../calendar/gui/dialogs/event-page.c:1472
 msgid "Start time is wrong"
 msgstr "Klaidingas pradžios laikas"
 
-#: ../calendar/gui/dialogs/event-page.c:1478
+#: ../calendar/gui/dialogs/event-page.c:1479
 msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
-#: ../calendar/gui/dialogs/event-page.c:1643
-#: ../calendar/gui/dialogs/memo-page.c:748
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1644
+#: ../calendar/gui/dialogs/memo-page.c:749
+#: ../calendar/gui/dialogs/task-page.c:879
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: ../calendar/gui/dialogs/event-page.c:1677
-#: ../calendar/gui/dialogs/task-page.c:907
+#: ../calendar/gui/dialogs/event-page.c:1678
+#: ../calendar/gui/dialogs/task-page.c:913
 msgid "At least one attendee is required."
 msgstr "BÅ«tinas bent vienas dalyvis."
 
-#: ../calendar/gui/dialogs/event-page.c:1878
+#: ../calendar/gui/dialogs/event-page.c:1885
 msgid "_Delegatees"
 msgstr "Atstova_i"
 
-#: ../calendar/gui/dialogs/event-page.c:1880
+#: ../calendar/gui/dialogs/event-page.c:1887
 msgid "Atte_ndees"
 msgstr "D_alyviai"
 
-#: ../calendar/gui/dialogs/event-page.c:2892
+#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Nepavyko atverti kalendoriaus „%s“: %s"
 
 #. Translators: This string is used when we are creating an Event
-#. (meeting or appointment)  on behalf of some other user
+#. * (meeting or appointment)  on behalf of some other user
 #. Translators: This string is used when we are creating a Memo
-#. on behalf of some other user
+#. * on behalf of some other user
 #. Translators: This string is used when we are creating a Task
-#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2967
-#: ../calendar/gui/dialogs/memo-page.c:1006
-#: ../calendar/gui/dialogs/task-page.c:1814
+#. * on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:3000
+#: ../calendar/gui/dialogs/memo-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1845
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Veikiate %s vardu"
 
-#: ../calendar/gui/dialogs/event-page.c:3278
+#: ../calendar/gui/dialogs/event-page.c:3327
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -2948,7 +2972,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:3284
+#: ../calendar/gui/dialogs/event-page.c:3333
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -2956,7 +2980,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:3290
+#: ../calendar/gui/dialogs/event-page.c:3339
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -2964,19 +2988,19 @@ 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:3309
+#: ../calendar/gui/dialogs/event-page.c:3358
 msgid "Customize"
 msgstr "Adaptuoti"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3315
+#: ../calendar/gui/dialogs/event-page.c:3364
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "NÄ—ra"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:564
 msgid "Atte_ndees..."
 msgstr "D_alyviai..."
 
@@ -3001,7 +3025,7 @@ msgid "_Description:"
 msgstr "_Aprašymas:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../plugins/calendar-weather/calendar-weather.c:366
+#: ../plugins/calendar-weather/calendar-weather.c:381
 msgid "_Location:"
 msgstr "_Vieta:"
 
@@ -3096,7 +3120,7 @@ msgid "Select Date"
 msgstr "Pasirinkite datÄ…"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Select _Today"
 msgstr "Pažymė_ti šiandieną"
 
@@ -3105,7 +3129,7 @@ msgid "September"
 msgstr "RugsÄ—jis"
 
 #: ../calendar/gui/dialogs/memo-editor.c:105
-#: ../calendar/gui/print.c:3188
+#: ../calendar/gui/print.c:3312
 msgid "Memo"
 msgstr "Raštelis"
 
@@ -3125,17 +3149,17 @@ msgstr "Raštelio negalima taisyti, kadangi pasirinktasis raštelių sąrašas y
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Negalima taisyti visų raštelio ypatybių, kadangi nesate organizatorius"
 
-#: ../calendar/gui/dialogs/memo-page.c:930
+#: ../calendar/gui/dialogs/memo-page.c:936
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Nepavyko atverti raštelių su „%s“: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1138
+#: ../calendar/gui/dialogs/memo-page.c:1144
 #: ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1056
-#: ../mail/em-format-html.c:2573
-#: ../mail/em-format-html.c:2638
-#: ../mail/em-format-html.c:2662
+#: ../em-format/em-format.c:1062
+#: ../mail/em-format-html.c:2626
+#: ../mail/em-format-html.c:2691
+#: ../mail/em-format-html.c:2715
 #: ../mail/message-list.etspec.h:20
 #: ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
@@ -3156,7 +3180,7 @@ msgid "T_o:"
 msgstr "_Kam:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:333
+#: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Sąrašas:"
@@ -3201,17 +3225,17 @@ msgstr "Visus atvejus"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šiame paskyrime yra pasikartojimų, kurių Evolution negali taisyti."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:968
+#: ../calendar/gui/dialogs/recurrence-page.c:962
 msgid "Recurrence date is invalid"
 msgstr "Pasikartojimo data netinkama"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1008
+#: ../calendar/gui/dialogs/recurrence-page.c:1002
 msgid "End time of the recurrence was before event's start"
 msgstr "Pasikartojimo pabaigos laikas buvo prieš įvykio pradžią"
 
 #. 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:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "on"
 msgstr " "
 
@@ -3219,7 +3243,7 @@ msgstr " "
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
 msgid "first"
 msgstr "pirmÄ…"
 
@@ -3228,7 +3252,7 @@ msgstr "pirmÄ…"
 #. * (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:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1101
 msgid "second"
 msgstr "antrÄ…"
 
@@ -3236,7 +3260,7 @@ msgstr "antrÄ…"
 #. * (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:1107
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "third"
 msgstr "tre�ią"
 
@@ -3244,7 +3268,7 @@ msgstr "tre�ią"
 #. * (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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "fourth"
 msgstr "ketvirtÄ…"
 
@@ -3252,7 +3276,7 @@ msgstr "ketvirtÄ…"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "fifth"
 msgstr "penktÄ…"
 
@@ -3260,13 +3284,13 @@ msgstr "penktÄ…"
 #. * (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:1122
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "last"
 msgstr "paskutinį(-ę)"
 
 #. 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:1146
+#: ../calendar/gui/dialogs/recurrence-page.c:1145
 msgid "Other Date"
 msgstr "Kita data"
 
@@ -3274,7 +3298,7 @@ msgstr "Kita data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1151
 msgid "1st to 10th"
 msgstr "nuo 1-os iki 10-os"
 
@@ -3282,7 +3306,7 @@ msgstr "nuo 1-os iki 10-os"
 #. * 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:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1157
 msgid "11th to 20th"
 msgstr "nuo 11-os iki 20-os"
 
@@ -3290,41 +3314,41 @@ msgstr "nuo 11-os iki 20-os"
 #. * 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:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1163
 msgid "21st to 31st"
 msgstr "nuo 21-os iki 31-os"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1190
+#: ../calendar/gui/dialogs/recurrence-page.c:1189
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1191
+#: ../calendar/gui/dialogs/recurrence-page.c:1190
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1192
+#: ../calendar/gui/dialogs/recurrence-page.c:1191
 #: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Tre�iadienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
+#: ../calendar/gui/dialogs/recurrence-page.c:1192
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1194
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1194
 #: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1195
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Sunday"
 msgstr "Sekmadienis"
@@ -3332,31 +3356,31 @@ msgstr "Sekmadienis"
 #. 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:1318
+#: ../calendar/gui/dialogs/recurrence-page.c:1319
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1492
+#: ../calendar/gui/dialogs/recurrence-page.c:1494
 msgid "occurrences"
 msgstr "kartÄ…(-us)"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2204
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Add exception"
 msgstr "Pridėti išimtį"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2245
+#: ../calendar/gui/dialogs/recurrence-page.c:2251
 msgid "Could not get a selection to modify."
 msgstr "Nepavyko gauti pasirinkimo keitimui."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2251
+#: ../calendar/gui/dialogs/recurrence-page.c:2257
 msgid "Modify exception"
 msgstr "Keisti išimtį"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2295
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Could not get a selection to delete."
 msgstr "Nepavyko gauti pasirinkimo ištrynimui."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2429
+#: ../calendar/gui/dialogs/recurrence-page.c:2435
 msgid "Date/Time"
 msgstr "Data / laikas"
 
@@ -3419,11 +3443,11 @@ msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "metus"
 
-#: ../calendar/gui/dialogs/send-comp.c:192
+#: ../calendar/gui/dialogs/send-comp.c:197
 msgid "Send my reminders with this event"
 msgstr "Siųsti mano perspėjimus su šiuo įvykiu"
 
-#: ../calendar/gui/dialogs/send-comp.c:194
+#: ../calendar/gui/dialogs/send-comp.c:199
 msgid "Notify new attendees _only"
 msgstr "Pranešti tik naujiems _dalyviams"
 
@@ -3439,12 +3463,12 @@ msgstr "Tinklalapis"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:300
-#: ../calendar/gui/e-cal-model-tasks.c:439
-#: ../calendar/gui/e-cal-model-tasks.c:713
-#: ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225
-#: ../calendar/gui/e-task-table.c:597
-#: ../calendar/gui/print.c:3274
+#: ../calendar/gui/e-cal-model-tasks.c:440
+#: ../calendar/gui/e-cal-model-tasks.c:725
+#: ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234
+#: ../calendar/gui/e-task-table.c:606
+#: ../calendar/gui/print.c:3398
 #: ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180
 #: ../mail/em-sync-stream.c:202
@@ -3455,25 +3479,25 @@ msgstr "Atšaukta"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:297
-#: ../calendar/gui/e-cal-model-tasks.c:437
-#: ../calendar/gui/e-cal-model-tasks.c:711
+#: ../calendar/gui/e-cal-model-tasks.c:438
+#: ../calendar/gui/e-cal-model-tasks.c:723
 #: ../calendar/gui/e-meeting-store.c:206
 #: ../calendar/gui/e-meeting-store.c:229
-#: ../calendar/gui/e-task-table.c:208
-#: ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:596
-#: ../calendar/gui/print.c:3271
+#: ../calendar/gui/e-task-table.c:217
+#: ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:605
+#: ../calendar/gui/print.c:3395
 #: ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Completed"
 msgstr "Užbaigta"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-task-table.c:517
+#: ../calendar/gui/e-task-table.c:526
 #: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1223
+#: ../mail/message-list.c:1274
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
 msgstr "Aukštas"
@@ -3481,22 +3505,22 @@ msgstr "Aukštas"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:294
-#: ../calendar/gui/e-cal-model-tasks.c:435
-#: ../calendar/gui/e-cal-model-tasks.c:709
-#: ../calendar/gui/e-cal-model-tasks.c:786
-#: ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221
-#: ../calendar/gui/e-task-table.c:595
-#: ../calendar/gui/print.c:3268
+#: ../calendar/gui/e-cal-model-tasks.c:436
+#: ../calendar/gui/e-cal-model-tasks.c:721
+#: ../calendar/gui/e-cal-model-tasks.c:799
+#: ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230
+#: ../calendar/gui/e-task-table.c:604
+#: ../calendar/gui/print.c:3392
 msgid "In Progress"
 msgstr "Vykdoma"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-task-table.c:519
+#: ../calendar/gui/e-task-table.c:528
 #: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1221
+#: ../mail/message-list.c:1272
 #: ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
 msgstr "Žemas"
@@ -3504,10 +3528,10 @@ msgstr "Žemas"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model.c:1533
-#: ../calendar/gui/e-task-table.c:518
+#: ../calendar/gui/e-cal-model.c:1583
+#: ../calendar/gui/e-task-table.c:527
 #: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1222
+#: ../mail/message-list.c:1273
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
 msgstr "Normalus"
@@ -3515,12 +3539,12 @@ msgstr "Normalus"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:304
-#: ../calendar/gui/e-cal-model-tasks.c:433
-#: ../calendar/gui/e-cal-model-tasks.c:707
-#: ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3265
+#: ../calendar/gui/e-cal-model-tasks.c:434
+#: ../calendar/gui/e-cal-model-tasks.c:719
+#: ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228
+#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/print.c:3389
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "NepradÄ—ta"
@@ -3534,11 +3558,11 @@ msgid "Stat_us:"
 msgstr "BÅ«s_ena:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
+#. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
+#: ../calendar/gui/e-cal-model.c:3472
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1831
-#: ../calendar/gui/e-meeting-list-view.c:610
+#: ../calendar/gui/e-meeting-list-view.c:635
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/em-filter-i18n.h:72
@@ -3548,7 +3572,7 @@ msgstr "BÅ«sena"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:520
+#: ../calendar/gui/e-task-table.c:529
 #: ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
@@ -3580,8 +3604,8 @@ msgid "_Send Options"
 msgstr "_Siuntimo parinktys"
 
 #: ../calendar/gui/dialogs/task-editor.c:321
-#: ../calendar/gui/print.c:3186
-#: ../widgets/misc/e-send-options.c:526
+#: ../calendar/gui/print.c:3310
+#: ../widgets/misc/e-send-options.c:535
 msgid "Task"
 msgstr "Užduotis"
 
@@ -3609,16 +3633,20 @@ msgstr "Užduoties negalima taisyti, kadangi pasirinktasis užduo�ių sąrašas
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Negalima taisyti visų užduoties ypatybių, kadangi nesate organizatorius"
 
-#: ../calendar/gui/dialogs/task-page.c:341
+#: ../calendar/gui/dialogs/task-page.c:294
+msgid "Task cannot be edited, because the selected task list does not support assigned tasks"
+msgstr "Užduoties negalima taisyti, kadangi pasirinktasis užduo�ių sąrašas nepalaiko paskirtų užduo�ių"
+
+#: ../calendar/gui/dialogs/task-page.c:347
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zatorius:"
 
-#: ../calendar/gui/dialogs/task-page.c:801
+#: ../calendar/gui/dialogs/task-page.c:807
 msgid "Due date is wrong"
 msgstr "Termino data klaidinga"
 
-#: ../calendar/gui/dialogs/task-page.c:1737
+#: ../calendar/gui/dialogs/task-page.c:1764
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Nepavyko atverti užduo�ių su „%s“: %s"
@@ -3636,7 +3664,7 @@ msgid "Time zone:"
 msgstr "Laiko juosta:"
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:384
+#: ../calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3645,7 +3673,7 @@ msgstr[1] "%d dienos"
 msgstr[2] "%d dienų"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:390
+#: ../calendar/gui/e-alarm-list.c:399
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3653,68 +3681,68 @@ msgstr[0] "%d savaitÄ—"
 msgstr[1] "%d savaitÄ—s"
 msgstr[2] "%d savai�ių"
 
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:461
 msgid "Unknown action to be performed"
 msgstr "Nežinomas veiksmas, kurį reikia atlikti"
 
 #. 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:466
+#: ../calendar/gui/e-alarm-list.c:475
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s prieš paskyrimo pradžią"
 
 #. 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:471
+#: ../calendar/gui/e-alarm-list.c:480
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s po paskyrimo pradžios"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s paskyrimui prasidÄ—jus"
 
 #. 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:489
+#: ../calendar/gui/e-alarm-list.c:498
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s prieš paskyrimo pabaigą"
 
 #. 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:494
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s po paskyrimo pabaigos"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:501
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s paskyrimo pabaigoje"
 
 #. 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:525
+#: ../calendar/gui/e-alarm-list.c:534
 #, c-format
 msgid "%s at %s"
 msgstr "%s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:533
+#: ../calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s nežinomam priežasties tipui"
 
 #: ../calendar/gui/e-cal-component-preview.c:194
-#: ../filter/e-filter-rule.c:669
+#: ../filter/e-filter-rule.c:671
 msgid "Untitled"
 msgstr "BevardÄ—"
 
@@ -3737,7 +3765,7 @@ msgstr "Terminas:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:290
-#: ../plugins/itip-formatter/itip-view.c:1076
+#: ../plugins/itip-formatter/itip-view.c:1083
 msgid "Status:"
 msgstr "BÅ«sena:"
 
@@ -3757,7 +3785,7 @@ msgstr "Tinklalapis:"
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Created"
 msgstr "Sukurta"
 
@@ -3776,18 +3804,18 @@ msgstr "Paskutinįkart pakeista"
 msgid "Start Date"
 msgstr "Pradžios data"
 
-#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:571
+#: ../calendar/gui/e-cal-model-calendar.c:188
+#: ../calendar/gui/e-task-table.c:580
 msgid "Free"
 msgstr "Laisvas"
 
-#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546
-#: ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/e-cal-model-calendar.c:191
+#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-task-table.c:581
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../calendar/gui/e-cal-model-tasks.c:655
+#: ../calendar/gui/e-cal-model-tasks.c:665
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3798,55 +3826,91 @@ msgstr ""
 "45.436845,125.862501"
 
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:705
+#: ../calendar/gui/e-cal-model-tasks.c:717
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1539
-#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-cal-model-tasks.c:1090
+#: ../calendar/gui/e-cal-model.c:1589
+#: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:1028
+#: ../calendar/gui/e-meeting-store.c:1053
 msgid "Yes"
 msgstr "Taip"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061
-#: ../calendar/gui/e-cal-model.c:1539
-#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-cal-model-tasks.c:1090
+#: ../calendar/gui/e-cal-model.c:1589
+#: ../calendar/gui/e-meeting-list-view.c:203
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:776
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-list-view.c:191
+#: ../calendar/gui/e-cal-model.c:781
+#: ../calendar/gui/e-meeting-list-view.c:178
+#: ../calendar/gui/e-meeting-list-view.c:192
 #: ../calendar/gui/e-meeting-store.c:136
 #: ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234
-#: ../calendar/gui/print.c:1098
-#: ../calendar/gui/print.c:1115
+#: ../calendar/gui/print.c:1149
+#: ../calendar/gui/print.c:1166
 #: ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2658
+#: ../plugins/itip-formatter/itip-formatter.c:469
+#: ../plugins/itip-formatter/itip-formatter.c:2690
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: ../calendar/gui/e-cal-model.c:1535
+#: ../calendar/gui/e-cal-model.c:1585
 msgid "Recurring"
 msgstr "Pasikartojantis"
 
-#: ../calendar/gui/e-cal-model.c:1537
+#: ../calendar/gui/e-cal-model.c:1587
 msgid "Assigned"
 msgstr "Priskirtas"
 
-#: ../calendar/gui/e-cal-model.c:2811
+#: ../calendar/gui/e-cal-model.c:2971
 #, c-format
 msgid "Opening %s"
 msgstr "Atveriama %s"
 
+#: ../calendar/gui/e-cal-model.c:3416
+#: ../calendar/gui/e-meeting-list-view.c:214
+#: ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-store.c:221
+#: ../plugins/itip-formatter/itip-formatter.c:2678
+msgid "Accepted"
+msgstr "Priimtas"
+
+#: ../calendar/gui/e-cal-model.c:3417
+#: ../calendar/gui/e-meeting-list-view.c:215
+#: ../calendar/gui/e-meeting-store.c:200
+#: ../calendar/gui/e-meeting-store.c:223
+#: ../plugins/itip-formatter/itip-formatter.c:2684
+msgid "Declined"
+msgstr "Atmestas"
+
+#: ../calendar/gui/e-cal-model.c:3418
+#: ../calendar/gui/e-meeting-list-view.c:216
+#: ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/e-meeting-store.c:225
+#: ../calendar/gui/e-meeting-time-sel.c:546
+msgid "Tentative"
+msgstr "Negalutinis"
+
+#: ../calendar/gui/e-cal-model.c:3419
+#: ../calendar/gui/e-meeting-list-view.c:217
+#: ../calendar/gui/e-meeting-store.c:204
+#: ../calendar/gui/e-meeting-store.c:227
+#: ../plugins/itip-formatter/itip-formatter.c:2687
+msgid "Delegated"
+msgstr "Pavestas"
+
+#: ../calendar/gui/e-cal-model.c:3420
+msgid "Needs action"
+msgstr "Reikalauja veiksmo"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
@@ -3870,7 +3934,7 @@ msgstr "Terminas"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "Priority"
 msgstr "Prioritetas"
 
@@ -3879,83 +3943,47 @@ msgid "Start date"
 msgstr "Pradžios data"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:573
+#: ../calendar/gui/e-meeting-list-view.c:598
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
 #: ../widgets/misc/e-attachment-tree-view.c:584
 msgid "Type"
 msgstr "Tipas"
 
-#: ../calendar/gui/e-calendar-view.c:420
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Cut selected events to the clipboard"
 msgstr "Iškirpti pažymėtus įvykius į atmintinę"
 
-#: ../calendar/gui/e-calendar-view.c:426
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Copy selected events to the clipboard"
 msgstr "Kopijuoti pasirinktus įvykius į atmintinę"
 
-#: ../calendar/gui/e-calendar-view.c:432
+#: ../calendar/gui/e-calendar-view.c:435
 msgid "Paste events from the clipboard"
 msgstr "Įdėti įvykius iš atmintinės"
 
-#: ../calendar/gui/e-calendar-view.c:438
+#: ../calendar/gui/e-calendar-view.c:441
 msgid "Delete selected events"
 msgstr "Ištrinti pažymėtus įvykius"
 
-#: ../calendar/gui/e-calendar-view.c:457
+#: ../calendar/gui/e-calendar-view.c:460
 #: ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:260
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: ../calendar/gui/e-calendar-view.c:648
-#: ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/e-task-table.c:1094
+#: ../calendar/gui/e-calendar-view.c:656
+#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-task-table.c:1105
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
-#: ../calendar/gui/e-calendar-view.c:1778
-#: ../calendar/gui/e-meeting-list-view.c:213
-#: ../calendar/gui/e-meeting-store.c:198
-#: ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2646
-msgid "Accepted"
-msgstr "Priimtas"
-
-#: ../calendar/gui/e-calendar-view.c:1779
-#: ../calendar/gui/e-meeting-list-view.c:214
-#: ../calendar/gui/e-meeting-store.c:200
-#: ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2652
-msgid "Declined"
-msgstr "Atmestas"
-
-#: ../calendar/gui/e-calendar-view.c:1780
-#: ../calendar/gui/e-meeting-list-view.c:215
-#: ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/e-meeting-store.c:225
-#: ../calendar/gui/e-meeting-time-sel.c:545
-msgid "Tentative"
-msgstr "Negalutinis"
-
-#: ../calendar/gui/e-calendar-view.c:1781
-#: ../calendar/gui/e-meeting-list-view.c:216
-#: ../calendar/gui/e-meeting-store.c:204
-#: ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2655
-msgid "Delegated"
-msgstr "Pavestas"
-
-#: ../calendar/gui/e-calendar-view.c:1782
-msgid "Needs action"
-msgstr "Reikalauja veiksmo"
-
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1926
+#: ../calendar/gui/e-calendar-view.c:1908
 #: ../calendar/gui/e-memo-table.c:539
-#: ../calendar/gui/e-task-table.c:761
+#: ../calendar/gui/e-task-table.c:771
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizatorius: %s <%s>"
@@ -3963,22 +3991,22 @@ msgstr "Organizatorius: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1930
+#: ../calendar/gui/e-calendar-view.c:1912
 #: ../calendar/gui/e-memo-table.c:544
-#: ../calendar/gui/e-task-table.c:765
+#: ../calendar/gui/e-task-table.c:775
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizatorius: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946
-#: ../calendar/gui/print.c:3220
+#: ../calendar/gui/e-calendar-view.c:1928
+#: ../calendar/gui/print.c:3344
 #, c-format
 msgid "Location: %s"
 msgstr "Vieta: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1977
+#: ../calendar/gui/e-calendar-view.c:1959
 #, c-format
 msgid "Time: %s %s"
 msgstr "Laikas: %s %s"
@@ -4006,92 +4034,92 @@ 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:806
+#: ../calendar/gui/e-day-view-time-item.c:809
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minu�ių padalos"
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:830
 msgid "Show the second time zone"
 msgstr "Rodyti antrÄ…jÄ… laiko juostÄ…"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
+#: ../calendar/gui/e-day-view-time-item.c:847
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
 #: ../modules/calendar/e-calendar-preferences.c:179
-#: ../modules/calendar/e-calendar-preferences.c:228
+#: ../modules/calendar/e-calendar-preferences.c:231
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:879
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:255
+#: ../modules/calendar/e-calendar-preferences.c:258
 msgid "Select..."
 msgstr "Pasirinkti..."
 
 #. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
+#. * %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.
+#. * 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:848
-#: ../calendar/gui/e-day-view.c:1793
+#: ../calendar/gui/e-day-view.c:1821
 #: ../calendar/gui/e-week-view-main-item.c:215
-#: ../calendar/gui/print.c:1875
+#: ../calendar/gui/print.c:1966
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
+#. * %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.
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:852
-#: ../calendar/gui/e-day-view.c:1810
+#: ../calendar/gui/e-day-view.c:1838
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1053
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
+#. * 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.
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
 #: ../calendar/gui/e-day-view-top-item.c:856
-#: ../calendar/gui/e-day-view.c:1826
+#: ../calendar/gui/e-day-view.c:1854
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1089
+#: ../modules/calendar/e-cal-shell-view-private.c:1090
 msgid "%d %b"
 msgstr "%b %d"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1002
-#: ../calendar/gui/e-week-view.c:756
-#: ../calendar/gui/print.c:926
-#: ../calendar/gui/print.c:945
-#: ../calendar/gui/print.c:2372
-#: ../calendar/gui/print.c:2392
+#: ../calendar/gui/e-day-view.c:1021
+#: ../calendar/gui/e-week-view.c:757
+#: ../calendar/gui/print.c:975
+#: ../calendar/gui/print.c:994
+#: ../calendar/gui/print.c:2482
+#: ../calendar/gui/print.c:2502
 msgid "am"
 msgstr " "
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1005
-#: ../calendar/gui/e-week-view.c:759
-#: ../calendar/gui/print.c:931
-#: ../calendar/gui/print.c:947
-#: ../calendar/gui/print.c:2377
-#: ../calendar/gui/print.c:2394
+#: ../calendar/gui/e-day-view.c:1024
+#: ../calendar/gui/e-week-view.c:760
+#: ../calendar/gui/print.c:980
+#: ../calendar/gui/print.c:996
+#: ../calendar/gui/print.c:2487
+#: ../calendar/gui/print.c:2504
 msgid "pm"
 msgstr " "
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2606
+#: ../calendar/gui/e-day-view.c:2638
 #, c-format
 msgid "Week %d"
 msgstr "%d savaitÄ—"
@@ -4112,79 +4140,79 @@ msgstr "Nebūtini dalyviai"
 msgid "Resources"
 msgstr "IÅ¡tekliai"
 
-#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-list-view.c:174
 #: ../calendar/gui/e-meeting-store.c:111
 #: ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/e-meeting-store.c:1022
-#: ../calendar/gui/print.c:1094
+#: ../calendar/gui/e-meeting-store.c:1047
+#: ../calendar/gui/print.c:1145
 msgid "Individual"
 msgstr "Asmuo"
 
-#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-list-view.c:175
 #: ../calendar/gui/e-meeting-store.c:113
 #: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:1146
 #: ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "GrupÄ—"
 
-#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-list-view.c:176
 #: ../calendar/gui/e-meeting-store.c:115
 #: ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1096
+#: ../calendar/gui/print.c:1147
 msgid "Resource"
 msgstr "IÅ¡teklius"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:117
 #: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/print.c:1097
+#: ../calendar/gui/print.c:1148
 msgid "Room"
 msgstr "Kambarys"
 
-#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-list-view.c:188
 #: ../calendar/gui/e-meeting-store.c:146
 #: ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/print.c:1111
+#: ../calendar/gui/print.c:1162
 msgid "Chair"
 msgstr "Pirmininkas"
 
-#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-list-view.c:189
 #: ../calendar/gui/e-meeting-store.c:148
 #: ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/e-meeting-store.c:1025
-#: ../calendar/gui/print.c:1112
+#: ../calendar/gui/e-meeting-store.c:1050
+#: ../calendar/gui/print.c:1163
 msgid "Required Participant"
 msgstr "BÅ«tinas dalyvis"
 
-#: ../calendar/gui/e-meeting-list-view.c:189
+#: ../calendar/gui/e-meeting-list-view.c:190
 #: ../calendar/gui/e-meeting-store.c:150
 #: ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1113
+#: ../calendar/gui/print.c:1164
 msgid "Optional Participant"
 msgstr "Nebūtinas dalyvis"
 
-#: ../calendar/gui/e-meeting-list-view.c:190
+#: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:152
 #: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/print.c:1114
+#: ../calendar/gui/print.c:1165
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: ../calendar/gui/e-meeting-list-view.c:212
+#: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:196
 #: ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/e-meeting-store.c:1035
+#: ../calendar/gui/e-meeting-store.c:1060
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:553
+#: ../calendar/gui/e-meeting-list-view.c:578
 msgid "Attendee                          "
 msgstr "Dalyvis"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:598
+#: ../calendar/gui/e-meeting-list-view.c:623
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4194,103 +4222,103 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "Vykdomas"
 
-#: ../calendar/gui/e-meeting-store.c:1841
+#: ../calendar/gui/e-meeting-store.c:1876
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "Įveskite slaptažodį norėdami gauti naudotojo %2$s užimtumo informaciją serveryje %1$s"
 
-#: ../calendar/gui/e-meeting-store.c:1851
+#: ../calendar/gui/e-meeting-store.c:1886
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Nesėkmės priežastis: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1856
-#: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:448
-#: ../plugins/publish-calendar/publish-calendar.c:332
-#: ../smime/gui/component.c:49
+#: ../calendar/gui/e-meeting-store.c:1891
+#: ../plugins/caldav/caldav-browse-server.c:957
+#: ../plugins/google-account-setup/google-source.c:460
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#: ../smime/gui/component.c:54
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
 
 #. 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:431
-#: ../calendar/gui/e-meeting-time-sel.c:2380
+#. * %B = full month name, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:2379
 msgid "%A, %B %d, %Y"
 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.
+#. * 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:435
-#: ../calendar/gui/e-meeting-time-sel.c:2411
+#. * %m = month number, %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:2410
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
 #. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:439
+#. * %d = month day, %Y = full year.
+#: ../calendar/gui/e-meeting-time-sel-item.c:453
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:548
 msgid "Out of Office"
 msgstr "Nesu darbe"
 
-#: ../calendar/gui/e-meeting-time-sel.c:548
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "No Information"
 msgstr "NÄ—ra informacijos"
 
-#: ../calendar/gui/e-meeting-time-sel.c:584
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "O_ptions"
 msgstr "_Parinktys"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:603
 msgid "Show _only working hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: ../calendar/gui/e-meeting-time-sel.c:613
+#: ../calendar/gui/e-meeting-time-sel.c:614
 msgid "Show _zoomed out"
 msgstr "Rodyti _atitrauktÄ…"
 
-#: ../calendar/gui/e-meeting-time-sel.c:629
+#: ../calendar/gui/e-meeting-time-sel.c:630
 msgid "_Update free/busy"
 msgstr "_Atnaujinti užimtumą"
 
-#: ../calendar/gui/e-meeting-time-sel.c:644
+#: ../calendar/gui/e-meeting-time-sel.c:645
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Automatiškai parinkti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:677
+#: ../calendar/gui/e-meeting-time-sel.c:678
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:696
 msgid "_All people and resources"
 msgstr "_Visi žmonės ir ištekliai"
 
-#: ../calendar/gui/e-meeting-time-sel.c:705
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "All _people and one resource"
 msgstr "Visi ž_monės ir vienas išteklius"
 
-#: ../calendar/gui/e-meeting-time-sel.c:715
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "_Būtini žmonės"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:725
 msgid "Required people and _one resource"
 msgstr "Būtini žmonės ir _vienas išteklius"
 
-#: ../calendar/gui/e-meeting-time-sel.c:773
+#: ../calendar/gui/e-meeting-time-sel.c:774
 msgid "_Start time:"
 msgstr "_Pradžios laikas:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:813
+#: ../calendar/gui/e-meeting-time-sel.c:814
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
@@ -4319,28 +4347,28 @@ msgid "Member"
 msgstr "Narys"
 
 #: ../calendar/gui/e-memo-table.c:420
-#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:231
 #: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
-#: ../plugins/caldav/caldav-browse-server.c:437
+#: ../plugins/caldav/caldav-browse-server.c:458
 msgid "Memos"
 msgstr "Rašteliai"
 
 #: ../calendar/gui/e-memo-table.c:501
-#: ../calendar/gui/e-task-table.c:724
+#: ../calendar/gui/e-task-table.c:734
 msgid "* No Summary *"
 msgstr "* NÄ—ra santraukos *"
 
 #. Translators: This is followed by an event's start date/time
 #: ../calendar/gui/e-memo-table.c:588
-#: ../calendar/gui/e-task-table.c:808
+#: ../calendar/gui/e-task-table.c:818
 msgid "Start: "
 msgstr "Pradžia: "
 
 #. Translators: This is followed by an event's due date/time
 #: ../calendar/gui/e-memo-table.c:607
-#: ../calendar/gui/e-task-table.c:826
+#: ../calendar/gui/e-task-table.c:836
 msgid "Due: "
 msgstr "Terminas: "
 
@@ -4357,7 +4385,7 @@ msgid "Paste memos from the clipboard"
 msgstr "Įdėti raštelius iš atmintinės"
 
 #: ../calendar/gui/e-memo-table.c:744
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "Delete selected memos"
 msgstr "Ištrinti pažymėtus raštelius"
 
@@ -4370,45 +4398,45 @@ msgid "Click to add a memo"
 msgstr "Spustelėkite norėdami pridėti raštelį"
 
 #. Translators: "%d%%" is the percentage of a task done.
-#. %d is the actual value, %% is replaced with a percent sign.
-#. Result values will be 0%, 10%, 20%, ... 100%
+#. * %d is the actual value, %% is replaced with a percent sign.
+#. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:643
-#: ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:652
+#: ../calendar/gui/print.c:2271
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1044
 #: ../modules/calendar/e-calendar-preferences.ui.h:41
-#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:254
 #: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
-#: ../plugins/caldav/caldav-browse-server.c:435
+#: ../plugins/caldav/caldav-browse-server.c:456
 msgid "Tasks"
 msgstr "Užduotys"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:969
 msgid "Cut selected tasks to the clipboard"
 msgstr "Kopijuoti pažymėtas užduotis į atmintinę"
 
-#: ../calendar/gui/e-task-table.c:965
+#: ../calendar/gui/e-task-table.c:975
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopijuoti pažymėtas užduotis į atmintinę"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:981
 msgid "Paste tasks from the clipboard"
 msgstr "Įdėti užduotis iš atmintinės"
 
-#: ../calendar/gui/e-task-table.c:977
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../calendar/gui/e-task-table.c:987
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "Delete selected tasks"
 msgstr "Ištrinti pažymėtas užduotis"
 
-#: ../calendar/gui/e-task-table.c:983
+#: ../calendar/gui/e-task-table.c:993
 msgid "Select all visible tasks"
 msgstr "Pažymėti visas matomas užduotis"
 
@@ -4417,10 +4445,10 @@ msgid "Select Timezone"
 msgstr "Pasirinkite laiko juostÄ…"
 
 #. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:232
-#: ../calendar/gui/print.c:1856
+#: ../calendar/gui/print.c:1947
 msgid "%d %B"
 msgstr "%B %d"
 
@@ -4453,27 +4481,27 @@ msgstr "kalendoriaus vaizdo įvykis"
 msgid "Grab Focus"
 msgstr "Pagriebti fokusavimÄ…"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:315
 msgid "New Appointment"
 msgstr "Naujas paskyrimas"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:316
 msgid "New All Day Event"
 msgstr "Naujas visos dienos įvykis"
 
-#: ../calendar/gui/ea-cal-view.c:305
+#: ../calendar/gui/ea-cal-view.c:317
 msgid "New Meeting"
 msgstr "Naujas susitikimas"
 
-#: ../calendar/gui/ea-cal-view.c:306
+#: ../calendar/gui/ea-cal-view.c:318
 msgid "Go to Today"
 msgstr "Pereiti prie Å¡iandienos"
 
-#: ../calendar/gui/ea-cal-view.c:307
+#: ../calendar/gui/ea-cal-view.c:319
 msgid "Go to Date"
 msgstr "Pereiti prie datos"
 
-#: ../calendar/gui/ea-day-view-main-item.c:312
+#: ../calendar/gui/ea-day-view-main-item.c:318
 #: ../calendar/gui/ea-week-view-main-item.c:344
 msgid "a table to view and select the current time range"
 msgstr "lentelė dabartinio laiko rėžio peržiūrai ir pasirinkimui"
@@ -4520,21 +4548,21 @@ msgstr "kalendoriaus rodinys vienai ar daugiau dienų"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1035
+#: ../calendar/importers/icalendar-importer.c:1078
 msgid "Gnome Calendar"
 msgstr "GNOME kalendorius"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1049
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%A %d %b %Y"
 msgstr "%A %d %b %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1056
-#: ../modules/calendar/e-cal-shell-view-private.c:1062
-#: ../modules/calendar/e-cal-shell-view-private.c:1065
+#: ../modules/calendar/e-cal-shell-view-private.c:1057
+#: ../modules/calendar/e-cal-shell-view-private.c:1063
+#: ../modules/calendar/e-cal-shell-view-private.c:1066
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
@@ -4542,10 +4570,10 @@ msgstr "%a, %Y %b %d"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1082
-#: ../modules/calendar/e-cal-shell-view-private.c:1093
-#: ../modules/calendar/e-cal-shell-view-private.c:1100
-#: ../modules/calendar/e-cal-shell-view-private.c:1103
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1094
+#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%d %b %Y"
 msgstr "%Y %b %d"
 
@@ -4575,41 +4603,41 @@ msgstr "kalendoriaus rodinys mÄ—nesiui"
 msgid "calendar view for one or more weeks"
 msgstr "kalendoriaus rodinys vienai ar daugiau savai�ių"
 
-#: ../calendar/gui/gnome-cal.c:2235
+#: ../calendar/gui/gnome-cal.c:2262
 msgid "Purging"
 msgstr "IÅ¡valoma"
 
-#: ../calendar/gui/itip-utils.c:510
-#: ../calendar/gui/itip-utils.c:565
-#: ../calendar/gui/itip-utils.c:668
+#: ../calendar/gui/itip-utils.c:511
+#: ../calendar/gui/itip-utils.c:566
+#: ../calendar/gui/itip-utils.c:669
 msgid "An organizer must be set."
 msgstr "Turi būti nurodytas organizatorius."
 
-#: ../calendar/gui/itip-utils.c:557
+#: ../calendar/gui/itip-utils.c:558
 msgid "At least one attendee is necessary"
 msgstr "Reikalingas bent vienas dalyvis"
 
-#: ../calendar/gui/itip-utils.c:754
-#: ../calendar/gui/itip-utils.c:915
+#: ../calendar/gui/itip-utils.c:755
+#: ../calendar/gui/itip-utils.c:916
 msgid "Event information"
 msgstr "Įvykio informacija"
 
-#: ../calendar/gui/itip-utils.c:757
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:758
+#: ../calendar/gui/itip-utils.c:919
 msgid "Task information"
 msgstr "Užduoties informacija"
 
-#: ../calendar/gui/itip-utils.c:760
-#: ../calendar/gui/itip-utils.c:921
+#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:922
 msgid "Memo information"
 msgstr "Raštelio informacija"
 
-#: ../calendar/gui/itip-utils.c:763
-#: ../calendar/gui/itip-utils.c:939
+#: ../calendar/gui/itip-utils.c:764
+#: ../calendar/gui/itip-utils.c:940
 msgid "Free/Busy information"
 msgstr "Užimtumo informacija"
 
-#: ../calendar/gui/itip-utils.c:766
+#: ../calendar/gui/itip-utils.c:767
 msgid "Calendar information"
 msgstr "Kalendoriaus informacija"
 
@@ -4617,7 +4645,7 @@ msgstr "Kalendoriaus informacija"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:803
+#: ../calendar/gui/itip-utils.c:804
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Priimta"
@@ -4626,7 +4654,7 @@ msgstr "Priimta"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:811
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Preliminariai priimta"
@@ -4638,8 +4666,8 @@ msgstr "Preliminariai priimta"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:817
-#: ../calendar/gui/itip-utils.c:865
+#: ../calendar/gui/itip-utils.c:818
+#: ../calendar/gui/itip-utils.c:866
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Atmesta"
@@ -4648,7 +4676,7 @@ msgstr "Atmesta"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:824
+#: ../calendar/gui/itip-utils.c:825
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Pavesta"
@@ -4656,7 +4684,7 @@ msgstr "Pavesta"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:838
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Atnaujint"
@@ -4664,7 +4692,7 @@ msgstr "Atnaujint"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:844
+#: ../calendar/gui/itip-utils.c:845
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Atšaukti"
@@ -4672,7 +4700,7 @@ msgstr "Atšaukti"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:851
+#: ../calendar/gui/itip-utils.c:852
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Atnaujinti"
@@ -4680,252 +4708,252 @@ msgstr "Atnaujinti"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:859
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Kontrpasiūlymas"
 
-#: ../calendar/gui/itip-utils.c:936
+#: ../calendar/gui/itip-utils.c:937
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Užimtumo informacija (nuo %s iki %s)"
 
-#: ../calendar/gui/itip-utils.c:944
+#: ../calendar/gui/itip-utils.c:945
 msgid "iCalendar information"
 msgstr "iCalendar informacija"
 
-#: ../calendar/gui/itip-utils.c:969
+#: ../calendar/gui/itip-utils.c:970
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Nepavyko rezervuoti ištekliaus, naujasis įvykis kertasi su kažkuriuo kitu."
 
-#: ../calendar/gui/itip-utils.c:973
+#: ../calendar/gui/itip-utils.c:974
 msgid "Unable to book a resource, error: "
 msgstr "Nepavyko rezervuoti ištekliaus, klaida:"
 
-#: ../calendar/gui/itip-utils.c:1134
+#: ../calendar/gui/itip-utils.c:1137
 msgid "You must be an attendee of the event."
 msgstr "Turite būti įvykio dalyvis."
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:579
 msgid "1st"
 msgstr "1-a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:579
 msgid "2nd"
 msgstr "2-a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:579
 msgid "3rd"
 msgstr "3-a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:579
 msgid "4th"
 msgstr "4-a"
 
-#: ../calendar/gui/print.c:548
+#: ../calendar/gui/print.c:579
 msgid "5th"
 msgstr "5-a"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:580
 msgid "6th"
 msgstr "6-ta"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:580
 msgid "7th"
 msgstr "7-ta"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:580
 msgid "8th"
 msgstr "8-ta"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:580
 msgid "9th"
 msgstr "9-ta"
 
-#: ../calendar/gui/print.c:549
+#: ../calendar/gui/print.c:580
 msgid "10th"
 msgstr "10-ta"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:581
 msgid "11th"
 msgstr "11-ta"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:581
 msgid "12th"
 msgstr "12-ta"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:581
 msgid "13th"
 msgstr "13-ta"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:581
 msgid "14th"
 msgstr "14-ta"
 
-#: ../calendar/gui/print.c:550
+#: ../calendar/gui/print.c:581
 msgid "15th"
 msgstr "15-ta"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:582
 msgid "16th"
 msgstr "16-ta"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:582
 msgid "17th"
 msgstr "17-ta"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:582
 msgid "18th"
 msgstr "18-ta"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:582
 msgid "19th"
 msgstr "19-ta"
 
-#: ../calendar/gui/print.c:551
+#: ../calendar/gui/print.c:582
 msgid "20th"
 msgstr "20-ta"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:583
 msgid "21st"
 msgstr "21-a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:583
 msgid "22nd"
 msgstr "22-a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:583
 msgid "23rd"
 msgstr "23-a"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:583
 msgid "24th"
 msgstr "24-ta"
 
-#: ../calendar/gui/print.c:552
+#: ../calendar/gui/print.c:583
 msgid "25th"
 msgstr "25-ta"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:584
 msgid "26th"
 msgstr "26-ta"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:584
 msgid "27th"
 msgstr "27-ta"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:584
 msgid "28th"
 msgstr "28-ta"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:584
 msgid "29th"
 msgstr "29-ta"
 
-#: ../calendar/gui/print.c:553
+#: ../calendar/gui/print.c:584
 msgid "30th"
 msgstr "30-ta"
 
-#: ../calendar/gui/print.c:554
+#: ../calendar/gui/print.c:585
 msgid "31st"
 msgstr "31-a"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:642
 msgid "Su"
 msgstr "Sk"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:642
 msgid "Mo"
 msgstr "Pr"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:642
 msgid "Tu"
 msgstr "An"
 
-#: ../calendar/gui/print.c:611
+#: ../calendar/gui/print.c:642
 msgid "We"
 msgstr "Tr"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:643
 msgid "Th"
 msgstr "Kt"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:643
 msgid "Fr"
 msgstr "Pn"
 
-#: ../calendar/gui/print.c:612
+#: ../calendar/gui/print.c:643
 msgid "Sa"
 msgstr "Å t"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3013
+#: ../calendar/gui/print.c:3137
 msgid " to "
 msgstr " iki "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3023
+#: ../calendar/gui/print.c:3147
 msgid " (Completed "
 msgstr " (Užbaigta "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3029
+#: ../calendar/gui/print.c:3153
 msgid "Completed "
 msgstr "Užbaigta "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3039
+#: ../calendar/gui/print.c:3163
 msgid " (Due "
 msgstr " (Iki "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3046
+#: ../calendar/gui/print.c:3170
 msgid "Due "
 msgstr "Iki"
 
-#: ../calendar/gui/print.c:3211
+#: ../calendar/gui/print.c:3335
 #, c-format
 msgid "Summary: %s"
 msgstr "Apžvalga: %s"
 
-#: ../calendar/gui/print.c:3238
+#: ../calendar/gui/print.c:3362
 msgid "Attendees: "
 msgstr "Dalyviai: "
 
-#: ../calendar/gui/print.c:3281
+#: ../calendar/gui/print.c:3405
 #, c-format
 msgid "Status: %s"
 msgstr "BÅ«klÄ—: %s"
 
-#: ../calendar/gui/print.c:3296
+#: ../calendar/gui/print.c:3420
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritetas: %s"
 
-#: ../calendar/gui/print.c:3314
+#: ../calendar/gui/print.c:3438
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Įvykdymo Procentas: %i"
 
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3449
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3338
+#: ../calendar/gui/print.c:3462
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorijos: %s"
 
-#: ../calendar/gui/print.c:3349
+#: ../calendar/gui/print.c:3473
 msgid "Contacts: "
 msgstr "Kontaktai: "
 
@@ -4956,181 +4984,181 @@ msgstr "yra mažesnis už"
 msgid "Appointments and Meetings"
 msgstr "Įvykiai ir susitikimai"
 
-#: ../calendar/importers/icalendar-importer.c:421
-#: ../calendar/importers/icalendar-importer.c:834
-#: ../plugins/itip-formatter/itip-formatter.c:2135
+#: ../calendar/importers/icalendar-importer.c:435
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../plugins/itip-formatter/itip-formatter.c:2170
 msgid "Opening calendar"
 msgstr "Atveriamas kalendorius"
 
-#: ../calendar/importers/icalendar-importer.c:561
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar failai (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:562
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importas"
 
-#: ../calendar/importers/icalendar-importer.c:650
+#: ../calendar/importers/icalendar-importer.c:674
 msgid "Reminder!"
 msgstr "Priminimas!"
 
-#: ../calendar/importers/icalendar-importer.c:730
+#: ../calendar/importers/icalendar-importer.c:758
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar failai (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:731
+#: ../calendar/importers/icalendar-importer.c:759
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importas"
 
-#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1039
 msgid "Calendar Events"
 msgstr "Kalendoriaus įvykiai"
 
-#: ../calendar/importers/icalendar-importer.c:1036
+#: ../calendar/importers/icalendar-importer.c:1079
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution kalendoriaus importavimo priemonÄ—"
 
-#: ../calendar/importers/icalendar-importer.c:1101
-#: ../calendar/importers/icalendar-importer.c:1418
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: ../calendar/importers/icalendar-importer.c:1101
-#: ../calendar/importers/icalendar-importer.c:1418
+#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1465
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Įvykis"
 
-#: ../calendar/importers/icalendar-importer.c:1104
-#: ../calendar/importers/icalendar-importer.c:1419
+#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1466
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Užduotis"
 
-#: ../calendar/importers/icalendar-importer.c:1107
-#: ../calendar/importers/icalendar-importer.c:1420
+#: ../calendar/importers/icalendar-importer.c:1153
+#: ../calendar/importers/icalendar-importer.c:1467
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Raštelis"
 
-#: ../calendar/importers/icalendar-importer.c:1116
+#: ../calendar/importers/icalendar-importer.c:1162
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "pasikartoja"
 
-#: ../calendar/importers/icalendar-importer.c:1121
+#: ../calendar/importers/icalendar-importer.c:1167
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "yra vienkartinis"
 
-#: ../calendar/importers/icalendar-importer.c:1126
+#: ../calendar/importers/icalendar-importer.c:1172
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "turi priminimų"
 
-#: ../calendar/importers/icalendar-importer.c:1131
+#: ../calendar/importers/icalendar-importer.c:1177
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "su priedais"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1144
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Viešas"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1147
+#: ../calendar/importers/icalendar-importer.c:1193
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Asmeniškas"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1150
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidencialus"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1154
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Klasifikacija"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1159
-#: ../calendar/importers/icalendar-importer.c:1459
+#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Santrauka"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1165
+#: ../calendar/importers/icalendar-importer.c:1211
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Vieta"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1455
+#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1502
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Pradžia"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1184
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Terminas"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1242
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Pabaiga"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorijos"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1230
+#: ../calendar/importers/icalendar-importer.c:1276
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Užbaigta"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1249
-#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1295
+#: ../calendar/importers/icalendar-importer.c:1298
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizatorius"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1272
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Dalyviai"
 
-#: ../calendar/importers/icalendar-importer.c:1289
+#: ../calendar/importers/icalendar-importer.c:1335
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Aprašymas"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1451
+#: ../calendar/importers/icalendar-importer.c:1498
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tipas"
@@ -6688,194 +6716,194 @@ msgstr "Ramusis_vandenynas/Japas"
 msgid "Save as..."
 msgstr "Įrašyti kaip..."
 
-#: ../composer/e-composer-actions.c:296
+#: ../composer/e-composer-actions.c:295
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
 msgstr "_Užverti"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:297
 msgid "Close the current file"
 msgstr "Užverti esamą failą"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:302
 msgid "New _Message"
 msgstr "Naujas _laiškas"
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:304
 msgid "Open New Message window"
 msgstr "Atverti naujo laiško langą"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:311
 #: ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Konfigūruoti Evolution"
 
-#: ../composer/e-composer-actions.c:319
+#: ../composer/e-composer-actions.c:318
 msgid "Save the current file"
 msgstr "Įrašyti šį failą"
 
-#: ../composer/e-composer-actions.c:324
+#: ../composer/e-composer-actions.c:323
 msgid "Save _As..."
 msgstr "Įrašyti _kaip..."
 
-#: ../composer/e-composer-actions.c:326
+#: ../composer/e-composer-actions.c:325
 msgid "Save the current file with a different name"
 msgstr "Įrašyti esamą failą kitokiu vardu"
 
-#: ../composer/e-composer-actions.c:333
+#: ../composer/e-composer-actions.c:332
 msgid "Character _Encoding"
 msgstr "Simbolių _koduotė"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:349
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: ../composer/e-composer-actions.c:357
+#: ../composer/e-composer-actions.c:356
 msgid "Print Pre_view"
 msgstr "Spa_udinio peržiūra"
 
-#: ../composer/e-composer-actions.c:364
+#: ../composer/e-composer-actions.c:363
 msgid "Save as _Draft"
 msgstr "Įrašyti kaip _juodraštį"
 
-#: ../composer/e-composer-actions.c:366
+#: ../composer/e-composer-actions.c:365
 msgid "Save as draft"
 msgstr "Įrašyti kaip juodraštį"
 
-#: ../composer/e-composer-actions.c:371
-#: ../composer/e-composer-private.c:352
+#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-private.c:353
 msgid "S_end"
 msgstr "_Siųsti"
 
-#: ../composer/e-composer-actions.c:373
+#: ../composer/e-composer-actions.c:372
 msgid "Send this message"
 msgstr "Siųsti šį laišką"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:380
 msgid "PGP _Encrypt"
 msgstr "_Užšifruoti PGP"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:382
 msgid "Encrypt this message with PGP"
 msgstr "Užšifruoti šį laišką su PGP"
 
-#: ../composer/e-composer-actions.c:389
+#: ../composer/e-composer-actions.c:388
 msgid "PGP _Sign"
 msgstr "Pa_sirašyti PGP"
 
-#: ../composer/e-composer-actions.c:391
+#: ../composer/e-composer-actions.c:390
 msgid "Sign this message with your PGP key"
 msgstr "Pasirašyti šį laišką jūsų PGP raktu"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:396
 msgid "_Picture Gallery"
 msgstr "_Paveikslėlių galerija"
 
-#: ../composer/e-composer-actions.c:399
+#: ../composer/e-composer-actions.c:398
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Rodyti paveikslėlius, kuriuos galite nuvilkti į savo laišką"
 
-#: ../composer/e-composer-actions.c:405
+#: ../composer/e-composer-actions.c:404
 msgid "_Prioritize Message"
 msgstr "_Teikti laiškui pirmenybę"
 
-#: ../composer/e-composer-actions.c:407
+#: ../composer/e-composer-actions.c:406
 msgid "Set the message priority to high"
 msgstr "Nustatyti laiško prioritetą į aukštą"
 
-#: ../composer/e-composer-actions.c:413
+#: ../composer/e-composer-actions.c:412
 msgid "Re_quest Read Receipt"
 msgstr "Paprašyti p_erskaitymo patvirtinimo"
 
-#: ../composer/e-composer-actions.c:415
+#: ../composer/e-composer-actions.c:414
 msgid "Get delivery notification when your message is read"
 msgstr "Gauti pranešimą, kai bus perskaitytas laiškas"
 
-#: ../composer/e-composer-actions.c:421
+#: ../composer/e-composer-actions.c:420
 msgid "S/MIME En_crypt"
 msgstr "Užšifru_oti S/MIME"
 
-#: ../composer/e-composer-actions.c:423
+#: ../composer/e-composer-actions.c:422
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Užšifruoti šį laišką S/MIME šifravimo liudijimu"
 
-#: ../composer/e-composer-actions.c:429
+#: ../composer/e-composer-actions.c:428
 msgid "S/MIME Sig_n"
 msgstr "_Pasirašyti S/MIME"
 
-#: ../composer/e-composer-actions.c:431
+#: ../composer/e-composer-actions.c:430
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Pasirašyti šį laišką jūsų S/MIME parašo liudijimu"
 
-#: ../composer/e-composer-actions.c:437
+#: ../composer/e-composer-actions.c:436
 msgid "_Bcc Field"
 msgstr "_Slaptos kopijos laukas"
 
-#: ../composer/e-composer-actions.c:439
+#: ../composer/e-composer-actions.c:438
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Nurodo, ar slaptos kopijos laukas yra rodomas"
 
-#: ../composer/e-composer-actions.c:445
+#: ../composer/e-composer-actions.c:444
 msgid "_Cc Field"
 msgstr "_Kopijos laukas"
 
-#: ../composer/e-composer-actions.c:447
+#: ../composer/e-composer-actions.c:446
 msgid "Toggles whether the CC field is displayed"
 msgstr "Nurodo, ar kopijos laukas yra rodomas"
 
-#: ../composer/e-composer-actions.c:453
+#: ../composer/e-composer-actions.c:452
 msgid "_Reply-To Field"
 msgstr "_Atgalinio adreso laukas"
 
-#: ../composer/e-composer-actions.c:455
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Nurodo, ar atgalinio adreso laukas yra rodomas"
 
-#: ../composer/e-composer-actions.c:514
+#: ../composer/e-composer-actions.c:513
 msgid "Save Draft"
 msgstr "Įrašyti juodraštį"
 
-#: ../composer/e-composer-header-table.c:40
+#: ../composer/e-composer-header-table.c:39
 msgid "Enter the recipients of the message"
 msgstr "Įveskite laiško gavėjus"
 
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Įveskite adresus, kuriais bus išsiųsta šio laiško kopiją"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:44
 msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
 msgstr "Įveskite adresus, kuriais bus išsiųsta šio laiško kopija, bet jų nesimatys laiško gavėjų sąraše"
 
-#: ../composer/e-composer-header-table.c:1021
+#: ../composer/e-composer-header-table.c:1018
 msgid "Fr_om:"
 msgstr "Nu_o:"
 
-#: ../composer/e-composer-header-table.c:1030
+#: ../composer/e-composer-header-table.c:1027
 msgid "_Reply-To:"
 msgstr "_Atgalinis adresas:"
 
-#: ../composer/e-composer-header-table.c:1034
+#: ../composer/e-composer-header-table.c:1031
 msgid "_To:"
 msgstr "_Kam:"
 
-#: ../composer/e-composer-header-table.c:1039
+#: ../composer/e-composer-header-table.c:1036
 msgid "_Cc:"
 msgstr "_Kopija:"
 
-#: ../composer/e-composer-header-table.c:1044
+#: ../composer/e-composer-header-table.c:1041
 msgid "_Bcc:"
 msgstr "_Slapta kopija:"
 
-#: ../composer/e-composer-header-table.c:1049
+#: ../composer/e-composer-header-table.c:1046
 msgid "_Post To:"
 msgstr "_Skelbti į:"
 
-#: ../composer/e-composer-header-table.c:1053
+#: ../composer/e-composer-header-table.c:1050
 msgid "S_ubject:"
 msgstr "_Tema:"
 
-#: ../composer/e-composer-header-table.c:1062
+#: ../composer/e-composer-header-table.c:1059
 msgid "Si_gnature:"
 msgstr "Pa_rašas:"
 
@@ -6887,46 +6915,46 @@ msgstr "Spustelėkite norėdami atverti adresų knygą"
 msgid "Click here to select folders to post to"
 msgstr "Spustelėkite norėdami pasirinkti aplankus laiškams skelbti"
 
-#: ../composer/e-composer-private.c:249
+#: ../composer/e-composer-private.c:250
 msgid "Undo the last action"
 msgstr "Atšaukti paskutinį veiksmą"
 
-#: ../composer/e-composer-private.c:253
+#: ../composer/e-composer-private.c:254
 msgid "Redo the last undone action"
 msgstr "Pakartoti paskutinį atšauktą veiksmą"
 
-#: ../composer/e-composer-private.c:257
+#: ../composer/e-composer-private.c:258
 msgid "Search for text"
 msgstr "Ieškoti teksto"
 
-#: ../composer/e-composer-private.c:261
+#: ../composer/e-composer-private.c:262
 msgid "Search for and replace text"
 msgstr "Ieškoti ir pakeisti tekstą"
 
-#: ../composer/e-composer-private.c:372
+#: ../composer/e-composer-private.c:373
 msgid "Save draft"
 msgstr "Įrašyti juodraštį"
 
-#: ../composer/e-msg-composer.c:808
+#: ../composer/e-msg-composer.c:815
 #, c-format
 msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Nepavyko pasirašyti išsiun�iamo laiško: nėra šios paskyros pasirašymo liudijimo"
 
-#: ../composer/e-msg-composer.c:817
+#: ../composer/e-msg-composer.c:824
 #, c-format
 msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
 msgstr "Nepavyko užšifruoti išsiun�iamo laiško: nėra šios paskyros šifravimo liudijimo"
 
-#: ../composer/e-msg-composer.c:1691
-#: ../composer/e-msg-composer.c:2075
+#: ../composer/e-msg-composer.c:1702
+#: ../composer/e-msg-composer.c:2091
 msgid "Compose Message"
 msgstr "Rašyti laišką"
 
-#: ../composer/e-msg-composer.c:4213
+#: ../composer/e-msg-composer.c:4260
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Laiško rašymo lange yra netekstinis laiškas, kurio redaguoti negalima."
 
-#: ../composer/e-msg-composer.c:4918
+#: ../composer/e-msg-composer.c:4964
 msgid "Untitled Message"
 msgstr "Nepavadintas laiškas"
 
@@ -7011,7 +7039,7 @@ msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Failas „{0}“ nėra paprastas failas ir jo negalima išsiųsti el. laiške."
 
 #: ../composer/mail-composer.error.xml.h:21
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Buvo pranešta apie klaidą „{0}“."
 
@@ -7061,11 +7089,11 @@ msgid "_Try Again"
 msgstr "_Bandyti dar kartÄ…"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:153
+#: ../capplet/anjal-settings-main.c:154
 msgid "ID of the socket to embed in"
 msgstr "Lizdo, kuriame įtaisyti, ID"
 
-#: ../capplet/anjal-settings-main.c:154
+#: ../capplet/anjal-settings-main.c:155
 msgid "socket"
 msgstr "lizdas"
 
@@ -7169,8 +7197,8 @@ msgid "Time to check things over before we try and connect to the server and fet
 msgstr "Metas patikrinti parametrus prieš bandymą jungtis prie serverio ir atsiųsti jūsų paštą."
 
 #: ../capplet/settings/mail-account-view.c:630
-#: ../mail/em-account-editor.c:2237
-#: ../mail/em-account-editor.c:2370
+#: ../mail/em-account-editor.c:2290
+#: ../mail/em-account-editor.c:2426
 msgid "Identity"
 msgstr "TapatybÄ—"
 
@@ -7222,7 +7250,7 @@ msgid "Back - Receiving options"
 msgstr "Atgal – Gavimo parinktys"
 
 #: ../capplet/settings/mail-account-view.c:635
-#: ../mail/em-account-editor.c:3317
+#: ../mail/em-account-editor.c:3378
 msgid "Defaults"
 msgstr "Numatytieji"
 
@@ -7242,65 +7270,60 @@ msgstr "Baigti"
 msgid "Back - Sending"
 msgstr "Atgal – Siuntimas"
 
-#: ../capplet/settings/mail-account-view.c:757
+#: ../capplet/settings/mail-account-view.c:760
 msgid "Setup Google contacts with Evolution"
 msgstr "Sukonfigūruokite Google kontaktus naudojimui Evolution programoje"
 
-#: ../capplet/settings/mail-account-view.c:758
+#: ../capplet/settings/mail-account-view.c:761
 msgid "Setup Google calendar with Evolution"
 msgstr "Sukonfigūruokite Google kalendorių naudojimui Evolution programoje"
 
-#: ../capplet/settings/mail-account-view.c:763
+#: ../capplet/settings/mail-account-view.c:766
 msgid "You may need to enable IMAP access."
 msgstr "Gali reikėti įjungti IMAP prieigą."
 
-#: ../capplet/settings/mail-account-view.c:771
+#: ../capplet/settings/mail-account-view.c:774
 msgid "Google account settings:"
 msgstr "Google paskyros parametrai:"
 
-#: ../capplet/settings/mail-account-view.c:797
+#: ../capplet/settings/mail-account-view.c:800
 msgid "Setup Yahoo calendar with Evolution"
 msgstr "Sukonfigūruokite Yahoo kalendorių naudojimui Evolution programoje"
 
-#: ../capplet/settings/mail-account-view.c:801
+#: ../capplet/settings/mail-account-view.c:804
 msgid "Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."
 msgstr "Yahoo kalendorių pavadinimai yra sudaryti taip: vardas_pavardė. Programa pabandė sudaryti kalendoriaus pavadinimą. Tad patvirtinkite jį arba įveskite kitą kalendoriaus pavadinimą, jei šis neteisingas."
 
-#: ../capplet/settings/mail-account-view.c:810
+#: ../capplet/settings/mail-account-view.c:813
 msgid "Yahoo account settings:"
 msgstr "Yahoo paskyros parametrai:"
 
-#: ../capplet/settings/mail-account-view.c:824
+#: ../capplet/settings/mail-account-view.c:827
 msgid "Yahoo Calendar name:"
 msgstr "Yahoo kalendoriaus pavadinimas:"
 
-#: ../capplet/settings/mail-account-view.c:1094
+#: ../capplet/settings/mail-account-view.c:1098
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../capplet/settings/mail-account-view.c:1145
-#: ../capplet/settings/mail-settings-view.c:248
+#: ../capplet/settings/mail-account-view.c:1150
+#: ../capplet/settings/mail-settings-view.c:254
 msgid "Close Tab"
 msgstr "Užverti kortelę"
 
-#: ../capplet/settings/mail-account-view.c:1155
+#: ../capplet/settings/mail-account-view.c:1160
 msgid "Account Wizard"
 msgstr "Paskyrų vediklis"
 
-#: ../capplet/settings/mail-capplet-shell.c:212
+#: ../capplet/settings/mail-capplet-shell.c:215
 msgid "Evolution account assistant"
 msgstr "Evolution paskyrų vediklis"
 
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:372
+#: ../capplet/settings/mail-capplet-shell.c:377
 #: ../mail/e-mail-local.c:81
-#: ../mail/e-mail-migrate.c:744
-#: ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:159
-#: ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:168
-#: ../mail/em-folder-tree-model.c:170
+#: ../mail/e-mail-migrate.c:748
+#: ../mail/em-folder-tree-model.c:167
 #: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
 #: ../modules/calendar/e-cal-shell-backend.c:113
@@ -7309,23 +7332,30 @@ msgstr "Evolution paskyrų vediklis"
 #: ../modules/calendar/e-memo-shell-migrate.c:109
 #: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
+#: ../widgets/misc/e-account-tree-view.c:99
+#: ../widgets/misc/e-account-tree-view.c:291
+#: ../widgets/misc/e-account-tree-view.c:922
+#: ../widgets/misc/e-account-tree-view.c:980
+#: ../widgets/misc/e-account-tree-view.c:1053
+#: ../widgets/misc/e-account-tree-view.c:1130
+#: ../widgets/misc/e-account-tree-view.c:1359
 msgid "On This Computer"
 msgstr "Å iame kompiuteryje"
 
-#: ../capplet/settings/mail-settings-view.c:145
+#: ../capplet/settings/mail-settings-view.c:150
 #, c-format
 msgid "Modify %s..."
 msgstr "Keisti %s..."
 
-#: ../capplet/settings/mail-settings-view.c:147
+#: ../capplet/settings/mail-settings-view.c:152
 msgid "Add a new account"
 msgstr "PridÄ—ti naujÄ… paskyrÄ…"
 
-#: ../capplet/settings/mail-settings-view.c:183
+#: ../capplet/settings/mail-settings-view.c:188
 msgid "Account management"
 msgstr "Paskyrų valdymas"
 
-#: ../capplet/settings/mail-settings-view.c:258
+#: ../capplet/settings/mail-settings-view.c:264
 msgid "Settings"
 msgstr "Parametrai"
 
@@ -7338,7 +7368,7 @@ msgid "Evolution Alarm Notify"
 msgstr "Evolution perspÄ—jimai"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:996
+#: ../mail/e-mail-browser.c:1000
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:257
 msgid "Evolution"
@@ -7482,109 +7512,109 @@ msgid "Visual"
 msgstr "vaizdinis"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1855
+#: ../e-util/e-datetime-format.c:206
+#: ../modules/calendar/e-cal-shell-view-actions.c:1863
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Dabar"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:210
+#: ../e-util/e-datetime-format.c:217
 #: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Rytoj"
 
-#: ../e-util/e-datetime-format.c:212
+#: ../e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Vakar"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:220
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:227
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:226
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:233
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:232
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:239
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:238
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:245
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:244
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:251
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:250
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:257
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Kitas %a"
 
 #. Translators: This is used for abbreviated days in the future.
-#. You can use strftime modifiers here too, like "Next %a", to avoid
-#. repeated translation of the abbreviated day name.
-#: ../e-util/e-datetime-format.c:256
+#. *         You can use strftime modifiers here too, like "Next %a", to avoid
+#. * repeated translation of the abbreviated day name.
+#: ../e-util/e-datetime-format.c:263
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Kitas %a"
 
-#: ../e-util/e-datetime-format.c:338
-#: ../e-util/e-datetime-format.c:348
-#: ../e-util/e-datetime-format.c:357
+#: ../e-util/e-datetime-format.c:350
+#: ../e-util/e-datetime-format.c:360
+#: ../e-util/e-datetime-format.c:369
 msgid "Use locale default"
 msgstr "Naudoti lokalės numatytąjį"
 
-#: ../e-util/e-datetime-format.c:554
+#: ../e-util/e-datetime-format.c:574
 msgid "Format:"
 msgstr "Formatas:"
 
-#: ../e-util/e-file-utils.c:151
+#: ../e-util/e-file-utils.c:150
 msgid "(Unknown Filename)"
 msgstr "(Nežinomas failo vardas)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:155
+#: ../e-util/e-file-utils.c:154
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Rašoma „%s“"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:160
+#: ../e-util/e-file-utils.c:159
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Rašoma „%s“ į „%s“"
 
-#: ../e-util/e-plugin-util.c:429
+#: ../e-util/e-plugin-util.c:455
 #: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:380
+#: ../plugins/google-account-setup/google-contacts-source.c:388
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "savai�ių"
@@ -7601,7 +7631,7 @@ msgstr "Spausdinimo sistema pateikÄ— tokias klaidos detales:"
 msgid "The printing system did not report any additional details about the error."
 msgstr "Spausdinimo sistema nepateikė jokių klaidos detalių."
 
-#: ../e-util/e-signature.c:707
+#: ../e-util/e-signature.c:708
 msgid "Autogenerated"
 msgstr "Autogeneruotas"
 
@@ -7626,7 +7656,7 @@ msgid "File exists \"{0}\"."
 msgstr "Failas egzistuoja „{0}“."
 
 #: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:166
 msgid "_Overwrite"
 msgstr "_Perrašyti"
 
@@ -7648,7 +7678,7 @@ msgid "All further errors shown only on terminal."
 msgstr "Visos kitos klaidos rodomos tik terminale."
 
 #: ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1054
+#: ../em-format/em-format.c:1060
 #: ../mail/e-mail-tag-editor.c:325
 #: ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:72
@@ -7656,52 +7686,52 @@ msgid "From"
 msgstr "Nuo"
 
 #: ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1055
+#: ../em-format/em-format.c:1061
 #: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Atgalinis adresas"
 
 #: ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2574
-#: ../mail/em-format-html.c:2642
-#: ../mail/em-format-html.c:2665
+#: ../em-format/em-format.c:1063
+#: ../mail/em-format-html.c:2627
+#: ../mail/em-format-html.c:2695
+#: ../mail/em-format-html.c:2718
 #: ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
 msgstr "Kopija"
 
 #: ../em-format/em-format-quote.c:319
-#: ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2575
-#: ../mail/em-format-html.c:2646
-#: ../mail/em-format-html.c:2668
+#: ../em-format/em-format.c:1064
+#: ../mail/em-format-html.c:2628
+#: ../mail/em-format-html.c:2699
+#: ../mail/em-format-html.c:2721
 #: ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
 msgstr "Slapta kopija"
 
-#: ../em-format/em-format-quote.c:463
-#: ../em-format/em-format.c:1059
+#: ../em-format/em-format-quote.c:464
+#: ../em-format/em-format.c:1065
 #: ../mail/e-mail-tag-editor.c:330
 #: ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18
 #: ../modules/mail/em-mailer-prefs.c:77
-#: ../smime/lib/e-cert.c:1142
+#: ../smime/lib/e-cert.c:1147
 msgid "Subject"
 msgstr "Tema"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:474
-#: ../mail/em-format-html.c:2767
-#: ../modules/mail/em-mailer-prefs.c:1008
+#: ../em-format/em-format-quote.c:475
+#: ../mail/em-format-html.c:2820
+#: ../modules/mail/em-mailer-prefs.c:1028
 msgid "Mailer"
 msgstr "Pašto programa"
 
-#: ../em-format/em-format-quote.c:564
-#: ../mail/em-composer-utils.c:1199
+#: ../em-format/em-format-quote.c:565
+#: ../mail/em-composer-utils.c:1207
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas laiškas --------"
 
-#: ../em-format/em-format.c:1060
+#: ../em-format/em-format.c:1066
 #: ../mail/message-list.etspec.h:2
 #: ../modules/mail/em-mailer-prefs.c:78
 #: ../widgets/misc/e-dateedit.c:523
@@ -7709,59 +7739,59 @@ msgstr "-------- Persiųstas laiškas --------"
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/em-format.c:1061
+#: ../em-format/em-format.c:1067
 #: ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
 msgstr "Naujienų grupės"
 
-#: ../em-format/em-format.c:1062
+#: ../em-format/em-format.c:1068
 #: ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Nuotrauka"
 
-#: ../em-format/em-format.c:1466
+#: ../em-format/em-format.c:1472
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: ../em-format/em-format.c:1577
+#: ../em-format/em-format.c:1583
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
 
-#: ../em-format/em-format.c:1771
-#: ../em-format/em-format.c:1997
+#: ../em-format/em-format.c:1777
+#: ../em-format/em-format.c:2005
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nepavyko apdoroti MIME laiško. Rodomas kaip pirminis tekstas."
 
-#: ../em-format/em-format.c:1782
+#: ../em-format/em-format.c:1788
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Multipart/encrypted skirtas Å¡ifravimo tipas nepalaikomas"
 
-#: ../em-format/em-format.c:1802
+#: ../em-format/em-format.c:1808
 msgid "Could not parse PGP/MIME message"
 msgstr "Nepavyko apdoroti PGP/MIME laiško"
 
-#: ../em-format/em-format.c:1803
+#: ../em-format/em-format.c:1809
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nepavyko apdoroti PGP/MIME laiško: Nežinoma klaida"
 
-#: ../em-format/em-format.c:2022
+#: ../em-format/em-format.c:2030
 msgid "Unsupported signature format"
 msgstr "Nepalaikomas parašo formatas"
 
-#: ../em-format/em-format.c:2035
-#: ../em-format/em-format.c:2217
+#: ../em-format/em-format.c:2043
+#: ../em-format/em-format.c:2225
 msgid "Error verifying signature"
 msgstr "Klaida tikrinant parašą"
 
-#: ../em-format/em-format.c:2036
-#: ../em-format/em-format.c:2202
-#: ../em-format/em-format.c:2218
+#: ../em-format/em-format.c:2044
+#: ../em-format/em-format.c:2210
+#: ../em-format/em-format.c:2226
 msgid "Unknown error verifying signature"
 msgstr "Nežinoma klaida tikrinant parašą"
 
-#: ../em-format/em-format.c:2310
+#: ../em-format/em-format.c:2318
 msgid "Could not parse PGP message: "
 msgstr "Nepavyko apdoroti PGP pranešimo:"
 
@@ -7894,7 +7924,7 @@ msgstr "dabar"
 msgid "%d-%b-%Y"
 msgstr "%Y %m %d"
 
-#: ../filter/e-filter-datespec.c:282
+#: ../filter/e-filter-datespec.c:286
 msgid "Select a time to compare against"
 msgstr "Pasirinkite laikÄ…, su kuriuo palyginti"
 
@@ -7902,73 +7932,73 @@ msgstr "Pasirinkite laikÄ…, su kuriuo palyginti"
 msgid "Choose a File"
 msgstr "Pasirinkite failÄ…"
 
-#: ../filter/e-filter-rule.c:664
+#: ../filter/e-filter-rule.c:666
 msgid "R_ule name:"
 msgstr "Tais_yklÄ—s pavadinimas:"
 
-#: ../filter/e-filter-rule.c:694
+#: ../filter/e-filter-rule.c:696
 msgid "Find items that meet the following conditions"
 msgstr "Rasti elementus, atitinkan�ius šias sąlygas"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:721
 msgid "If all conditions are met"
 msgstr "Jei tenkinamos visos sÄ…lygos"
 
-#: ../filter/e-filter-rule.c:720
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Jei tenkinama bent viena sÄ…lyga"
 
-#: ../filter/e-filter-rule.c:723
+#: ../filter/e-filter-rule.c:725
 msgid "_Find items:"
 msgstr "_Rasti elementus:"
 
 #. Translators: "None" for not including threads;
 #. * part of "Include threads: None"
-#: ../filter/e-filter-rule.c:752
+#: ../filter/e-filter-rule.c:754
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../filter/e-filter-rule.c:753
+#: ../filter/e-filter-rule.c:755
 msgid "All related"
 msgstr "Susijusias su visais"
 
-#: ../filter/e-filter-rule.c:754
+#: ../filter/e-filter-rule.c:756
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Atsakymus"
 
-#: ../filter/e-filter-rule.c:755
+#: ../filter/e-filter-rule.c:757
 msgid "Replies and parents"
 msgstr "Atsakymus ir motinines"
 
-#: ../filter/e-filter-rule.c:756
+#: ../filter/e-filter-rule.c:758
 msgid "No reply or parent"
 msgstr "NÄ—ra atsakymo arba pirmas"
 
-#: ../filter/e-filter-rule.c:759
+#: ../filter/e-filter-rule.c:761
 msgid "I_nclude threads:"
 msgstr "Įtra_ukti gijas:"
 
-#: ../filter/e-filter-rule.c:784
+#: ../filter/e-filter-rule.c:786
 msgid "A_dd Condition"
 msgstr "Pri_dÄ—ti sÄ…lygÄ…"
 
-#: ../filter/e-filter-rule.c:1133
+#: ../filter/e-filter-rule.c:1135
 #: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:323
 msgid "Incoming"
 msgstr "Gaunamas"
 
-#: ../filter/e-filter-rule.c:1133
-#: ../mail/em-utils.c:320
+#: ../filter/e-filter-rule.c:1135
+#: ../mail/em-utils.c:324
 msgid "Outgoing"
 msgstr "Išsiun�iamas"
 
-#: ../filter/e-rule-editor.c:263
+#: ../filter/e-rule-editor.c:270
 msgid "Add Rule"
 msgstr "PridÄ—ti taisyklÄ™"
 
-#: ../filter/e-rule-editor.c:349
+#: ../filter/e-rule-editor.c:359
 msgid "Edit Rule"
 msgstr "Keisti taisyklÄ™"
 
@@ -7993,7 +8023,7 @@ msgid "Missing file name."
 msgstr "Trūksta failo pavadinimo."
 
 #: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
 msgid "Missing name."
 msgstr "Trūksta vardo."
 
@@ -8050,7 +8080,7 @@ msgstr ""
 "dabar esan�iu laiku."
 
 #: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:193
+#: ../mail/em-filter-editor.c:194
 msgid "_Filter Rules"
 msgstr "_Filtravimo taisyklÄ—s"
 
@@ -8088,46 +8118,45 @@ msgid "years"
 msgstr "metų"
 
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:845
+#: ../mail/em-account-editor.c:863
 #: ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../mail/em-account-editor.c:926
+#: ../mail/em-account-editor.c:946
 msgid "Never"
 msgstr "Niekada"
 
-#: ../mail/em-account-editor.c:927
+#: ../mail/em-account-editor.c:947
 msgid "Always"
 msgstr "Visada"
 
-#: ../mail/em-account-editor.c:928
+#: ../mail/em-account-editor.c:948
 msgid "Ask for each message"
 msgstr "Paklausti kiekvienam laiškui"
 
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1786
-#: ../widgets/misc/e-account-tree-view.c:131
+#: ../mail/em-account-editor.c:1832
+#: ../widgets/misc/e-account-tree-view.c:265
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../mail/em-account-editor.c:2185
-#| msgid "_File:"
+#: ../mail/em-account-editor.c:2233
 msgid "Fil_e:"
 msgstr "_Failas:"
 
-#: ../mail/em-account-editor.c:2185
-#: ../mail/mail-config.ui.h:157
+#: ../mail/em-account-editor.c:2233
+#: ../mail/mail-config.ui.h:158
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: ../mail/em-account-editor.c:2234
+#: ../mail/em-account-editor.c:2287
 msgid "Mail Configuration"
 msgstr "Pašto nustatymai"
 
-#: ../mail/em-account-editor.c:2235
+#: ../mail/em-account-editor.c:2288
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -8137,34 +8166,34 @@ msgstr ""
 "\n"
 "Norėdami pradėti, spustelėkite mygtuką „Tęsti“. "
 
-#: ../mail/em-account-editor.c:2238
+#: ../mail/em-account-editor.c:2291
 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 "Žemiau įveskite savo vardą ir elektroninio pašto adresą. „Nebūtini“ laukai gali likti tušti, nebent pageidaujate įtraukti šią informaciją išsiun�iamame laiške."
 
-#: ../mail/em-account-editor.c:2240
-#: ../mail/em-account-editor.c:2429
+#: ../mail/em-account-editor.c:2293
+#: ../mail/em-account-editor.c:2485
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
-#: ../mail/em-account-editor.c:2241
+#: ../mail/em-account-editor.c:2294
 msgid "Please configure the following account settings."
 msgstr "Nurodykite Å¡iuos paskyros parametrus."
 
-#: ../mail/em-account-editor.c:2243
-#: ../mail/em-account-editor.c:3026
+#: ../mail/em-account-editor.c:2296
+#: ../mail/em-account-editor.c:3082
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: ../mail/em-account-editor.c:2244
+#: ../mail/em-account-editor.c:2297
 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 "Žemiau įveskite informaciją apie išsiun�iamo pašto serverį. Jei gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto paslaugų tiekėjo."
 
-#: ../mail/em-account-editor.c:2246
+#: ../mail/em-account-editor.c:2299
 #: ../mail/mail-config.ui.h:1
 msgid "Account Information"
 msgstr "Paskyros informacija"
 
-#: ../mail/em-account-editor.c:2247
+#: ../mail/em-account-editor.c:2300
 msgid ""
 "Please enter a descriptive name for this account below.\n"
 "This name will be used for display purposes only."
@@ -8172,11 +8201,11 @@ msgstr ""
 "Žemiau įveskite šią paskyrą apibūdinantį pavadinimą.\n"
 "Jis naudojamas tik rodymo tikslais."
 
-#: ../mail/em-account-editor.c:2251
+#: ../mail/em-account-editor.c:2304
 msgid "Done"
 msgstr "Baigta"
 
-#: ../mail/em-account-editor.c:2252
+#: ../mail/em-account-editor.c:2305
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8190,38 +8219,38 @@ msgstr ""
 "\n"
 "Norėdami išsaugoti savo parametrus, spustelėkite mygtuką „Pritaikyti“."
 
-#: ../mail/em-account-editor.c:2788
+#: ../mail/em-account-editor.c:2844
 msgid "Check for _new messages every"
 msgstr "Automatiškai ieškoti _naujo pašto kas"
 
-#: ../mail/em-account-editor.c:2796
+#: ../mail/em-account-editor.c:2852
 msgid "minu_tes"
 msgstr "_min."
 
-#: ../mail/em-account-editor.c:3456
-#: ../mail/mail-config.ui.h:101
+#: ../mail/em-account-editor.c:3521
+#: ../mail/mail-config.ui.h:102
 msgid "Security"
 msgstr "Saugumas"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:3510
-#: ../mail/em-account-editor.c:3593
+#: ../mail/em-account-editor.c:3576
+#: ../mail/em-account-editor.c:3659
 msgid "Receiving Options"
 msgstr "Gavimo parinktys"
 
-#: ../mail/em-account-editor.c:3511
-#: ../mail/em-account-editor.c:3594
+#: ../mail/em-account-editor.c:3577
+#: ../mail/em-account-editor.c:3660
 msgid "Checking for New Messages"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
 #: ../mail/e-mail-attachment-bar.c:90
 #: ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1418
 #: ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:128
-#: ../widgets/misc/e-attachment-paned.c:133
+#: ../widgets/misc/e-attachment-paned.c:174
+#: ../widgets/misc/e-attachment-paned.c:179
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Priedas"
@@ -8229,12 +8258,12 @@ msgstr[1] "Priedai"
 msgstr[2] "Priedai"
 
 #: ../mail/e-mail-attachment-bar.c:608
-#: ../widgets/misc/e-attachment-paned.c:623
+#: ../widgets/misc/e-attachment-paned.c:700
 msgid "Icon View"
 msgstr "Piktogramų rodinys"
 
 #: ../mail/e-mail-attachment-bar.c:610
-#: ../widgets/misc/e-attachment-paned.c:625
+#: ../widgets/misc/e-attachment-paned.c:702
 msgid "List View"
 msgstr "Sąrašo rodinys"
 
@@ -8245,7 +8274,7 @@ msgstr "Sąrašo rodinys"
 msgid "Close this window"
 msgstr "Uždaryti šį langą"
 
-#: ../mail/e-mail-browser.c:291
+#: ../mail/e-mail-browser.c:293
 msgid "(No Subject)"
 msgstr "(NÄ—ra temos)"
 
@@ -8273,20 +8302,20 @@ msgstr "Siųsti atsakymo laišką šiuo adresu"
 msgid "Create Search _Folder"
 msgstr "Sukurti _paieškos aplanką"
 
-#: ../mail/e-mail-folder-utils.c:111
+#: ../mail/e-mail-folder-utils.c:109
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Laiškas įrašomas aplanke „%s“"
 
-#: ../mail/e-mail-folder-utils.c:274
+#: ../mail/e-mail-folder-utils.c:270
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: ../mail/e-mail-folder-utils.c:391
+#: ../mail/e-mail-folder-utils.c:385
 msgid "Scanning messages for duplicates"
 msgstr "Ieškoma dublikatų"
 
-#: ../mail/e-mail-folder-utils.c:584
+#: ../mail/e-mail-folder-utils.c:576
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -8294,25 +8323,25 @@ msgstr[0] "Atsiun�iamas %d laiškas"
 msgstr[1] "Atsiun�iami %d laiškai"
 msgstr[2] "Atsiun�iama %d laiškų"
 
-#: ../mail/e-mail-folder-utils.c:833
+#: ../mail/e-mail-folder-utils.c:824
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Šalinamas aplankas „%s“"
 
-#: ../mail/e-mail-folder-utils.c:967
+#: ../mail/e-mail-folder-utils.c:956
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Failas „%s“ pašalintas."
 
-#: ../mail/e-mail-folder-utils.c:971
+#: ../mail/e-mail-folder-utils.c:960
 msgid "File has been removed."
 msgstr "Failas buvo pašalintas."
 
-#: ../mail/e-mail-folder-utils.c:1030
+#: ../mail/e-mail-folder-utils.c:1019
 msgid "Removing attachments"
 msgstr "Å alinami priedai"
 
-#: ../mail/e-mail-folder-utils.c:1194
+#: ../mail/e-mail-folder-utils.c:1181
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -8320,8 +8349,8 @@ msgstr[0] "Įrašomas %d laiškas"
 msgstr[1] "Įrašomi %d laiškai"
 msgstr[2] "Įrašoma %d laiškų"
 
-#: ../mail/e-mail-folder-utils.c:1538
-#: ../mail/em-folder-utils.c:612
+#: ../mail/e-mail-folder-utils.c:1525
+#: ../mail/em-folder-utils.c:628
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Netinkamas aplanko URI „%s“"
@@ -8361,7 +8390,7 @@ msgid "_Later"
 msgstr "_VÄ—liau"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:684
+#: ../modules/mail/e-mail-shell-view-actions.c:677
 msgid "Add Label"
 msgstr "Pridėti žymę"
 
@@ -8383,67 +8412,67 @@ msgid "Color"
 msgstr "Spalva"
 
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
-#: ../plugins/caldav/caldav-browse-server.c:1295
-#: ../widgets/menus/gal-define-views-dialog.c:336
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#: ../widgets/menus/gal-define-views-dialog.c:347
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:92
 msgid "Name"
 msgstr "Vardas"
 
 #: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-properties.c:310
-#: ../mail/em-folder-tree-model.c:720
+#: ../mail/em-folder-properties.c:312
+#: ../mail/em-folder-tree-model.c:916
 #: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
 #: ../mail/e-mail-local.c:42
-#: ../mail/em-folder-tree-model.c:713
+#: ../mail/em-folder-tree-model.c:909
 #: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Juodraš�iai"
 
 #: ../mail/e-mail-local.c:43
-#: ../mail/em-folder-tree-model.c:724
+#: ../mail/em-folder-tree-model.c:920
 #: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Paruošti siųsti"
 
 #: ../mail/e-mail-local.c:44
-#: ../mail/em-folder-tree-model.c:728
+#: ../mail/em-folder-tree-model.c:924
 #: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Išsiųsti"
 
 #: ../mail/e-mail-local.c:45
-#: ../mail/em-folder-tree-model.c:716
+#: ../mail/em-folder-tree-model.c:912
 #: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:1006
-#: ../plugins/templates/templates.c:1283
-#: ../plugins/templates/templates.c:1293
+#: ../plugins/templates/templates.c:1034
+#: ../plugins/templates/templates.c:1312
+#: ../plugins/templates/templates.c:1322
 msgid "Templates"
 msgstr "Å ablonai"
 
-#: ../mail/e-mail-migrate.c:133
+#: ../mail/e-mail-migrate.c:134
 msgid "Migrating..."
 msgstr "Perkeliama..."
 
-#: ../mail/e-mail-migrate.c:168
+#: ../mail/e-mail-migrate.c:169
 msgid "Migration"
 msgstr "PerkÄ—limas"
 
-#: ../mail/e-mail-migrate.c:209
+#: ../mail/e-mail-migrate.c:210
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Perkeliama „%s“:"
 
-#: ../mail/e-mail-migrate.c:722
+#: ../mail/e-mail-migrate.c:726
 msgid "Migrating Folders"
 msgstr "Perkeliami aplankai"
 
-#: ../mail/e-mail-migrate.c:723
+#: ../mail/e-mail-migrate.c:727
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
 "\n"
@@ -8458,7 +8487,7 @@ msgstr ""
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "Nepavyko sukurti vietinių pašto aplankų vietoje „%s“: %s"
 
-#: ../mail/e-mail-notebook-view.c:619
+#: ../mail/e-mail-notebook-view.c:621
 msgid "Please select a folder"
 msgstr "Pasirinkite aplankÄ…"
 
@@ -8468,630 +8497,630 @@ msgid "Copy to Folder"
 msgstr "Kopijuoti į aplanką"
 
 #: ../mail/e-mail-reader.c:308
-#: ../mail/em-folder-utils.c:486
+#: ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "K_opijuoti"
 
-#: ../mail/e-mail-reader.c:814
+#: ../mail/e-mail-reader.c:823
 #: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Perkelti į aplanką"
 
-#: ../mail/e-mail-reader.c:814
-#: ../mail/em-folder-utils.c:486
+#: ../mail/e-mail-reader.c:823
+#: ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: ../mail/e-mail-reader.c:1175
-#: ../mail/e-mail-reader.c:1363
-#: ../mail/e-mail-reader.c:1403
+#: ../mail/e-mail-reader.c:1184
+#: ../mail/e-mail-reader.c:1372
+#: ../mail/e-mail-reader.c:1412
 msgid "_Do not ask me again."
 msgstr "_Daugiau nebeklausti."
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1418
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Nepaisyti atgalinio adreso laukelio rašant į pašto konferencijas."
 
-#: ../mail/e-mail-reader.c:1775
+#: ../mail/e-mail-reader.c:1784
 msgid "A_dd Sender to Address Book"
 msgstr "Į_traukti siuntėją į adresų knygą"
 
-#: ../mail/e-mail-reader.c:1777
+#: ../mail/e-mail-reader.c:1786
 msgid "Add sender to address book"
 msgstr "Įtraukti siuntėją į adresų knygą"
 
-#: ../mail/e-mail-reader.c:1782
+#: ../mail/e-mail-reader.c:1791
 msgid "Check for _Junk"
 msgstr "Filtruoti bru_kalÄ…"
 
-#: ../mail/e-mail-reader.c:1784
+#: ../mail/e-mail-reader.c:1793
 msgid "Filter the selected messages for junk status"
 msgstr "Filtruoti pažymėtas žinutes norint nustatyti brukalo statusą"
 
-#: ../mail/e-mail-reader.c:1789
+#: ../mail/e-mail-reader.c:1798
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: ../mail/e-mail-reader.c:1791
+#: ../mail/e-mail-reader.c:1800
 msgid "Copy selected messages to another folder"
 msgstr "Kopijuoti pažymėtus laiškus į kitą aplanką"
 
-#: ../mail/e-mail-reader.c:1796
+#: ../mail/e-mail-reader.c:1805
 msgid "_Delete Message"
 msgstr "_Ištrinti laišką"
 
-#: ../mail/e-mail-reader.c:1798
+#: ../mail/e-mail-reader.c:1807
 msgid "Mark the selected messages for deletion"
 msgstr "Pasirinktus laiškus pažymėti ištrynimui"
 
-#: ../mail/e-mail-reader.c:1803
+#: ../mail/e-mail-reader.c:1812
 msgid "Filter on Mailing _List..."
 msgstr "Filtruoti pagal _konferencijÄ…..."
 
-#: ../mail/e-mail-reader.c:1805
+#: ../mail/e-mail-reader.c:1814
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sukurti taisyklę filtruoti laiškams šiai konferencijai"
 
-#: ../mail/e-mail-reader.c:1810
+#: ../mail/e-mail-reader.c:1819
 msgid "Filter on _Recipients..."
 msgstr "Filtruoti pagal _gavÄ—jus..."
 
-#: ../mail/e-mail-reader.c:1812
+#: ../mail/e-mail-reader.c:1821
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sukurti taisyklę filtruoti laiškams šiems gavėjams"
 
-#: ../mail/e-mail-reader.c:1817
+#: ../mail/e-mail-reader.c:1826
 msgid "Filter on Se_nder..."
 msgstr "Filtruoti pagal siu_ntÄ—jÄ…..."
 
-#: ../mail/e-mail-reader.c:1819
+#: ../mail/e-mail-reader.c:1828
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sukurti taisyklę filtruoti laiškams nuo šio siuntėjo"
 
-#: ../mail/e-mail-reader.c:1824
+#: ../mail/e-mail-reader.c:1833
 msgid "Filter on _Subject..."
 msgstr "Filtruoti pagal _temÄ…..."
 
-#: ../mail/e-mail-reader.c:1826
+#: ../mail/e-mail-reader.c:1835
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sukurti taisyklę filtruoti laiškams su šia tema"
 
-#: ../mail/e-mail-reader.c:1831
+#: ../mail/e-mail-reader.c:1840
 msgid "A_pply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: ../mail/e-mail-reader.c:1833
+#: ../mail/e-mail-reader.c:1842
 msgid "Apply filter rules to the selected messages"
 msgstr "Pritaikyti filtrų taisykles pažymėtiems laiškams"
 
-#: ../mail/e-mail-reader.c:1838
+#: ../mail/e-mail-reader.c:1847
 msgid "_Find in Message..."
 msgstr "_Rasti laiške..."
 
-#: ../mail/e-mail-reader.c:1840
+#: ../mail/e-mail-reader.c:1849
 msgid "Search for text in the body of the displayed message"
 msgstr "Ieškoti eilutės rodomo laiško tekste"
 
-#: ../mail/e-mail-reader.c:1845
+#: ../mail/e-mail-reader.c:1854
 msgid "_Clear Flag"
 msgstr "_Pašalinti žymę"
 
-#: ../mail/e-mail-reader.c:1847
+#: ../mail/e-mail-reader.c:1856
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Pašalinti nuo pasirinktų laiškų žymę „tęsiniui“"
 
-#: ../mail/e-mail-reader.c:1852
+#: ../mail/e-mail-reader.c:1861
 msgid "_Flag Completed"
 msgstr "Pažymėti bai_gtu"
 
-#: ../mail/e-mail-reader.c:1854
+#: ../mail/e-mail-reader.c:1863
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Pažymėti pasirinktus laiškus tęsiniui kaip baigtus"
 
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1868
 msgid "Follow _Up..."
 msgstr "_Tęsinys..."
 
-#: ../mail/e-mail-reader.c:1861
+#: ../mail/e-mail-reader.c:1870
 msgid "Flag the selected messages for follow-up"
 msgstr "Pažymėti pasirinktus laiškus tęsiniui"
 
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1875
 msgid "_Attached"
 msgstr "_Prisegta"
 
-#: ../mail/e-mail-reader.c:1868
-#: ../mail/e-mail-reader.c:1875
+#: ../mail/e-mail-reader.c:1877
+#: ../mail/e-mail-reader.c:1884
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Persiųsti pasirinktą laišką prisegtą kaip priedas"
 
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1882
 msgid "Forward As _Attached"
 msgstr "_Persiųsti kaip prisegtą"
 
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1889
 msgid "_Inline"
 msgstr "_Viduje"
 
-#: ../mail/e-mail-reader.c:1882
-#: ../mail/e-mail-reader.c:1889
+#: ../mail/e-mail-reader.c:1891
+#: ../mail/e-mail-reader.c:1898
 msgid "Forward the selected message in the body of a new message"
 msgstr "Persiųsti pasirinktą laišką naujo laiško tekste"
 
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1896
 msgid "Forward As _Inline"
 msgstr "Persiųsti kaip į_terptą"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1903
 msgid "_Quoted"
 msgstr "_Cituojant"
 
-#: ../mail/e-mail-reader.c:1896
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1905
+#: ../mail/e-mail-reader.c:1912
 msgid "Forward the selected message quoted like a reply"
 msgstr "Persiųsti pasirinktą laišką cituojamą kaip atsakymas"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1910
 msgid "Forward As _Quoted"
 msgstr "Persiųsti kaip _cituojamą"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1917
 msgid "_Load Images"
 msgstr "Į_kelti paveikslėlius"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1919
 msgid "Force images in HTML mail to be loaded"
 msgstr "Priverstinai įkelti HTML laiškuose esan�ius paveiksliukus"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1924
 msgid "_Important"
 msgstr "_Svarbus"
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1926
 msgid "Mark the selected messages as important"
 msgstr "Pažymėti pasirinktus laiškus kaip svarbius"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1931
 msgid "_Junk"
 msgstr "Šl_amštas"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1933
 msgid "Mark the selected messages as junk"
 msgstr "Pažymėti pasirinktus laiškus kaip brukalą"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1938
 msgid "_Not Junk"
 msgstr "_Ne brukalas"
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:1940
 msgid "Mark the selected messages as not being junk"
 msgstr "Pažymėti pasirinktus laiškus kaip ne brukalą"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1945
 msgid "_Read"
 msgstr "_Skaityti"
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark the selected messages as having been read"
 msgstr "Pažymėti pasirinktus laiškus kaip perskaitytus"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1952
 msgid "Uni_mportant"
 msgstr "_Nesvarbus"
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:1954
 msgid "Mark the selected messages as unimportant"
 msgstr "Pažymėti pasirinktus laiškus kaip nesvarbius"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:1959
 msgid "_Unread"
 msgstr "_Neskaitytas"
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:1961
 msgid "Mark the selected messages as not having been read"
 msgstr "Pažymėti pasirinktus laiškus kaip neskaitytus"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1966
 msgid "_Edit as New Message..."
 msgstr "_Redaguoti kaip naują laišką..."
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:1968
 msgid "Open the selected messages in the composer for editing"
 msgstr "Atverti pasirinktus laiškus redaktoriuje redagavimui"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:1973
 msgid "Compose _New Message"
 msgstr "Sukurti _naują laišką"
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:1975
 msgid "Open a window for composing a mail message"
 msgstr "Atverti langą rašyti naujam laiškui"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1980
 msgid "_Open in New Window"
 msgstr "_Atverti naujame lange"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:1982
 msgid "Open the selected messages in a new window"
 msgstr "Atverti pasirinktus laiškus naujame lange"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:1987
 msgid "_Move to Folder..."
 msgstr "Pe_rkelti į aplanką..."
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:1989
 msgid "Move selected messages to another folder"
 msgstr "Perkelti pažymėtus laiškus į kitą aplanką"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1994
 msgid "_Switch to Folder"
 msgstr "_Perjungti į aplanką"
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:1996
 msgid "Display the parent folder"
 msgstr "Rodyti aukštesnįjį aplanką"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to _next tab"
 msgstr "Perjungti į _kitą kortelę"
 
-#: ../mail/e-mail-reader.c:1994
+#: ../mail/e-mail-reader.c:2003
 msgid "Switch to the next tab"
 msgstr "Perjungti į kitą kortelę"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2008
 msgid "Switch to _previous tab"
 msgstr "Perjungti į _ankstesnę kortelę"
 
-#: ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2010
 msgid "Switch to the previous tab"
 msgstr "Perjungti į ankstesnę kortelę"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2015
 msgid "Cl_ose current tab"
 msgstr "_Užverti dabartinę kortelę"
 
-#: ../mail/e-mail-reader.c:2008
+#: ../mail/e-mail-reader.c:2017
 msgid "Close current tab"
 msgstr "Užverti dabartinę kortelę"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2022
 msgid "_Next Message"
 msgstr "_Kitas laiškas"
 
-#: ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2024
 msgid "Display the next message"
 msgstr "Parodyti kitą laišką"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2029
 msgid "Next _Important Message"
 msgstr "K_itas svarbus laiškas"
 
-#: ../mail/e-mail-reader.c:2022
+#: ../mail/e-mail-reader.c:2031
 msgid "Display the next important message"
 msgstr "Parodyti kitą svarbų laišką"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2036
 msgid "Next _Thread"
 msgstr "Kita _gija"
 
-#: ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2038
 msgid "Display the next thread"
 msgstr "Parodyti kitÄ… gijÄ…"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2043
 msgid "Next _Unread Message"
 msgstr "Kitas _neskaitytas laiškas"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2045
 msgid "Display the next unread message"
 msgstr "Parodyti kitą neskaitytą laišką"
 
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2050
 msgid "_Previous Message"
 msgstr "_Ankstesnis laiškas"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2052
 msgid "Display the previous message"
 msgstr "Parodyti ankstesnį laišką"
 
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2057
 msgid "Pr_evious Important Message"
 msgstr "Ankst_esnis svarbus laiškas"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2059
 msgid "Display the previous important message"
 msgstr "Parodyti ankstesnį svarbų laišką"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2064
 msgid "Previous T_hread"
 msgstr "_AnkstesnÄ— gija"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2066
 msgid "Display the previous thread"
 msgstr "Parodyti ankstesnÄ™ gijÄ…"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2071
 msgid "P_revious Unread Message"
 msgstr "_Ankstesnis neskaitytas laiškas"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2073
 msgid "Display the previous unread message"
 msgstr "Parodyti praeitą neskaitytą laišką"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2080
 msgid "Print this message"
 msgstr "Spausdinti šį laišką"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2087
 msgid "Preview the message to be printed"
 msgstr "Peržiūrėti spausdintiną laišką"
 
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2092
 msgid "Re_direct"
 msgstr "Nu_kreipti"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2094
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Nukreipti (permesti) pasirinktą laišką kam nors kitam"
 
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2099
 msgid "Remo_ve Attachments"
 msgstr "_Pašalinti priedus"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2101
 msgid "Remove attachments"
 msgstr "Pašalinti priedus"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2106
 msgid "Remove Du_plicate Messages"
 msgstr "Pašalinti _dublikuotus laiškus"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2108
 msgid "Checks selected messages for duplicates"
 msgstr "Patikrina, ar tarp pažymėtų laiškų nėra dublikatų"
 
-#: ../mail/e-mail-reader.c:2104
-#: ../mail/mail.error.xml.h:109
-#: ../modules/calendar/e-cal-shell-view-actions.c:1509
+#: ../mail/e-mail-reader.c:2113
+#: ../mail/mail.error.xml.h:110
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2115
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Rašyti atsakymą visiems pasirinkto laiško gavėjams"
 
-#: ../mail/e-mail-reader.c:2111
-#: ../mail/mail.error.xml.h:110
+#: ../mail/e-mail-reader.c:2120
+#: ../mail/mail.error.xml.h:111
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2122
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sukurti atsakymą pasirinkto laiško konferencijai"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2127
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntÄ—jui"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2129
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sukurti atsakymą pasirinkto laiško siuntėjui"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2134
 msgid "_Save as mbox..."
 msgstr "Į_rašyti kaip mbox..."
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2136
 msgid "Save selected messages as an mbox file"
 msgstr "Įrašyti pasirinktus laiškus kaip mbox failą"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2141
 msgid "_Message Source"
 msgstr "_Laiško pradinis kodas"
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2143
 msgid "Show the raw email source of the message"
 msgstr "Rodyti neapdorotą laiško šaltinį"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2155
 msgid "_Undelete Message"
 msgstr "_Grąžinti laišką"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2157
 msgid "Undelete the selected messages"
 msgstr "Sugrąžinti pažymėtus laiškus"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2162
 msgid "_Normal Size"
 msgstr "_Normalus dydis"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2164
 msgid "Reset the text to its original size"
 msgstr "Atstatyti teksto originalų dydį"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2169
 msgid "_Zoom In"
 msgstr "_Pritraukti"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2171
 msgid "Increase the text size"
 msgstr "Padidinti teksto dydį"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2176
 msgid "Zoom _Out"
 msgstr "_Atitraukti"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2178
 msgid "Decrease the text size"
 msgstr "Sumažinti teksto dydį"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2185
 msgid "Create R_ule"
 msgstr "Sukurti _taisyklÄ™"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2192
 msgid "Ch_aracter Encoding"
 msgstr "_Simbolių koduotė"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2199
 msgid "F_orward As"
 msgstr "P_ersiųsti kaip"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2206
 msgid "_Group Reply"
 msgstr "_Grupinis atsakymas"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2213
 msgid "_Go To"
 msgstr "_Eiti į"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2220
 msgid "Mar_k As"
 msgstr "Pažymėti _kaip"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2227
 msgid "_Message"
 msgstr "_Laiškas"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2234
 msgid "_Zoom"
 msgstr "_Mastelis"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2244
 msgid "Search Folder from Mailing _List..."
 msgstr "Paieškos aplankas pagal _konferenciją..."
 
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2246
 msgid "Create a search folder for this mailing list"
 msgstr "Sukurti paieškos aplanką šiai konferencijai"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2251
 msgid "Search Folder from Recipien_ts..."
 msgstr "Paieškos aplankas pagal _gavėjus..."
 
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2253
 msgid "Create a search folder for these recipients"
 msgstr "Sukurti paieškos aplanką šiems gavėjams"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2258
 msgid "Search Folder from Sen_der..."
 msgstr "Paieškos aplankas pagal siu_ntėją..."
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2260
 msgid "Create a search folder for this sender"
 msgstr "Sukurti paieškos aplanką šiam siuntėjui"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2265
 msgid "Search Folder from S_ubject..."
 msgstr "Paieškos aplankas pagal _temą..."
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2267
 msgid "Create a search folder for this subject"
 msgstr "Sukurti paieškos aplanką šiai temai"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2290
 msgid "Mark for Follo_w Up..."
 msgstr "Pažymėti _tęsiniui..."
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2298
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2302
 msgid "Mark as _Junk"
 msgstr "Pažymėti kaip b_rukalą"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark as _Not Junk"
 msgstr "Pažymėti kaip _ne brukalą"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2310
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2314
 msgid "Mark as Uni_mportant"
 msgstr "Pažymėti kaip nes_varbų"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as _Unread"
 msgstr "Pažymėti nes_kaitytu"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2362
 msgid "_Caret Mode"
 msgstr "Ž_ymiklio veiksena"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2364
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Rodyti mirksintį žymeklį išvedamų laiškų tekste"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2370
 msgid "All Message _Headers"
 msgstr "Visos laiško _antraštės"
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2372
 msgid "Show messages with all email headers"
 msgstr "Rodyti laiškus su visomis pašto antraštėmis"
 
-#: ../mail/e-mail-reader.c:2659
+#: ../mail/e-mail-reader.c:2668
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Atsiun�iamas laiškas „%s“"
 
 #. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3246
+#. * other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:3255
 #: ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:310
-#: ../plugins/google-account-setup/google-source.c:553
-#: ../plugins/google-account-setup/google-source.c:692
-#: ../widgets/misc/e-account-tree-view.c:253
+#: ../plugins/google-account-setup/google-source.c:316
+#: ../plugins/google-account-setup/google-source.c:565
+#: ../plugins/google-account-setup/google-source.c:704
+#: ../widgets/misc/e-account-tree-view.c:414
 msgid "Default"
 msgstr "Numatytasis"
 
-#: ../mail/e-mail-reader.c:3415
+#: ../mail/e-mail-reader.c:3424
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: ../mail/e-mail-reader.c:3416
+#: ../mail/e-mail-reader.c:3425
 msgid "Forward the selected message to someone"
 msgstr "Persiųsti pasirinktą laišką kažkam"
 
-#: ../mail/e-mail-reader.c:3435
+#: ../mail/e-mail-reader.c:3444
 msgid "Group Reply"
 msgstr "Grupinis atsakymas"
 
-#: ../mail/e-mail-reader.c:3436
+#: ../mail/e-mail-reader.c:3445
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Atsakyti į pašto konferenciją arba visiems gavėjams"
 
-#: ../mail/e-mail-reader.c:3489
+#: ../mail/e-mail-reader.c:3498
 #: ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
-#: ../mail/e-mail-reader.c:3522
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../mail/e-mail-reader.c:3531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Kitas"
 
-#: ../mail/e-mail-reader.c:3526
-#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+#: ../mail/e-mail-reader.c:3535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Praeitas"
 
-#: ../mail/e-mail-reader.c:3535
+#: ../mail/e-mail-reader.c:3544
 #: ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: ../mail/e-mail-reader.c:4205
+#: ../mail/e-mail-reader.c:4214
 #, c-format
 msgid "Folder '%s'"
 msgstr "Aplankas „%s“"
@@ -9102,7 +9131,7 @@ msgstr "Daugiau neperspÄ—ti"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:669
+#: ../mail/e-mail-reader-utils.c:667
 #, c-format
 msgid "Folder '%s' contains %u duplicate message. Are you sure you want to delete it?"
 msgid_plural "Folder '%s' contains %u duplicate messages. Are you sure you want to delete them?"
@@ -9110,7 +9139,7 @@ msgstr[0] "Aplanke „%s“ yra %u dublikuotas laiÅ¡kas. Ar tikrai norite jį iÅ
 msgstr[1] "Aplanke „%s“ yra %u dublikuoti laiškai. Ar tikrai norite juos ištrinti."
 msgstr[2] "Aplanke „%s“ yra %u dublikuotų laiškų. Ar tikrai norite juos ištrinti."
 
-#: ../mail/e-mail-reader-utils.c:1046
+#: ../mail/e-mail-reader-utils.c:1044
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Įrašyti laišką"
@@ -9122,61 +9151,61 @@ msgstr[2] "Įrašyti laiškus"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1067
+#: ../mail/e-mail-reader-utils.c:1065
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Laiškas"
 msgstr[1] "Laiškai"
 msgstr[2] "Laiškai"
 
-#: ../mail/e-mail-session.c:863
+#: ../mail/e-mail-session.c:798
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Įveskite %s slaptažodį"
 
-#: ../mail/e-mail-session.c:867
+#: ../mail/e-mail-session.c:802
 msgid "Enter Passphrase"
 msgstr "Įveskite slaptažodį"
 
-#: ../mail/e-mail-session.c:871
+#: ../mail/e-mail-session.c:806
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įveskite %s slaptažodį"
 
-#: ../mail/e-mail-session.c:875
+#: ../mail/e-mail-session.c:810
 msgid "Enter Password"
 msgstr "Įveskite slaptažodį"
 
-#: ../mail/e-mail-session.c:926
+#: ../mail/e-mail-session.c:861
 #, c-format
 msgid "User canceled operation."
 msgstr "Naudotojas nutraukÄ— operacijÄ…."
 
-#: ../mail/e-mail-session.c:1039
+#: ../mail/e-mail-session.c:974
 #, c-format
 msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "Nenurodytas paskirties adresas, laiško persiuntimas buvo atšauktas."
 
-#: ../mail/e-mail-session.c:1048
+#: ../mail/e-mail-session.c:983
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Nerasta naudotina paskyra, laiško persiuntimas buvo atšauktas."
 
-#: ../mail/e-mail-session-utils.c:419
+#: ../mail/e-mail-session-utils.c:415
 #, c-format
 msgid "Cannot get transport for account '%s'"
 msgstr "Nepavyko gauti transporto paskyrai „%s“"
 
-#: ../mail/e-mail-session-utils.c:508
-#: ../mail/mail-ops.c:634
+#: ../mail/e-mail-session-utils.c:500
+#: ../mail/mail-ops.c:638
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išsiuntimo filtrų: %s"
 
-#: ../mail/e-mail-session-utils.c:532
-#: ../mail/e-mail-session-utils.c:566
-#: ../mail/mail-ops.c:653
-#: ../mail/mail-ops.c:687
+#: ../mail/e-mail-session-utils.c:524
+#: ../mail/e-mail-session-utils.c:558
+#: ../mail/mail-ops.c:657
+#: ../mail/mail-ops.c:691
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -9185,34 +9214,34 @@ msgstr ""
 "Nepavyko įrašyti į %s: %s\n"
 "Vietoj to įrašoma vietiniame aplanke „Išsiųsti“."
 
-#: ../mail/e-mail-session-utils.c:586
-#: ../mail/mail-ops.c:707
+#: ../mail/e-mail-session-utils.c:578
+#: ../mail/mail-ops.c:711
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Nepavyko įrašyti į vietinį aplanką „Išsiųsti“: %s"
 
-#: ../mail/e-mail-session-utils.c:797
-#: ../mail/mail-ops.c:810
-#: ../mail/mail-ops.c:906
+#: ../mail/e-mail-session-utils.c:788
+#: ../mail/mail-ops.c:832
+#: ../mail/mail-ops.c:928
 msgid "Sending message"
 msgstr "Siun�iamas laiškas"
 
-#: ../mail/e-mail-session-utils.c:873
+#: ../mail/e-mail-session-utils.c:862
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Atsisakoma aplanko „%s“ prenumeratos"
 
-#: ../mail/e-mail-store-utils.c:168
+#: ../mail/e-mail-store-utils.c:166
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Atsijungiama nuo „%s“"
 
-#: ../mail/e-mail-store-utils.c:259
+#: ../mail/e-mail-store-utils.c:255
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Iš naujo jungiamasi prie „%s“"
 
-#: ../mail/e-mail-store-utils.c:334
+#: ../mail/e-mail-store-utils.c:328
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Aplankas „%s“ ruošiamas darbui atsijungus"
@@ -9225,35 +9254,35 @@ msgstr "Pažymėti kaip tęsinį"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1193
+#: ../mail/em-composer-utils.c:1201
 msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
 msgstr "${AbbrevWeekdayName}, ${Year} ${Month} ${Day} ${24Hour}:${Minute} ${TimeZone}, ${Sender} rašė:"
 
-#: ../mail/em-composer-utils.c:1204
+#: ../mail/em-composer-utils.c:1212
 msgid "-----Original Message-----"
 msgstr "----Originalus laiškas----"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../mail/em-composer-utils.c:1986
+#: ../mail/em-composer-utils.c:2001
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Jūsų %3$s rašytas laiškas adresatui %1$s tema „%2$s“ buvo perskaitytas."
 
-#: ../mail/em-composer-utils.c:2046
+#: ../mail/em-composer-utils.c:2061
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "Pristatymo pranešimas: „%s“"
 
-#: ../mail/em-composer-utils.c:2583
+#: ../mail/em-composer-utils.c:2600
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
-#: ../mail/em-composer-utils.c:2988
+#: ../mail/em-composer-utils.c:3006
 msgid "Posting destination"
 msgstr "Paskirties vieta"
 
-#: ../mail/em-composer-utils.c:2989
+#: ../mail/em-composer-utils.c:3007
 msgid "Choose folders to post the message to."
 msgstr "Pasirinkite aplanką, kuriame bus paskelbtas laiškas."
 
@@ -9509,39 +9538,39 @@ msgid "Unset Status"
 msgstr "Atšaukti būseną"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:538
+#: ../mail/em-filter-rule.c:561
 msgid "Then"
 msgstr "Tada"
 
-#: ../mail/em-filter-rule.c:569
+#: ../mail/em-filter-rule.c:592
 msgid "Add Ac_tion"
 msgstr "PridÄ—ti _veiksmÄ…"
 
-#: ../mail/em-folder-properties.c:143
+#: ../mail/em-folder-properties.c:145
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Neskaityta žinutė:"
 msgstr[1] "Neskaitytos žinutės:"
 msgstr[2] "Neskaitytų žinu�ių:"
 
-#: ../mail/em-folder-properties.c:154
+#: ../mail/em-folder-properties.c:156
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Iš viso laiškų:"
 msgstr[1] "Iš viso laiškų:"
 msgstr[2] "Iš viso laiškų:"
 
-#: ../mail/em-folder-properties.c:175
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Kvotos naudojimas (%s):"
 
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:179
 #, c-format
 msgid "Quota usage"
 msgstr "Kvotos naudojimas"
 
-#: ../mail/em-folder-properties.c:315
+#: ../mail/em-folder-properties.c:317
 msgid "Folder Properties"
 msgstr "Aplanko savybÄ—s"
 
@@ -9549,11 +9578,11 @@ msgstr "Aplanko savybÄ—s"
 msgid "<click here to select a folder>"
 msgstr "<spustelÄ—kite norÄ—dami pasirinkti aplankÄ…>"
 
-#: ../mail/em-folder-selector.c:432
+#: ../mail/em-folder-selector.c:436
 msgid "C_reate"
 msgstr "Suku_rti"
 
-#: ../mail/em-folder-selector.c:438
+#: ../mail/em-folder-selector.c:442
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
@@ -9561,188 +9590,190 @@ msgstr "Aplanko _vardas:"
 msgid "Folder names cannot contain '/'"
 msgstr "Aplanko varde negali būti simbolio „/“"
 
-#: ../mail/em-folder-tree.c:767
+#: ../mail/em-folder-tree.c:768
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1589
+#: ../mail/em-folder-tree.c:1590
 msgid "Mail Folder Tree"
 msgstr "Pašto aplankų medis"
 
-#: ../mail/em-folder-tree.c:2068
-#: ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2067
+#: ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Perkeliamas aplankas %s"
 
-#: ../mail/em-folder-tree.c:2071
-#: ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2070
+#: ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopijuojamas aplankas %s"
 
-#: ../mail/em-folder-tree.c:2078
-#: ../mail/message-list.c:2211
+#: ../mail/em-folder-tree.c:2077
+#: ../mail/message-list.c:2303
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į aplanką %s"
 
-#: ../mail/em-folder-tree.c:2082
-#: ../mail/message-list.c:2213
+#: ../mail/em-folder-tree.c:2081
+#: ../mail/message-list.c:2305
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į aplanką %s"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2100
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nepavyko perkelti žinutės(�ių) į aukš�iausią aukštą"
 
-#: ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:157
-#: ../mail/em-folder-tree-model.c:163
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:172
-#: ../mail/em-folder-tree-model.c:174
-#: ../mail/mail-vfolder.c:1123
-#: ../mail/mail-vfolder.c:1237
+#: ../mail/em-folder-tree-model.c:168
+#: ../mail/mail-vfolder.c:1125
+#: ../mail/mail-vfolder.c:1239
+#: ../widgets/misc/e-account-tree-view.c:100
+#: ../widgets/misc/e-account-tree-view.c:301
+#: ../widgets/misc/e-account-tree-view.c:924
+#: ../widgets/misc/e-account-tree-view.c:983
+#: ../widgets/misc/e-account-tree-view.c:1055
+#: ../widgets/misc/e-account-tree-view.c:1132
+#: ../widgets/misc/e-account-tree-view.c:1387
 msgid "Search Folders"
 msgstr "Paieškos aplankai"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:179
-#: ../mail/em-folder-tree-model.c:181
+#: ../mail/em-folder-tree-model.c:207
+#: ../mail/em-folder-tree-model.c:209
 msgid "UNMATCHED"
 msgstr "NEATITIKO"
 
-#: ../mail/em-folder-tree-model.c:790
-#: ../mail/em-folder-tree-model.c:1075
+#: ../mail/em-folder-tree-model.c:986
+#: ../mail/em-folder-tree-model.c:1278
 msgid "Loading..."
 msgstr "Įkeliama..."
 
-#: ../mail/em-folder-utils.c:487
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Perkelti aplanką į"
 
-#: ../mail/em-folder-utils.c:487
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopijuoti aplanką į"
 
-#: ../mail/em-folder-utils.c:589
+#: ../mail/em-folder-utils.c:605
 msgid "Create Folder"
 msgstr "Sukurti aplankÄ…"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:606
 msgid "Specify where to create the folder:"
 msgstr "Nurodykite, kur sukurti aplankÄ…:"
 
-#: ../mail/em-format-html.c:166
+#: ../mail/em-format-html.c:167
 msgid "Formatting message"
 msgstr "Formuojamas laiškas"
 
-#: ../mail/em-format-html.c:378
+#: ../mail/em-format-html.c:379
 msgid "Formatting Message..."
 msgstr "Formuojamas laiškas..."
 
-#: ../mail/em-format-html.c:1551
-#: ../mail/em-format-html.c:1561
+#: ../mail/em-format-html.c:1596
+#: ../mail/em-format-html.c:1606
 #, c-format
 msgid "Retrieving '%s'"
 msgstr "Gaunama „%s“"
 
-#: ../mail/em-format-html.c:1707
+#: ../mail/em-format-html.c:1757
 #: ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Nepasirašytas"
 
-#: ../mail/em-format-html.c:1708
+#: ../mail/em-format-html.c:1758
 #: ../mail/em-format-html-display.c:90
 msgid "Valid signature"
 msgstr "Tvarkingas parašas"
 
-#: ../mail/em-format-html.c:1709
+#: ../mail/em-format-html.c:1759
 #: ../mail/em-format-html-display.c:91
 msgid "Invalid signature"
 msgstr "Blogas parašas"
 
-#: ../mail/em-format-html.c:1710
+#: ../mail/em-format-html.c:1760
 #: ../mail/em-format-html-display.c:92
 msgid "Valid signature, but cannot verify sender"
 msgstr "Parašas tvarkingas, bet negalima patikrinti siuntėjo"
 
-#: ../mail/em-format-html.c:1711
+#: ../mail/em-format-html.c:1761
 #: ../mail/em-format-html-display.c:93
 msgid "Signature exists, but need public key"
 msgstr "Parašas yra, bet trūksta viešojo rakto"
 
-#: ../mail/em-format-html.c:1717
+#: ../mail/em-format-html.c:1767
 #: ../mail/em-format-html-display.c:100
 msgid "Unencrypted"
 msgstr "Neužšifruotas"
 
-#: ../mail/em-format-html.c:1718
+#: ../mail/em-format-html.c:1768
 #: ../mail/em-format-html-display.c:101
 msgid "Encrypted, weak"
 msgstr "Silpnai Å¡ifruotas"
 
-#: ../mail/em-format-html.c:1719
+#: ../mail/em-format-html.c:1769
 #: ../mail/em-format-html-display.c:102
 msgid "Encrypted"
 msgstr "Užšifruotas"
 
-#: ../mail/em-format-html.c:1720
+#: ../mail/em-format-html.c:1770
 #: ../mail/em-format-html-display.c:103
 msgid "Encrypted, strong"
 msgstr "Stipriai užšifruotas"
 
-#: ../mail/em-format-html.c:2120
+#: ../mail/em-format-html.c:2170
 msgid "Unknown external-body part."
 msgstr "Nežinoma išorinio karkaso dalis."
 
-#: ../mail/em-format-html.c:2130
+#: ../mail/em-format-html.c:2180
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota išorinio karkaso dalis."
 
-#: ../mail/em-format-html.c:2161
+#: ../mail/em-format-html.c:2211
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Rodyklė į FTP svetainę (%s)"
 
-#: ../mail/em-format-html.c:2172
+#: ../mail/em-format-html.c:2222
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Rodyklė į vietinį failą (%s), galiojanti svetainėje „%s“"
 
-#: ../mail/em-format-html.c:2174
+#: ../mail/em-format-html.c:2224
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Rodyklė į vietinį failą (%s)"
 
-#: ../mail/em-format-html.c:2195
+#: ../mail/em-format-html.c:2245
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Rodyklė į nutolusius duomenis (%s)"
 
-#: ../mail/em-format-html.c:2210
+#: ../mail/em-format-html.c:2260
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:2915
-#: ../plugins/mail-notification/mail-notification.c:402
+#: ../mail/em-format-html.c:2968
+#: ../plugins/mail-notification/mail-notification.c:403
 #, c-format
 msgid "From: %s"
 msgstr "Nuo: %s"
 
-#: ../mail/em-format-html.c:2937
+#: ../mail/em-format-html.c:2990
 msgid "(no subject)"
 msgstr "(NÄ—ra temos)"
 
-#: ../mail/em-format-html.c:3013
+#: ../mail/em-format-html.c:3066
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Šį laišką %2$s vardu išsiuntė %1$s"
@@ -9792,44 +9823,44 @@ msgstr "_Peržiūrėti liudijimą"
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio liudijimo"
 
-#: ../mail/em-format-html-display.c:556
+#: ../mail/em-format-html-display.c:568
 msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
 msgstr "Evolution negali parodyti šio laiško, kadangi jis per ilgas. Galite jį skaityti neformatuotą arba su išorine teksto rengykle."
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:758
 msgid "Save Image"
 msgstr "Įrašyti paveikslėlį"
 
-#: ../mail/em-format-html-display.c:794
+#: ../mail/em-format-html-display.c:806
 msgid "Save _Image..."
 msgstr "Įrašyti _paveikslėlį..."
 
-#: ../mail/em-format-html-display.c:796
+#: ../mail/em-format-html-display.c:808
 msgid "Save the image to a file"
 msgstr "Įrašyti paveikslėlį į failą"
 
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:1036
 msgid "Completed on"
 msgstr "Užbaigta"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:1048
 msgid "Overdue:"
 msgstr "PavÄ—luotos:"
 
-#: ../mail/em-format-html-display.c:1044
+#: ../mail/em-format-html-display.c:1056
 msgid "by"
 msgstr " "
 
-#: ../mail/em-format-html-display.c:1320
-#: ../mail/em-format-html-display.c:1367
+#: ../mail/em-format-html-display.c:1337
+#: ../mail/em-format-html-display.c:1388
 msgid "View _Unformatted"
 msgstr "Rodyti _neformatuotÄ…"
 
-#: ../mail/em-format-html-display.c:1322
+#: ../mail/em-format-html-display.c:1339
 msgid "Hide _Unformatted"
 msgstr "SlÄ—pti n_eformatuotÄ…"
 
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1410
 msgid "O_pen With"
 msgstr "Atverti _su"
 
@@ -9845,61 +9876,61 @@ msgstr "Puslapis %d iš %d"
 msgid "No HTML stream available"
 msgstr "NÄ—ra prieinamo HTML srauto"
 
-#: ../mail/em-subscription-editor.c:1161
+#: ../mail/em-subscription-editor.c:1165
 msgid "Folder Subscriptions"
 msgstr "Aplankų užsisakymai"
 
-#: ../mail/em-subscription-editor.c:1200
+#: ../mail/em-subscription-editor.c:1204
 msgid "_Account:"
 msgstr "_Paskyra:"
 
-#: ../mail/em-subscription-editor.c:1215
+#: ../mail/em-subscription-editor.c:1219
 msgid "Clear Search"
 msgstr "Išvalyti paiešką"
 
-#: ../mail/em-subscription-editor.c:1233
+#: ../mail/em-subscription-editor.c:1237
 msgid "Sho_w items that contain:"
 msgstr "Ro_dyti elementus, kuriuose yra:"
 
-#: ../mail/em-subscription-editor.c:1272
+#: ../mail/em-subscription-editor.c:1276
 msgid "Subscribe to the selected folder"
 msgstr "Užsisakyti pasirinktą aplanką"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1277
 msgid "Su_bscribe"
 msgstr "_Užsisakyti"
 
-#: ../mail/em-subscription-editor.c:1284
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1288
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
 msgid "Unsubscribe from the selected folder"
 msgstr "Atsisakyti pasirinkto aplanko"
 
-#: ../mail/em-subscription-editor.c:1285
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../mail/em-subscription-editor.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
-#: ../mail/em-subscription-editor.c:1296
+#: ../mail/em-subscription-editor.c:1300
 msgid "Collapse all folders"
 msgstr "Sutraukti visus aplankus"
 
-#: ../mail/em-subscription-editor.c:1297
+#: ../mail/em-subscription-editor.c:1301
 msgid "C_ollapse All"
 msgstr "Sutraukti _visus"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1311
 msgid "Expand all folders"
 msgstr "IÅ¡plÄ—sti visus aplankus"
 
-#: ../mail/em-subscription-editor.c:1308
+#: ../mail/em-subscription-editor.c:1312
 msgid "E_xpand All"
 msgstr "IÅ¡_plÄ—sti visus"
 
-#: ../mail/em-subscription-editor.c:1318
+#: ../mail/em-subscription-editor.c:1322
 msgid "Refresh the folder list"
 msgstr "Atnaujinti aplankų sąrašą"
 
-#: ../mail/em-subscription-editor.c:1330
+#: ../mail/em-subscription-editor.c:1334
 msgid "Stop the current operation"
 msgstr "Sustabdyti dabartinÄ™ operacijÄ…"
 
@@ -9907,7 +9938,7 @@ msgstr "Sustabdyti dabartinÄ™ operacijÄ…"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:102
+#: ../mail/em-utils.c:104
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -9915,16 +9946,16 @@ msgstr[0] "Ar tikrai norite tuo pa�iu metu atverti %d laišką?"
 msgstr[1] "Ar tikrai norite tuo pa�iu metu atverti %d laiškus?"
 msgstr[2] "Ar tikrai norite tuo pa�iu metu atverti %d laiškų?"
 
-#: ../mail/em-utils.c:158
+#: ../mail/em-utils.c:160
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Daugiau neberodyti šios žinutės"
 
-#: ../mail/em-utils.c:331
+#: ../mail/em-utils.c:335
 msgid "Message Filters"
 msgstr "Laiškų filtrai"
 
-#: ../mail/em-utils.c:916
+#: ../mail/em-utils.c:920
 #, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
@@ -9933,7 +9964,7 @@ msgstr "Laiškai nuo %s"
 msgid "Search _Folders"
 msgstr "Paieškos _aplankai"
 
-#: ../mail/em-vfolder-rule.c:608
+#: ../mail/em-vfolder-rule.c:594
 msgid "Add Folder"
 msgstr "PridÄ—ti aplankÄ…"
 
@@ -10039,659 +10070,659 @@ msgid "Composer Window default width"
 msgstr "Rašymo lango numatytasis plotis"
 
 #: ../mail/evolution-mail.schemas.in.h:26
-msgid "Composer load/attach directory"
-msgstr "Rašymo lango priedų aplankas"
-
-#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Suglaudinti adresų rodymą laukeliuose Kam/kopija/slapta kopija"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
 msgstr "Suglaudinti adresų rodymą  laukeliuose Kam/kopija/slapta kopija iki skai�iaus, nurodyto address_count rakte."
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
 msgstr "Nurodo kaip dažnai vietiniai pakeitimai sinchronizuojami su nutolusiu pašto serveriu. Intervalas turi būti bent 30 sekundžių."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Custom headers to use while checking for junk."
 msgstr "Ieškant brukalo naudojamos pasirinktines antraštės."
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
 msgstr "Ieškant brukalo naudojamos pasirinktines antraštės. Sąrašo elementai yra tokio formato eilutė: „antraštėsvardas=reikšmė“."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default charset in which to compose messages"
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages."
 msgstr "Koduotė, kuri yra naudojama kuriant laiškus."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default charset in which to display messages"
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default charset in which to display messages."
 msgstr "Koduotė, kuri yra naudojama skaitant laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default forward style"
 msgstr "Numatytasis persiuntimo stilius"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default height of the Composer Window."
 msgstr "Numatytasis rašymo lango aukštis."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default height of the mail browser window."
 msgstr "Numatytasis laiškų naršyklės lango aukštis."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default maximized state of the mail browser window."
 msgstr "Numatytoji laiškų naršyklės lango išdidinimo būsena."
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default reply style"
 msgstr "Numatytasis atsakymų stilius"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Default value for thread expand state"
 msgstr "Numatytoji gijų išplėtimo reikšmė"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Default width of the Composer Window."
 msgstr "Numatytasis rašymo lango plotis."
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid "Default width of the mail browser window."
 msgstr "Numatytasis laiškų naršyklės lango plotis."
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Describes whether message headers in paned view should be collapsed or expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr "Nusako, ar laiškų antraštės polangių veisenoje turėtų būti numatytai išplėstos. „0“ = išplėstos „1“ = sutrauktos"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid "Determines whether to look up addresses for junk filtering in local address book only"
 msgstr "Nurodo, ar ieškoti adresų brukalo filtravimui tik vietinėje adresų knygoje"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Nurodo, ar ieškoti adresų knygoje siuntėjo el. pašto adreso"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
 msgstr "Nurodo, ar ieškoti siuntėjo el. pašto adreso adresų knygoje. Jei toks randamas, laiškas neturėtų būti šiukšlė. Ieškoma adresų knygose, pažymėtose automatiniam užbaigimui. Jei naudojamos nutolusios užrašų knygutės, pvz., LDAP, paieška gali užtrukti."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Nurodo, ar naudoti pasirinktines antraštes brukalo atfiltravimui"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
 msgstr "Nustato, ar naudoti pasirinktines antraštes brukalo filtravimui. Jei ši parinktis įjungta ir nurodytos antraštės, brukalo filtravimas pagreitės."
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
 msgstr "Nurodo, ar naudoti tą patį šriftą ir „Nuo“ ir „Tema“ laukams „Laiškų“ stulpelyje vertikaliame rodinyje."
 
-#: ../mail/evolution-mail.schemas.in.h:51
-msgid "Directory for loading/attaching files to composer."
-msgstr "Failų įkėlimo / prisegimo laiško rašymo lange aplankas."
-
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Directory for saving mail component files."
 msgstr "Laiško komponentų failų saugojimo aplankas."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Išjungti ar įjungti aplankų vardų elipsavimą šoninėje juostoje"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Display only message texts not exceeding certain size"
 msgstr "Rodyti tik tų laiškų tekstą, kuris neviršija tam tikro dydžio"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Do not add signature delimiter"
 msgstr "Nepridėti parašų skyriklio"
 
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Draw spelling error indicators on words as you type."
 msgstr "Rodyti rašymo klaidas laiško kūrimo metu."
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid "Empty Junk folders on exit"
 msgstr "Išeinant ištuštinti brukalo aplankus"
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Empty Trash folders on exit"
 msgstr "Išeinant ištuštinti šiukšlių aplankus"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Išvalyti visus brukalo aplankus išeinant iš Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:58
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Išvalyti visus šiukšlių aplankus išeinant iš Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
 msgstr "Įjungti animuotus paveikslėlius HTML laiškuose. Daugelį naudotojų animuoti paveikslėliai erzina ir jie pageidauja ver�iau matyti statinius paveikslėlius."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Įjungti žymeklio veikseną, kad skaitant laišką būtų galima matyti žymeklį."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:61
+msgid "Enable local folders"
+msgstr "Įjungti vietinius aplankus"
+
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable or disable magic space bar"
 msgstr "Įjungti arba išjungti stebuklingąjį tarpo klavišą"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Išjungia/įjungia paklausimą žymint keletą laiškų vienu metu."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable or disable type ahead search feature"
 msgstr "Įjungti arba išjungti rinkimo priekyje paieškos funkciją"
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable search folders"
 msgstr "Įjungti paieškos aplankus"
 
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders on startup."
 msgstr "Įjungti paieškos aplankus paleidus programą."
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Enable the side bar search feature to allow interactive searching of folder names."
 msgstr "Įjungti šoninės juostos paieškos funkciją įgalinant interaktyviai ieškoti aplankų vardų."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
 msgstr "Įjunkite, jei norite naudoti tarpo klavišą slinkimui žinu�ių peržiūroje, sąraše ir aplankuose."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key."
 msgstr "Įjunkite norėdami, kad būtų rodomi tik laiškai, kurių tekstas neviršija dydžio, nustatyto rakte „message_text_part_limit“."
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "Įjunkite norėdami naudoti panašius laiškų sąrašo rodymo parametrus visiems aplankams"
 
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "Įjunkite norėdami naudoti panašius laiškų sąrašo rodymo parametrus visiems aplankams."
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Enable/disable caret mode"
 msgstr "Perjungia žymeklio veikseną"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:73
 #: ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Koduoti failų vardus Outlook / GMail būdu"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Encode file names in the mail headers same as Outlook or GMail do, to let them display correctly file names with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard."
 msgstr "Šifruoti failų vardus el. laiškų antraštėse tokiu būdu, kaip tai daro Outlook ar GMail, idant šios sistemos galėtų teisingai atvaizduoti failų vardus, kuriuose yra Evolution programos pateikiamų UTF-8 simbolių, kadangi jos nesilaiko RFC 2231 standarto, o naudoja neteisingą RFC 2047."
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Flush Outbox after filtering"
 msgstr "Išvalyti paruoštų siųsti laiškų aplanką po filtravimo"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Forward message."
 msgstr "Persiųsti laišką."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Group Reply replies to list"
 msgstr "Pašto konferencijose rašomas grupinis atsakymas"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Height of the message-list pane"
 msgstr "Laiškų sąrašo skydelio aukštis"
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane."
 msgstr "Laiškų sąrašo skydelio aukštis."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Paslepia laiškų peržiūrą šiame aplanke ir atžymi visus laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:81
 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 "Jeigu naudotojas bando tuo pa�iu metu atverti 10 ar daugiau laiškų, paklausti jo ar jis tikrai nori tai padaryti."
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:82
 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 "Jei Evolution nėra įtaisytosios konkretaus MIME tipo žiūryklės, MIME tipui peržiūrėti gali būti naudojamas numatytasis bonobo komponentas, susietas su atitinkamu tipu GNOME MIME tipų duombazėje."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Ignore list Reply-To:"
 msgstr "Nepaisyti pašto konferencijų atgalinio adreso"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
 msgstr "Pradinis lango „Filtrų rengyklė“ aukštis. Naudotojui kei�iant lango aukštį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Initial height of the \"Folder Subscriptions\" window. The value updates as the user resizes the window vertically."
 msgstr "Pradinis lango „Aplankų užsisakymas“ aukštis. Naudotojui kei�iant lango aukštį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
 msgstr "Pradinis lango „Paieškos aplankų rengyklė“ aukštis. Naudotojui kei�iant lango aukštį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
 msgstr "Pradinis lango „Pašto siuntimas ir gavimas“ aukštis. Naudotojui kei�iant lango aukštį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "Pradinė lango „Filtrų rengyklė“ išdidinimo būsena. Reikšmė atnaujinama, kai naudotojas išdidina ar sumažina langą. Atminkite, kad ši konkreti reikšmė Evolution nenaudojama, kadangi lango „Filtrų rengyklė“ išdidinti negalima. Šis raktas yra tik kaip realizavimo detalė."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Initial maximize state of the \"Folder Subscriptions\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Folder Subscriptions\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "Pradinė „Aplankų užsisakymo“ lango išdidinimo būsena. Reikšmė atnaujinama, kai naudotojas išdidina ar sumažina langą. Atminkite, kad ši konkreti reikšmė Evolution nenaudojama, kadangi „Aplankų užsisakymo“ lango išdidinti negalima. Šis raktas yra tik kaip realizavimo detalė."
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "Pradinė lango „Paieškos aplankų rengyklė“ išdidinimo būsena. Reikšmė atnaujinama, kai naudotojas išdidina ar sumažina langą. Atminkite, kad šis konkreti reikšmė Evolution nenaudojama, kadangi lango „Paieškos aplankų rengyklė“ išdidinti negalima. Šis raktas yra tik kaip realizavimo detalė."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
 msgstr "Pradinė lango „Pašto siuntimas ir gavimas“ išdidinimo būsena. Reikšmė atnaujinama, kai naudotojas išdidina ar sumažina langą. Atminkite, kad šis konkreti reikšmė Evolution nenaudojama, kadangi lango „Pašto siuntimas ir gavimas“ išdidinti negalima. Šis raktas yra tik kaip realizavimo detalė."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
 msgstr "Pradinis lango „Filtrų rengyklės“ plotis. Naudotojui kei�iant lango plotį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Initial width of the \"Folder Subscriptions\" window. The value updates as the user resizes the window horizontally."
 msgstr "Pradinis „Aplankų užsisakymo“ lango plotis. Naudotojui kei�iant lango plotį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
 msgstr "Pradinis lango „Paieškos aplankų rengyklė“ plotis. Naudotojui kei�iant lango plotį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
 msgstr "Pradinis lango „Pašto siuntimas ir gavimas“ plotis. Naudotojui kei�iant lango plotį, šios reikšmės atnaujinamos."
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Instead of the normal \"Reply to All\" behaviour, this option will make the 'Group Reply' toolbar button try to reply only to the mailing list through which you happened to receive the copy of the message to which you're replying."
 msgstr "Užuot naudojant „Atsakyti visiems“ veikseną, pasirinkus šią parinktį, spustelėjus įrankių juostoje mygtuką „Grupinis atsakymas“, bandoma atsakyti laišku tik į pašto konferenciją, kurioje gavote laišką, kuriam dabar rašote atsakymą."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "It disables/enables the repeated prompts to warn that deleting messages from a search folder permanently deletes the message, not simply removing it from the search results."
 msgstr "Įjungia/išjungia kartotinius pranešimus, įspėjan�ius, kad žinutės ištrynimas iš paieškos aplanko visam laiko ištrina žinutę, o ne tik pašalina ją iš paieškos rezultatų."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "It disables/enables the repeated prompts to warn that you are sending a private reply to a message which arrived via a mailing list."
 msgstr "Įjungia/išjungia kartotinius pranešimus, įspėjan�ius, kad siun�iate asmeninį atsakymą į laišką, gautą pašto konferencijoje."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "It disables/enables the repeated prompts to warn that you are sending a reply to many people."
 msgstr "Įjungia/išjungia kartotinius pranešimus, įspėjan�ius, kad siun�iate atsakymą daugeliui žmonių."
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list"
 msgstr "Įjungiami/išjungiami pakartotiniai pranešimai, įspėjantys, kad bandote išsiųsti asmeninį atsakymą laiškui, gautam pašto konferencijoje, kai tuo tarpu konferencijoje yra nustatyta atgalinio adreso antraštė, nukreipianti jūsų atsakymą atgal į šią konferenciją"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses"
 msgstr "Įjungia/išjungia pakartotinius perspėjimus apie tai, jog siun�iate laišką gavėjams, kurie nurodyti ne el. pašto adresų forma"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Last time Empty Junk was run"
 msgstr "Kada paskutinį kartą buvo išvalytas brukalas"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Last time Empty Trash was run"
 msgstr "Kada paskutinį kartą buvo išvalyta šiukšlinė"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Layout style"
 msgstr "IÅ¡dÄ—stymo stilius"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:105
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Lygmuo, po kurio žinutė turėtų būti užregistruota žurnale."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "List of Labels and their associated colors"
 msgstr "Etike�ių ir su jomis susijusių spalvų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "MIME tipų, kuriems ieškoma Bonobo komponentų žiūryklių, sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of accepted licenses"
 msgstr "Priimtų licencijų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accounts"
 msgstr "Paskyrų sąrašas"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:110
 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 pašto komponentui žinomų paskyrų sąrašas. Šiame sąraše yra eilu�ių, nurodan�ių /apps/evolution/mail/accounts poaplankius."
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "List of custom headers and whether they are enabled."
 msgstr "Pasirinktinių antraš�ių sąrašas ir jų įjungimas / išjungimas."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Žodyno kalbų kodų, naudojamų rašybos tikrinimui, sąrašas."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:113
 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 pašto komponentui žinomų žymių sąrašas. Sąraše yra eilutės, kuriose yra name:color, kur spalvai naudojama HTML šešioliktainis kodas."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "List of protocol names whose license has been accepted."
 msgstr "Protokolų, kurių su kurių licencijomis buvo sutikta, sąrašas."
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Load images for HTML messages over HTTP"
 msgstr "Įkelti HTML laiškų paveikslėlius per HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - Never load images off the net. \"1\" - Load images in messages from contacts. \"2\" - Always load images off the net."
 msgstr "HTML laiškuose įkelti paveikslėlius per HTTP(S). Galimos reikšmės yra: 0 – niekada neįkelti paveikslėlių iš interneto; 1 – įkelti tik jei siuntėjas yra adresų knygoje; 2 – visada įkelti paveikslėlius iš interneto."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions to the specified log file."
 msgstr "Registruoti filtrų veiksmus į nurodytą žurnalo failą."
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Logfile to log filter actions"
 msgstr "Failas, kuriame registruojami filtrų veiksmai"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Logfile to log filter actions."
 msgstr "Failas, kuriame registruojami filtrų veiksmai."
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Mail browser height"
 msgstr "Laiškų naršyklės aukštis"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Mail browser maximized"
 msgstr "Laiškų naršyklė išdidinta"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Mail browser width"
 msgstr "Laiškų naršyklės plotis"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Mark as Seen after specified timeout"
 msgstr "Pažymėti perskaitytu po nurodyto laiko tarpo"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout."
 msgstr "Pažymėti perskaitytu po nurodyto laiko tarpo."
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark citations in the message \"Preview\""
 msgstr "Laiško „Peržiūroje“ pažymėti citatas"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Laiško „Peržiūroje“ pažymėti citatas."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Message text limit for display"
 msgstr "Rodytinų laiškų teksto dydžio riba"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Laiško rodymo stilius („normal“, „full headers“, „source“)"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Mažiausias dienų skai�ius tarp brukalo išvalymų uždarant programą"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Mažiausias dienų skai�ius tarp šiukšlinės išvalymų uždarant programą"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Mažiausias laikotarpis tarp brukalo išvalymų uždarant programą, dienomis."
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Mažiausias laikotarpis tarp šiukšlinės išvalymų uždarant programą, dienomis."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Adresų skai�ius rodomas Kam/kopija/slapta kopija laukelyje"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Original message."
 msgstr "Originalus laiškas."
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Path where picture gallery should search for its content"
 msgstr "Kelias iki vietos, kurioje yra paveikslėlių galerija"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Possible values are: never - to never close browser window always - to always close browser window ask - (or any other value) will ask user"
 msgstr "Galimos reikšmės: „never“ – niekada neužverti naršyklės lango; „always“ – visada užverti; „ask“ (ar bet kokia kita reikšmė) – klausti naudotojo"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Atsiklausti siun�iant laiškus gavėjams, kurie nenurodyti el. pašto adresų forma"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Užklausti, kai tema nenurodyta"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Užklausti patvirtinimo, kai bandoma išvalyti aplanką."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Prompt when deleting messages in search folder"
 msgstr "Paklausti patvirtinimo trinant paieškos aplanke esan�ius laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Įspėti, kai pašto konferencija siekia perimti asmeninius atsakymus"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Prompt when replying privately to list messages"
 msgstr "Įspėti, kai rašomas asmeninis atsakymas į pašto konferencijos laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Prompt when replying to many recipients"
 msgstr "Įspėti, kuomet atsakinėjama daugeliui gavėjų"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Prompt when user expunges"
 msgstr "Įspėti naudotoją išvalymo metu"
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Paklausti patvirtinimo, kai užpildomi tik slaptos kopijos gavėjų laukai"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Paklausti patvirtinimo, kai bandoma išsiųsti 10 ar daugiau laiškų vienu metu"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
 msgstr "Paklausti, kai siun�iamas HTML laiškas adresatams, kurie gali nenorėti gauti HTML formato laiškų."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Paklausti prieš siun�iant laiškus, kuriuose yra tik slaptos kopijos gavėjai."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Paklausti patvirtinimo, kai bandoma siųsti HTML laišką to nenorintiems adresatams"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt while marking multiple messages"
 msgstr "Įspėti naudotoją pažymint keletą laiškų"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Put personalized signatures at the top of replies"
 msgstr "Rašyti suasmeninus parašus atsakymų viršuje"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put the cursor at the bottom of replies"
 msgstr "Padėti žymiklį atsakymų apa�ioje"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Atpažinti šypsniukus tekste ir juos pakeisti paveikslėliais."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize links in text and replace them."
 msgstr "Atpažinti nuorodas tekste ir jas pakeisti."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Run junk test on incoming mail."
 msgstr "Vykdyti brukalo testą gaunamiems laiškams."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Save directory"
 msgstr "Įrašymo aplankas"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Search for the sender photo in local address books"
 msgstr "Ieškoti siuntėjo nuotraukos vietinėse adresų knygose"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Send HTML mail by default"
 msgstr "Jei nenurodoma kitaip, siųsti laiškus HTML formatu"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default."
 msgstr "Jei nenurodoma kitaip, siųsti laiškus HTML formatu."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Sender email-address column in the message list"
 msgstr "Aiuntėjo el. pašto stulpelis laiškų sąraše"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Server synchronization interval"
 msgstr "Serverio sinchronizacijos intervalas"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
 msgstr "Nustykite TEIGIAMĄ, jei nenorite rašydami laišką prieš savo parašą pridėti parašo atskyriklio."
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Rodyti „Slapta kopiją“ lauką siun�iant el. laišką"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Rodyti „Kopija“ lauką siun�iant el. laišką"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Rodyti „Nuo“ lauką siun�iant pranešimą į naujienų grupę"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Rodyti „Atgalinis adresas“ lauką siun�iant pranešimą į naujienų grupę"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Rodyti „Atgalinis adresas“ lauką siun�iant el. laišką"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show Animations"
 msgstr "Rodyti animacijas"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show all message headers"
 msgstr "Rodyti visas laiško antraštes"
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all the headers when viewing a messages."
 msgstr "Peržiūrint laišką rodyti visas antraštes."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show animated images as animations."
 msgstr "Rodyti animuotus paveikslÄ—lius kaip animacijas"
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Laiškų sąraše rodyti ištrintus laiškus (juos perbraukiant)."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Show deleted messages in the message-list"
 msgstr "Laiškų sąraše rodyti ištrintus laiškus"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show image animations"
 msgstr "Rodyti paveikslėlių animacijas"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Rodyti pradinę antraštės „Data“ reikšmę."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show photo of the sender"
 msgstr "Rodyti siuntÄ—jo nuotraukÄ…"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "Rodyti „Slapta kopija“ lauką siun�iant el. laišką. Tai nurodoma meniu Rodymas, kuomet pasirenkama el. pašto paskyra."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "Rodyti lauką „Slapta kopija“ siun�iant el. laišką. Tai nurodoma meniu „Rodymas“, kuomet pasirenkama el. pašto paskyra."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr "Rodyti „Nuo“ lauką siun�iant pranešimą į naujienų grupę. Tai nurodoma meniu Rodymas, kuomet pasirenkama el. pašto paskyra."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid "Show the \"Reply To\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
 msgstr "Rodyti „Reply To“ lauką siun�iant pranešimą į naujienų grupę. Tai nurodoma meniu Rodymas, kuomet pasirenkama el. pašto paskyra."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "Show the \"Reply To\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
 msgstr "Rodyti „Reply To“ lauką siun�iant el. laišką. Tai nurodoma meniu Rodymas, kuomet pasirenkama el. pašto paskyra."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "Show the email-address of the sender in a separate column in the message list."
 msgstr "Rodyti siuntėjo el. paštą atskirame stulpelyje laiškų sąraše."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
 msgstr "Rodyti pradinę antraštę „Data“ (rodant vietinį laiką tik jei skiriasi laiko juosta). Kitu atveju, visada rodyti antraštės „Data“ reikšmę naudotojo pageidaujamu formatu ir vietinę laiko juostą."
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Rodyti siuntėjo nuotrauką laiško skaitymo dalyje."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Some mailing lists set a Reply-To: header to trick users into sending replies to the list, even when they ask Evolution to make a private reply. Setting this option to TRUE will attempt to ignore such Reply-To: headers, so that Evolution will do as you ask it. If you use the private reply action, it will reply privately, while if you use the 'Reply to List' action it will do that. It works by comparing the Reply-To: header with a List-Post: header, if there is one."
 msgstr "Kai kurios konferencijos nustato atgalinio adreso antraštę, viliodamos naudotojus siųsti atsakymus į konferenciją, netgi tada, kai jie pageidauja, jog programa Evolution siųstų asmeniškai adresuotą atsakymą. Nusta�ius teigiamą reikšmę, programa bandys nepaisyti tokių atgalinio adreso antraš�ių, idant laiškai būtų siun�iami taip, kaip jūs pageidaujate. Jeigu atsakinėjate asmeniškai, bus rašomas asmeniškai adresuotas laiškas, o jei spustelėsite „Atsakyti į konferenciją“, bus atsakoma į konferenciją. Tai atliekama palyginant atgalinio adreso (Reply-To) antraštę su konferencijos (List-Post) antrašte, jei tokia yra."
 
+#: ../mail/evolution-mail.schemas.in.h:188
+msgid "Sort accounts alphabetically in a folder tree"
+msgstr "Aplanko medyje paskyras rikiuoti abÄ—cÄ—lÄ—s tvarka"
+
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
 msgstr "Rašybą tikrinti rašymo metu"
@@ -10709,217 +10740,225 @@ msgid "State of message headers in paned view"
 msgstr "Laiškų antraš�ių būsena polangių veiksenoje"
 
 #: ../mail/evolution-mail.schemas.in.h:193
+msgid "Tells how to sort accounts in a folder tree used in a Mail view. When set to true accounts are sorted alphabetically, with an exception of On This Computer and Search folders, otherwise accounts are sorted based on an order given by a user."
+msgstr "Parodo, kaip rikiuoti paskyras aplanko medyje naudojamame pašto rodinyje. Kai nustatyta teigiama, paskyros rikiuojamos abėcėlės tvarka, išskyrus šio kompiuterio ir paieškos aplankus, kitais atvejais paskyros rikiuojamos remiantis tvarka, kurią paskyrė naudotojas."
+
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Terminal font"
 msgstr "Terminalo Å¡riftas"
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "The default plugin for Junk hook"
 msgstr "Numatytasis brukalo tikrinimo įskiepis"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Kada paskutinį kartą buvo išvalytas brukalas, dienomis nuo 1970 m. sausio 1 d. (epochos)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Kada paskutinį kartą buvo išvalyta šiukšlinė, dienomis nuo 1970 m. sausio 1 d. (epochos)."
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
 msgstr "Išdėstymo stilius nurodo peržiūros polangio padėtį laiškų sąrašo atžvilgiu. „0“ (klasikinis rodinys) – peržiūros polangis yra po laiškų sąrašu. „1“ (vertikalus rodinys) – peržiūros polangis yra šalia laiškų sąrašo."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "The terminal font for mail display."
 msgstr "Pašto rodymui naudojamas terminalo šriftas."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "The text that is inserted when forwarding a message, saying that the forwarded message follows."
 msgstr "Tekstas, įterpiamas persiun�iant laišką ir kuriuo pranešama, jog toliau pateikiamas persiųstas laiškas."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "The text that is inserted when replying to a message (top posting), saying that the original message follows."
 msgstr "Tekstas, įterpiamas atsakant į laišką (rašant atsakymą viršuje) ir kuriuo pranešama, jog toliau pateikiamas originalus laiškas."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "The text that is inserted when replying to a message, attributing the message to the original author."
 msgstr "Tekstas, įterpiamas atsakant į laišką ir kuriuo laiškas priskiriamas originaliam autoriui."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "The variable width font for mail display."
 msgstr "Pašto rodymui naudojamas kintamo plo�io šriftas."
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
 msgstr "Galimos trys reikšmės: 0 – klaidos; 1 – įspėjimai; 2 – derinimo pranešimai."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "This decides the max size of the message text that will be displayed under Evolution, specified in terms of KB. The default is 4096 (4MB). This value is used only when 'force_message_limit' key is activated."
 msgstr "Čia nurodomas didžiausias leistinas Evolution programos rodomas laiško teksto dydis, nurodytas kilobaitais. Numatytoji reikšmė yra 4096 (4 Mb). Ši reikšmė naudojama tik suaktyvinus raktą „force_message_limit“."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins."
 msgstr "Tai yra numatytasis brukalo įskiepis, ta�iau yra įjungti keli įskiepiai. Jei įskiepis, nurodytas numatytuoju, būtų išjungtas, kiti prieinami įskiepiai nebūtų automatiškai naudojami vietoj jo."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "This key is read only once and reset to \"false\" after read. This unselects the mail in the list and removes the preview for that folder."
 msgstr "Šis raktas perskaitomas tik kartą, tuomet jo reikšmė nustatoma į neigiamą. Taip atžymimi laiškai sąraše ir paslepiama to aplanko peržiūra."
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:208
 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 "Šiame rakte turėtų būti nurodytos XML struktūros, nurodan�ios pasirinktines antraštes ir ar jos turėtų būti rodomos. XML struktūros formatas yra &lt;antraštė enabled&gt; – nustatykite „enabled“, jei antraštė turi būti rodoma peržiūrint laišką."
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering."
 msgstr "Ši parinktis susijusi su raktu lookup_addressbook ir naudojama norint nustatyti, ar ieškoti adresų vietinėje adresų knygoje tik tam, kad laiškuose nuo žinomų siuntėjų nebūtų ieškoma brukalo."
 
-#: ../mail/evolution-mail.schemas.in.h:209
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ši parinktis pagreitintų laiškų atsiuntimą."
 
-#: ../mail/evolution-mail.schemas.in.h:210
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
 msgstr "Čia nurodomas adresų, rodomų numatytame laiškų sąrašo rodinyje, skai�ių, po kurio rodomas „...“."
 
-#: ../mail/evolution-mail.schemas.in.h:211
+#: ../mail/evolution-mail.schemas.in.h:212
 msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Requires a restart to apply."
 msgstr "Nurodo, ar gijos pagal numatytuosius nustatymus turėtų būti išplėstos, ar sutrauktos. Pakeitus reikės paleisti Evolution iš naujo."
 
-#: ../mail/evolution-mail.schemas.in.h:212
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "This setting specifies whether the threads should be sorted based on latest message in each thread, rather than by message's date. Evolution requires a restart."
 msgstr "Nurodo, ar gijos turėtų būti surikiuotos remiantis vėliausia žinute kiekvienoje gijoje, o ne pagal žinutės datą. Pakeitus reikės paleisti Evolution iš naujo."
 
-#: ../mail/evolution-mail.schemas.in.h:213
+#: ../mail/evolution-mail.schemas.in.h:214
 msgid "This value can be an empty string, which means it'll use the system Picture folder, usually set to ~/Pictures. This folder will be also used when the set path is not pointing to the existent folder."
 msgstr "Ši reikšmė gali būti tuš�ia, kas reikštų, jog bus naudojamas sistemos paveikslėlių aplankas (paprastai ~/Paveikslėliai). Šis aplankas taip pat naudojamas, kai nustatytasis kelias rodo į nesantį aplanką."
 
-#: ../mail/evolution-mail.schemas.in.h:214
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Thread the message-list based on Subject"
 msgstr "Kurti laiškų sąrašo gijas remiantis laiškų temomis"
 
-#: ../mail/evolution-mail.schemas.in.h:215
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen"
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus"
 
-#: ../mail/evolution-mail.schemas.in.h:216
+#: ../mail/evolution-mail.schemas.in.h:217
 msgid "Timeout for marking message as seen."
 msgstr "Laiko tarpas, skirtas pažymėti laiškus kaip perskaitytus."
 
-#: ../mail/evolution-mail.schemas.in.h:217
+#: ../mail/evolution-mail.schemas.in.h:218
 msgid "UID string of the default account."
 msgstr "Numatytosios paskyros UID simbolių seka."
 
-#: ../mail/evolution-mail.schemas.in.h:218
+#: ../mail/evolution-mail.schemas.in.h:219
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Klaidingai parašytų žodžių pabraukimo spalva, naudojant įterptinį rašybos tikrinimą."
 
-#: ../mail/evolution-mail.schemas.in.h:219
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts"
 msgstr "Naudoti savo Å¡riftus"
 
-#: ../mail/evolution-mail.schemas.in.h:220
+#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts for displaying mail."
 msgstr "Laiško rodymui naudoti pasirinktinius šriftus."
 
-#: ../mail/evolution-mail.schemas.in.h:221
+#: ../mail/evolution-mail.schemas.in.h:222
 msgid "Users get all up in arms over where the cursor should go when replying to a message. This determines whether the cursor is placed at the top of the message or the bottom."
 msgstr "Naudotojai nuolat nesutaria, kur turėtų būti padedamas žymiklis atsakant į laišką. Ši parinktis nurodo, ar žymiklis yra laiško viršuje, ar apa�ioje."
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Users get all up in arms over where their signature should go when replying to a message. This determines whether the signature is placed at the top of the message or the bottom."
 msgstr "Naudotojai nuolat nesutaria, kur turėtų būti užrašomas jų parašas atsakant į laišką. Ši parinktis nurodo, ar parašas yra laiško viršuje, ar apa�ioje."
 
-#: ../mail/evolution-mail.schemas.in.h:223
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Variable width font"
 msgstr "Kintamo plo�io šriftas"
 
-#: ../mail/evolution-mail.schemas.in.h:224
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ar automatiškai prie kiekvieno laiško pridėti perskaitymo patvirtinimo prašymą."
 
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid "Whether check for new messages in all active accounts regardless of the account \"Check for new messages every X minutes\" option when Evolution is started. This option is used only together with 'send_recv_on_start' option."
 msgstr "Ar paleidus Evolution ieškoti naujų laiškų visose suaktyvintose paskyrose, nepaisant paskyrų parinkties „Ieškoti naujų laiškų kas X minutes“. Ši parinktis naudojama tik kartu su parinktimi „send_recv_on_start“."
 
-#: ../mail/evolution-mail.schemas.in.h:226
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether check for new messages when Evolution is started. This includes also sending messages from Outbox."
 msgstr "Ar ieškoti naujų laiškų paleidus Evolution. Tuo pa�iu išsiun�iami laiškai, laukiantys siun�iamųjų laiškų aplanke."
 
-#: ../mail/evolution-mail.schemas.in.h:227
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Ar išjungti aplankų vardų elipsavimo šoninėje juostoje funkciją."
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
 msgstr "Ar naudoti gijų rūšiavimą pagal antraštes, jei laiškai neturi In-Reply-To arba Reference antraš�ių."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:230
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ar rikiuoti gijas pagal kiekvienos gijos naujausią pranešimą."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation."
 msgstr "Ar išvalyti paruoštų siųsti laiškų aplanką po filtravimo. Paruoštų siųsti laiškų aplankas bus išvalytas tik po to, kai bus panaudotas filtras „Persiųsti“ ir nuo to bus praėjusi maždaug viena minutė."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:232
+msgid "Whether to show local folders (On This Computer) in a folder tree."
+msgstr "Ar rodyti vietinius aplankus (Šiame kompiuteryje) aplankų medyje."
+
+#: ../mail/evolution-mail.schemas.in.h:233
 msgid "Width of the message-list pane"
 msgstr "Laiškų sąrašo polangio plotis"
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:234
 msgid "Width of the message-list pane."
 msgstr "Laiškų sąrašo polangio plotis."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:181
 msgid "Importing Elm data"
 msgstr "Importuojami Elm duomenys"
 
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/pine-importer.c:453
+#: ../mail/importers/elm-importer.c:351
+#: ../mail/importers/pine-importer.c:458
 #: ../modules/mail/e-mail-shell-view.c:1051
-#: ../widgets/misc/e-send-options.c:511
+#: ../widgets/misc/e-send-options.c:520
 msgid "Mail"
 msgstr "Paštas"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:396
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm importavimo priemonÄ—"
 
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:397
 msgid "Import mail from Elm."
 msgstr "Importuoti paštą iš Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:135
-#: ../plugins/dbx-import/dbx-importer.c:249
+#: ../mail/importers/evolution-mbox-importer.c:138
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Paskirties aplankas:"
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:446
+#: ../mail/importers/evolution-mbox-importer.c:145
+#: ../plugins/dbx-import/dbx-importer.c:260
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "Select folder"
 msgstr "Pasirinkite aplankÄ…"
 
-#: ../mail/importers/evolution-mbox-importer.c:143
-#: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:447
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:261
+#: ../plugins/pst-import/pst-importer.c:463
 msgid "Select folder to import into"
 msgstr "Pasirinkite aplanką, į kurį importuosite"
 
-#: ../mail/importers/evolution-mbox-importer.c:417
+#: ../mail/importers/evolution-mbox-importer.c:433
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Tema"
 
-#: ../mail/importers/evolution-mbox-importer.c:422
+#: ../mail/importers/evolution-mbox-importer.c:438
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Nuo"
 
-#: ../mail/importers/evolution-mbox-importer.c:466
-#: ../shell/e-shell-utils.c:221
+#: ../mail/importers/evolution-mbox-importer.c:482
+#: ../shell/e-shell-utils.c:187
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berklio paštadėžė (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:467
+#: ../mail/importers/evolution-mbox-importer.c:483
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Importer Berkeley Mailbox formato aplankai"
 
@@ -10929,31 +10968,31 @@ msgstr "Importuojama pašto dėžutė"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:629
+#: ../plugins/dbx-import/dbx-importer.c:610
+#: ../plugins/pst-import/pst-importer.c:663
 #, c-format
 msgid "Importing '%s'"
 msgstr "Importuojama „%s“"
 
-#: ../mail/importers/mail-importer.c:315
+#: ../mail/importers/mail-importer.c:316
 #, c-format
 msgid "Scanning %s"
 msgstr "Skenuojama %s"
 
-#: ../mail/importers/pine-importer.c:257
+#: ../mail/importers/pine-importer.c:260
 msgid "Importing Pine data"
 msgstr "Importuojami Pine duomenys"
 
-#: ../mail/importers/pine-importer.c:458
-#: ../modules/addressbook/addressbook-config.c:1053
+#: ../mail/importers/pine-importer.c:463
+#: ../modules/addressbook/addressbook-config.c:1078
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: ../mail/importers/pine-importer.c:500
+#: ../mail/importers/pine-importer.c:509
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine importavimo priemonÄ—"
 
-#: ../mail/importers/pine-importer.c:501
+#: ../mail/importers/pine-importer.c:510
 msgid "Import mail from Pine."
 msgstr "Importuoti paštą iš Pine."
 
@@ -10962,23 +11001,23 @@ msgstr "Importuoti paštą iš Pine."
 msgid "Mail to %s"
 msgstr "Laiškai į %s"
 
-#: ../mail/mail-autofilter.c:238
-#: ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:228
+#: ../mail/mail-autofilter.c:271
 #, c-format
 msgid "Mail from %s"
 msgstr "Laiškai nuo %s"
 
-#: ../mail/mail-autofilter.c:264
+#: ../mail/mail-autofilter.c:254
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: ../mail/mail-autofilter.c:305
+#: ../mail/mail-autofilter.c:295
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: ../mail/mail-autofilter.c:414
+#: ../mail/mail-autofilter.c:404
 msgid "Add Filter Rule"
 msgstr "PridÄ—ti filtro taisyklÄ™"
 
@@ -10987,7 +11026,7 @@ msgstr "PridÄ—ti filtro taisyklÄ™"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../mail/mail-autofilter.c:517
+#: ../mail/mail-autofilter.c:507
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -11052,7 +11091,7 @@ msgid "Apply the same _view settings to all folders"
 msgstr "Taikyti tuos pa�ius _rodymo parametrus visiems aplankams"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1060
+#: ../modules/addressbook/addressbook-config.c:1085
 msgid "Authentication"
 msgstr "TapatybÄ—s nustatymas"
 
@@ -11118,7 +11157,7 @@ msgid "Confirmations"
 msgstr "Patvirtinimai"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:178
+#: ../modules/addressbook/autocompletion-config.c:188
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Date/Time Format"
 msgstr "Data / laiko formatas"
@@ -11348,145 +11387,149 @@ msgid "SHA512"
 msgstr "SHA512"
 
 #: ../mail/mail-config.ui.h:94
+msgid "SOC_KS Proxy:"
+msgstr "SOC_KS tarpinis serveris:"
+
+#: ../mail/mail-config.ui.h:95
 #: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL Å¡ifravimas"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL Å¡iame Evolution variante yra nepalaikomas"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "S_earch for sender photograph only in local address books"
 msgstr "I_eškoti siuntėjo nuotraukos tik vietinėse adresų knygose"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "S_elect..."
 msgstr "P_asirinkti..."
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "S_end message receipts:"
 msgstr "Siųsti laišk_o gavimo patvirtinimus:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "S_tandard Font:"
 msgstr "S_tandartinis Å¡riftas:"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "Secure MIME (S/MIME)"
 msgstr "Saugus MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font"
 msgstr "Pasirinkite HTML fiksuoto plo�io šriftą"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "Pasirinkite HTML kintamo plo�io šriftą"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "Sender Photograph"
 msgstr "SiuntÄ—jo nuotrauka"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Siun�iant asmeniškai adresuotus atsakymus į pašto _konferencijas"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Siun�iant laišką, kurio _gavėjai nenurodyti el. pašto adresų forma"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:111
 msgid "Sending a message with an _empty subject line"
 msgstr "Siun�iant laiškus, kurių _temos laukelis tuš�ias"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:113
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Siun�iant laiškus, kuriuose nurodyti tik slaptos _kopijos gavėjai"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:115
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Siun�iant atsakymą _dideliam skai�iui gavėjų"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:116
 msgid "Sent _Messages Folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:117
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja patvirtinti tapatybÄ™"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:118
 msgid "Server Configuration"
 msgstr "Serverio konfigūracija"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:119
 msgid "Server _Type:"
 msgstr "Serverio _tipas:"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:120
 msgid "Set custom junk header"
 msgstr "Nustatyti pasirinktinę šlamšto antraštę"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:121
 msgid "Si_gning algorithm:"
 msgstr "Pasirašymo al_goritmas:"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:122
 msgid "Sig_natures"
 msgstr "Pa_rašai"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:123
 msgid "Sig_ning certificate:"
 msgstr "Pasirašo_mas liudijimas:"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:124
 msgid "Signat_ure:"
 msgstr "Par_ašas:"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:125
 msgid "Signatures"
 msgstr "Parašai"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:126
 msgid "Signing _algorithm:"
 msgstr "Pasirašymo _algoritmas:"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:127
 msgid "Special Folders"
 msgstr "Specialieji aplankai"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:128
 msgid "Spell Checking"
 msgstr "Rašybos tikrinimas"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:129
 msgid "Start _typing at the bottom on replying"
 msgstr "Atsakant pradėti _spausdinti apa�ioje"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:130
 msgid "Start up"
 msgstr "Paleidimas"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:131
 #: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS Å¡ifravimas"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:132
 msgid "T_ype:"
 msgstr "T_ipas:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:133
 msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
 msgstr "Pateiktas kalbų sąrašas galioja tik toms kalboms, kurių žodynai yra įdiegti."
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:134
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11496,11 +11539,11 @@ msgstr ""
 "jūsų parašas. Nurodytas pavadinimas bus naudojamas tik\n"
 "dėl aiškumo."
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:137
 msgid "To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions:"
 msgstr "Siekiant padėti išvengti incidentų ir nesusipratimų, klausti patvirtinimo atliekant šiuos pažymėtus veiksmus:"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:138
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -11508,142 +11551,142 @@ msgstr ""
 "Pasirinkite pavadinimÄ…, kuriuo norÄ—tumÄ—te vadinti Å¡iÄ… paskyrÄ….\n"
 "Pavyzdžiui, „Darbas“ ar „Asmeniška“."
 
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:140
 msgid "Us_ername:"
 msgstr "Naudotojo _vardas:"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:141
 msgid "Use Authe_ntication"
 msgstr "Naudoti ta_patybÄ—s nustatymÄ…"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:142
 msgid "User _Name:"
 msgstr "Naudotojo _vardas:"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:143
 msgid "_Add Signature"
 msgstr "_Pridėti parašą"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:144
 msgid "_Always load images from the Internet"
 msgstr "Vis_ada įkelti paveikslėlius iš interneto"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:145
 msgid "_Authentication Type"
 msgstr "_TapatybÄ—s nustatymo tipas"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Tiesioginis ryšis su internetu"
 
-#: ../mail/mail-config.ui.h:146
+#: ../mail/mail-config.ui.h:147
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Nepasirašyti susitikimų užklausų (dėl suderinamumo su Outlook)"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:148
 msgid "_Forward style:"
 msgstr "Pe_rsiuntimo stilius:"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:149
 msgid "_Junk Folder:"
 msgstr "_Brukalo aplankas:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:150
 msgid "_Keep signature above the original message on replying"
 msgstr "Atsakant įterpti parašą _virš originalaus laiško"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:151
 msgid "_Languages"
 msgstr "_Kalbos"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:152
 msgid "_Load images only in messages from contacts"
 msgstr "Įkelti pa_veikslėlius tik kontaktų atsiųstuose laiškuose"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:153
 msgid "_Lookup in local address book only"
 msgstr "_Ieškoti tik vietinėse adresų knygose"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:154
 msgid "_Make this my default account"
 msgstr "_Padaryti Å¡iÄ… paskyrÄ… numatytÄ…ja"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:155
 msgid "_Manual proxy configuration:"
 msgstr "_Rankinis tarptinio serverio konfigūravimas:"
 
-#: ../mail/mail-config.ui.h:156
+#: ../mail/mail-config.ui.h:157
 msgid "_Never load images from the Internet"
 msgstr "_Niekada neįkelti paveikslėlių iš interneto"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:159
 #: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Prievadas:"
 
-#: ../mail/mail-config.ui.h:159
+#: ../mail/mail-config.ui.h:160
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Paklausti patvirtinimo siun�iant HTML laiškus jų nepageidaujantiems adresatams"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:161
 msgid "_Reply style:"
 msgstr "_Atsakymo stilius:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:162
 msgid "_Script:"
 msgstr "_Scenarijus:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:163
 msgid "_Secure HTTP Proxy:"
 msgstr "_Saugus HTTP tarpinis serveris:"
 
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:165
 #: ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Serveris:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:167
 msgid "_Show animated images"
 msgstr "_Rodyti animuotus paveikslÄ—lius"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:168
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Rodyti siuntėjo nuotrauką laiško peržiūros skiltyje"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:169
 msgid "_Trash Folder:"
 msgstr "Ši_ukšlių aplankas:"
 
-#: ../mail/mail-config.ui.h:169
+#: ../mail/mail-config.ui.h:170
 #: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "Na_udoti saugų ryšį:"
 
-#: ../mail/mail-config.ui.h:170
+#: ../mail/mail-config.ui.h:171
 msgid "_Use system defaults"
 msgstr "Nau_doti sistemos numatytuosius"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:172
 msgid "_Use the same fonts as other applications"
 msgstr "Na_udoti tokius šriftus kaip ir kitų programų"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:173
 #: ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:173
+#: ../mail/mail-config.ui.h:174
 #: ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:174
+#: ../mail/mail-config.ui.h:175
 msgid "color"
 msgstr "spalva"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:176
 msgid "description"
 msgstr "aprašymas"
 
@@ -11744,107 +11787,107 @@ msgstr "_Žymė:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Pažymėkite �ia, jeigu sutinkate su licencija"
 
-#: ../mail/mail-folder-cache.c:769
+#: ../mail/mail-folder-cache.c:779
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
 
-#: ../mail/mail-ops.c:85
+#: ../mail/mail-ops.c:86
 msgid "Filtering Selected Messages"
 msgstr "Filtruojami pažymėti laiškai"
 
-#: ../mail/mail-ops.c:205
+#: ../mail/mail-ops.c:206
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: ../mail/mail-ops.c:821
+#: ../mail/mail-ops.c:843
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siun�iamas laiškas %d iš %d"
 
-#: ../mail/mail-ops.c:869
+#: ../mail/mail-ops.c:891
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepavyko išsiųsti %d iš %d laiškų"
 
-#: ../mail/mail-ops.c:873
-#: ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:895
+#: ../mail/mail-send-recv.c:840
 msgid "Canceled."
 msgstr "Atšaukta."
 
-#: ../mail/mail-ops.c:875
-#: ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:897
+#: ../mail/mail-send-recv.c:842
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:1012
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Laiškai perkeliami į „%s“"
 
-#: ../mail/mail-ops.c:986
+#: ../mail/mail-ops.c:1013
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Laiškai kopijuojami į „%s“"
 
-#: ../mail/mail-ops.c:1103
+#: ../mail/mail-ops.c:1131
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas „%s“"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1206
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Išvaloma ir saugoma paskyra „%s“"
 
-#: ../mail/mail-ops.c:1178
+#: ../mail/mail-ops.c:1207
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Saugoma paskyra „%s“"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1269
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Atnaujinamas aplankas „%s“"
 
-#: ../mail/mail-ops.c:1428
+#: ../mail/mail-ops.c:1459
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Išvalomas aplankas „%s“"
 
-#: ../mail/mail-ops.c:1513
+#: ../mail/mail-ops.c:1544
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė esanti „%s“"
 
-#: ../mail/mail-ops.c:1615
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Atsijungiama nuo %s"
 
-#: ../mail/mail-send-recv.c:197
+#: ../mail/mail-send-recv.c:198
 msgid "Canceling..."
 msgstr "Atšaukiama..."
 
-#: ../mail/mail-send-recv.c:443
+#: ../mail/mail-send-recv.c:454
 msgid "Send & Receive Mail"
 msgstr "Siun�iamas ir gaunamas paštas"
 
-#: ../mail/mail-send-recv.c:459
+#: ../mail/mail-send-recv.c:470
 msgid "Cancel _All"
 msgstr "_Atšaukti visus?"
 
-#: ../mail/mail-send-recv.c:585
-#: ../mail/mail-send-recv.c:963
+#: ../mail/mail-send-recv.c:596
+#: ../mail/mail-send-recv.c:988
 msgid "Updating..."
 msgstr "Atnaujinama..."
 
-#: ../mail/mail-send-recv.c:585
-#: ../mail/mail-send-recv.c:680
+#: ../mail/mail-send-recv.c:596
+#: ../mail/mail-send-recv.c:691
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: ../mail/mail-send-recv.c:943
+#: ../mail/mail-send-recv.c:967
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ieškoma naujo pašto"
@@ -11883,7 +11926,7 @@ msgstr "Atnaujinami paieškos aplankai skirti „%s“ : %s"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../mail/mail-vfolder.c:677
+#: ../mail/mail-vfolder.c:678
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted folder\n"
@@ -11904,11 +11947,11 @@ msgstr[2] ""
 "%s buvo pakeisti atsižvelgiant į ištrintą aplanką\n"
 "„%s“."
 
-#: ../mail/mail-vfolder.c:1310
+#: ../mail/mail-vfolder.c:1314
 msgid "Edit Search Folder"
 msgstr "Keisti paieškos aplankus"
 
-#: ../mail/mail-vfolder.c:1415
+#: ../mail/mail-vfolder.c:1423
 msgid "New Search Folder"
 msgstr "Naujas paieškos aplankas"
 
@@ -12189,22 +12232,26 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Aplanke „{0}“ nėra dublikuotų laiškų."
 
 #: ../mail/mail.error.xml.h:75
+msgid "Hidden file is attached."
+msgstr "PaslÄ—pti failai pridÄ—ti."
+
+#: ../mail/mail.error.xml.h:76
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jeigu nuspręsite tęsti, nebegalėsite atkurti šių laiškų."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid "If you delete the folder, all of its contents and its subfolders' contents will be deleted permanently."
 msgstr "Jeigu ištrinsite šį aplanką, visas jo turinys ir jo antrinių aplankų turinys bus negrįžtamai ištrintas."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Jeigu ištrinsite šį aplanką, visas jo turinys bus negrąžinamai ištrintas."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Jeigu tęsite, visa tarpinių paskyrų informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -12212,71 +12259,71 @@ msgstr ""
 "Jeigu tęsite, paskyros informacija ir visa\n"
 "tarpinė informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jeigu tęsite, paskyros informacija bus visam laikui ištrinta."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "If you quit, these messages will not be sent until Evolution is started again."
 msgstr "Jeigu išeisite, šios žinutės nebus išsiųstos, kol Evolution nebus paleista dar kartą."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Ignore"
 msgstr "Nepaisyti"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Invalid authentication"
 msgstr "Netinkamas tapatybÄ—s nustatymas"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail Deletion Failed"
 msgstr "Nepavyko ištrinti pašto"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 msgid "Mail filters automatically updated."
 msgstr "Pašto filtrai automatiškai atnaujinami."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 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 "Dauguma el. pašto sistemų laiškams, kuriuose nurodyti tik slaptos kopijos gavėjai, prideda Apparently-To antraštę. Jeigu ši antraštė bus pridėta, matysis visi laiško gavėjai. Norėdami to išvengti, turėtumėte pridėti bent vieną Kam: arba Kopija: gavėją."
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Messages shown in Search Folders are not copies. Deleting them from a Search Folder will delete the actual messages from the folder or folders in which they physically reside. Do you really want to delete these messages?"
 msgstr "Laiškai, rodomi paieškos aplankuose nėra kopijos. Ištrynus laišką iš paieškos aplanko, bus ištrintas ir tikrasis laiškas iš aplankų, kuriuose jis yra. Ar tikrai norite ištrinti šiuos laiškus?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
 msgid "Missing folder."
 msgstr "Trūkstamas aplankas."
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 msgid "N_ever"
 msgstr "Ni_ekada"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No duplicate messages found."
 msgstr "Nerasta dublikuotų laiškų"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "No sources selected."
 msgstr "Nepasirinkta jokių šaltinių."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Opening too many messages at once may take a long time."
 msgstr "Atvėrus per daug laiškų vienu metu gali tekti ilgai palaukti."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please check your account settings and try again."
 msgstr "Patikrinkite paskyros parametrus ir bandykite dar kartÄ…."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 msgid "Please enable the account or send using another account."
 msgstr "Įjunkite šią paskyrą arba siųskite naudodami kitą paskyrą."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 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 "Prašom įvesti tinkamą el. pašto adresą laukelyje Kam:. Galite ieškoti el. pašto adresų paspausdami šalia įvedimo laukelio esantį mygtuką Kam:."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "Please make sure the following recipients are willing and able to receive HTML email:\n"
 "{0}"
@@ -12284,67 +12331,71 @@ msgstr ""
 "Įsitikinkite, kad šie laiško gavėjai pageidauja gauti ir gali perskaityti HTML laiškus:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please provide an unique name to identify this signature."
 msgstr "Įveskite unikalų šio parašo pavadinimą."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Please wait."
 msgstr "LuktelÄ—kite."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Perkeliant seną pašto aplanką „{0}“ iškilo problema."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Serveriui siun�iama užklausa dėl palaikomų tapatybės nustatymo būdų sąrašo."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Read receipt requested."
 msgstr "Paprašyta perskaitymo patvirtinimo."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ar tikrai ištrinti aplanką „{0}“ ir visus jo poaplankius?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Really delete folder \"{0}\"?"
 msgstr "Tikrai ištrinti aplanką „{0}“?"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:108
 msgid "Remove duplicate messages?"
 msgstr "Pašalinti dublikuotus laiškus?"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:109
 msgid "Reply _Privately"
 msgstr "Atsakyti as_meniškai"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Search Folders automatically updated."
 msgstr "Paieškos aplankai automatiškai atnaujinami."
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Send private reply?"
 msgstr "Siųsti asmeninį atsakymą?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Send reply to all recipients?"
 msgstr "Siųsti atsakymą visiems gavėjams?"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Signature Already Exists"
 msgstr "Toks parašas jau yra"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Sinchronizuoti aplankus naudojimui atsijungus?"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
 msgstr "Sisteminiai aplankai yra reikalingi korektiškam Evolution funkcionavimui ir negali būti pervadinti, perkelti ar pašalinti."
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
+msgid "The attachment named {0} is a hidden file and may contain sensitive data. Please review it before sending."
+msgstr "Priedas pavadintas {0} yra paslėptas failas ir gali turėti neviešų duomenų. Prašom peržiūrėti jį prieš siun�iant."
+
+#: ../mail/mail.error.xml.h:119
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -12354,7 +12405,7 @@ msgstr ""
 "\n"
 "Dauguma el. pašto sistemų laiškams, kuriuose nurodyti tik slaptos kopijos gavėjai, prideda Apparently-To antraštę. Jeigu ši antraštė bus pridėta, matysis visi laiško gavėjai. Norėdami to išvengti, turėtumėte pridėti bent vieną Kam: arba Kopija: gavėją."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -12362,7 +12413,7 @@ msgstr ""
 "Šis gavėjas neatpažintas kaip tinkamas pašto adresas:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:124
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -12370,15 +12421,15 @@ msgstr ""
 "Šie gavėjai neatpažinti kaip tinkami pašto adresai:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "The script file must exist and be executable."
 msgstr "Scenarijaus failas turi egzistuoti ir būti vykdomasis."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "These messages are not copies."
 msgstr "Šie laiškai nėra kopijos."
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -12386,95 +12437,95 @@ 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:129
+#: ../mail/mail.error.xml.h:131
 msgid "This message cannot be sent because the account you chose to send with is not enabled"
 msgstr "Šio laiško išsiųsti negalima, nes paskyra, kurią naudodami siun�iate, yra neįjungta"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 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:131
+#: ../mail/mail.error.xml.h:133
 msgid "This server does not support this type of authentication and may not support authentication at all."
 msgstr "Šis serveris nepalaiko tokio tapatybės nustatytmo būdo, taip pat gali būti, kad tai nepalaikoma visai."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 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:133
+#: ../mail/mail.error.xml.h:135
 msgid "This will mark all messages as read in the selected folder and its subfolders."
 msgstr "Visi laiškai, esantys pasirinktame aplanke ir jo poaplankiuose, bus pažymėti skaitytais."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:136
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Visi laiškai, esantys pasirinktame aplanke, bus pažymėti kaip perskaityti."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to connect to the GroupWise server."
 msgstr "Nepavyko prisijungti prie GroupWise serverio."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
 msgstr "Nepavyko atverti šios paskyros juodraš�ių aplanko. Ar vietoje to naudoti sistemos juodraš�ių aplanką?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 msgid "Unable to read license file."
 msgstr "Nepavyko perskaityti licencijos failo."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:140
 msgid "Unable to retrieve message."
 msgstr "Nepavyko gauti laiško."
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:141
 msgid "Use _Default"
 msgstr "Nau_doti numatytąjį"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:142
 msgid "Use default drafts folder?"
 msgstr "Naudoti numatytąjį juodraš�ių aplanką?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:143
 msgid "Would you like to close the message window?"
 msgstr "Ar norėtumėte užverti laiško langą?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
 msgid "You are replying privately to a message which arrived via a mailing list, but the list is trying to redirect your reply to go back to the list. Are you sure you want to proceed?"
 msgstr "Rašote asmeniškai adresuotą atsakymą į laišką, kurį gavote pašto konferencijoje, ta�iau konferencija siekia nukreipti jūsų atsakymą atgal į konferenciją. Ar tikrai norite tęsti?"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:145
 msgid "You are replying to a message which arrived via a mailing list, but you are replying privately to the sender; not to the list. Are you sure you want to proceed?"
 msgstr "Rašote atsakymą į laišką, kurį gavote pašto konferencijoje, ta�iau adresuojate atsakymą asmeniškai siuntėjui, ne konferencijai. Ar tikrai norite tęsti?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:146
 msgid "You are replying to a message which was sent to many recipients. Are you sure you want to reply to ALL of them?"
 msgstr "Rašote atsakymą į laišką, siųstą daugeliui gavėjų. Ar tikrai norite atsakyti jiems VISIEMS?"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:147
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Neturite teisių ištrinti šį laišką."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:148
 msgid "You have not filled in all of the required information."
 msgstr "Neįvedėte visos būtinos informacijos."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:149
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Yra neišsiųstų laiškų. Ar vis tiek norite išeiti?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:150
 msgid "You may not create two accounts with the same name."
 msgstr "Negalima sukurti dviejų paskyrų, turin�ių tą patį pavadinimą."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:151
 msgid "You must name this Search Folder."
 msgstr "Turite pavadinti ši paieškos aplanką."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:152
 msgid "You must specify a folder."
 msgstr "Turite nurodyti aplankÄ…."
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:153
 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."
@@ -12482,161 +12533,161 @@ msgstr ""
 "Turite nurodyti kaip šaltinį bent vieną aplanką.\n"
 "Pasirinkdami aplankus individualiai, ir/arba pasirinkdami visus vietinius aplankus, visus nuotolinius aplankus, arba ir tuos, ir tuos."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:155
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prisijungti prie serverio „{0}“ kaip „{0}“ nepavyko."
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:156
 msgid "_Always"
 msgstr "_Visada"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:157
 msgid "_Append"
 msgstr "_PridÄ—ti"
 
-#: ../mail/mail.error.xml.h:156
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../mail/mail.error.xml.h:158
+#: ../plugins/publish-calendar/publish-calendar.c:611
 msgid "_Disable"
 msgstr "_IÅ¡jungti"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:159
 msgid "_Discard changes"
 msgstr "A_tsisakyti pakeitimų"
 
-#: ../mail/mail.error.xml.h:158
-#: ../modules/mail/e-mail-shell-view-actions.c:1122
+#: ../mail/mail.error.xml.h:160
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
 msgid "_Empty Trash"
 msgstr "Iš_valyti šiukšlinę"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:161
 msgid "_Exit Evolution"
 msgstr "_Užverti Evolution"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:162
 msgid "_Expunge"
 msgstr "IÅ¡val_yti"
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:163
 msgid "_Migrate Now"
 msgstr "_Perkelti dabar"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:164
 msgid "_No"
 msgstr "_Ne"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:165
 msgid "_Open Messages"
 msgstr "_Atverti laiškus"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:168
 msgid "_Send Receipt"
 msgstr "_Siųsti patvirtinimą apie gavimą"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:169
 msgid "_Synchronize"
 msgstr "_Sinchronizuoti"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:170
 msgid "_Yes"
 msgstr "_Taip"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:171
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/message-list.c:1210
+#: ../mail/message-list.c:1261
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: ../mail/message-list.c:1211
+#: ../mail/message-list.c:1262
 msgid "Seen"
 msgstr "Matytas"
 
-#: ../mail/message-list.c:1212
+#: ../mail/message-list.c:1263
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: ../mail/message-list.c:1213
+#: ../mail/message-list.c:1264
 msgid "Forwarded"
 msgstr "Persiųstas"
 
-#: ../mail/message-list.c:1214
+#: ../mail/message-list.c:1265
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: ../mail/message-list.c:1215
+#: ../mail/message-list.c:1266
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: ../mail/message-list.c:1219
+#: ../mail/message-list.c:1270
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: ../mail/message-list.c:1220
+#: ../mail/message-list.c:1271
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: ../mail/message-list.c:1224
+#: ../mail/message-list.c:1275
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: ../mail/message-list.c:1225
+#: ../mail/message-list.c:1276
 msgid "Highest"
 msgstr "Aukš�iausias"
 
-#: ../mail/message-list.c:1831
-#: ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1909
+#: ../widgets/table/e-cell-date.c:51
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1838
+#. * in 12-hour format, without seconds.
+#: ../mail/message-list.c:1916
 #: ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Å iandien %H:%M"
 
-#: ../mail/message-list.c:1847
+#: ../mail/message-list.c:1925
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: ../mail/message-list.c:1859
+#: ../mail/message-list.c:1937
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1945
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:1947
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2650
+#: ../mail/message-list.c:2752
 msgid "Select all visible messages"
 msgstr "Pažymėti visus matomus laiškus"
 
-#: ../mail/message-list.c:2808
+#: ../mail/message-list.c:2912
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Laiškai"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4003
+#: ../mail/message-list.c:4160
 msgid "Follow-up"
 msgstr "Tęsinys"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4507
-#: ../mail/message-list.c:4926
+#: ../mail/message-list.c:4675
+#: ../mail/message-list.c:5098
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
-#: ../mail/message-list.c:4744
+#: ../mail/message-list.c:4912
 msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
 msgstr "Jūsų paieškos kriterijų neatitinka joks laiškas. Galite pasirinkti meniu elementą Paieška → Išvalyti arba ją pakeisti."
 
-#: ../mail/message-list.c:4746
+#: ../mail/message-list.c:4914
 msgid "There are no messages in this folder."
 msgstr "Šiame aplanke nėra laiškų."
 
@@ -12674,27 +12725,27 @@ msgid "Subject - Trimmed"
 msgstr "Tema – patrumpinta"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1562
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Body contains"
 msgstr "Laiške yra"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1569
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Message contains"
 msgstr "Žinutėje yra"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1576
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "Recipients contain"
 msgstr "Gavėjų sąraše yra"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Sender contains"
 msgstr "SiuntÄ—jo lauke yra"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1590
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
 msgid "Subject contains"
 msgstr "Temoje yra"
 
@@ -12702,61 +12753,61 @@ msgstr "Temoje yra"
 msgid "Subject or Addresses contains"
 msgstr "Temos arba adreso lauke yra"
 
-#: ../modules/addressbook/addressbook-config.c:207
+#: ../modules/addressbook/addressbook-config.c:204
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
 msgstr "Pasirinkus šią parinktį, Evolution jungsis prie LDAP serverio tik jeigu LDAP serveris palaiko SSL."
 
-#: ../modules/addressbook/addressbook-config.c:209
+#: ../modules/addressbook/addressbook-config.c:206
 msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
 msgstr "Pasirinkus šią parinktį Evolution jungsis prie LDAP serverio tik jeigu LDAP serveris palaiko TLS."
 
-#: ../modules/addressbook/addressbook-config.c:211
+#: ../modules/addressbook/addressbook-config.c:208
 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 "Šios parinkties pasirinkimas reiškia, kad serveris nepalaiko SSL arba TLS. Šiuo atveju ryšys bus nesaugus ir būsite pažeidžiami saugumo spragas išnaudojan�ių atakų."
 
-#: ../modules/addressbook/addressbook-config.c:625
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Naudoti _gimtadienių ir jubiliejų kalendoriuje"
 
-#: ../modules/addressbook/addressbook-config.c:666
+#: ../modules/addressbook/addressbook-config.c:680
 msgid "Copy _book content locally for offline operation"
 msgstr "Kopijuoti _knygos turinį į nuosavą kompiuterį darbui neprisijungus"
 
-#: ../modules/addressbook/addressbook-config.c:778
+#: ../modules/addressbook/addressbook-config.c:795
 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 "Čia nurodomas LDAP serverio prievadas, prie kurio Evolution bandys jungtis. Standartinių prievadų sąrašas yra pateiktas. Pasiteiraukite savo sistemos administratoriaus, jei nežinote, kurį prievadą reikia nurodyti."
 
-#: ../modules/addressbook/addressbook-config.c:857
+#: ../modules/addressbook/addressbook-config.c:876
 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 "Tai Evolution naudojamas tapatybės patvirtinimo būdas. Atminkite, kad norint pasinaudoti „El. pašto adreso“ metodu būtina anoniminė prieiga prie jūsųLDAP serverio."
 
-#: ../modules/addressbook/addressbook-config.c:937
+#: ../modules/addressbook/addressbook-config.c:959
 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 "Paieškos sritis nurodo, kaip giliai aplankų medyje norite vykdyti paieškas. Paieškos sritis „sub“ išves visus įrašus esan�ius žemiau paieškos bazės. Paieškos sritis „one“ pateiks tik pirmame paieškos bazės lygyje esan�ius įrašus."
 
-#: ../modules/addressbook/addressbook-config.c:1058
+#: ../modules/addressbook/addressbook-config.c:1083
 msgid "Server Information"
 msgstr "Serverio informacija"
 
-#: ../modules/addressbook/addressbook-config.c:1063
+#: ../modules/addressbook/addressbook-config.c:1088
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Informacija"
 
-#: ../modules/addressbook/addressbook-config.c:1064
+#: ../modules/addressbook/addressbook-config.c:1089
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "Paieška"
 
-#: ../modules/addressbook/addressbook-config.c:1066
+#: ../modules/addressbook/addressbook-config.c:1091
 msgid "Downloading"
 msgstr "Atsiuntimas"
 
-#: ../modules/addressbook/addressbook-config.c:1275
+#: ../modules/addressbook/addressbook-config.c:1306
 msgid "Address Book Properties"
 msgstr "Adresų knygos savybės"
 
-#: ../modules/addressbook/addressbook-config.c:1277
+#: ../modules/addressbook/addressbook-config.c:1308
 msgid "New Address Book"
 msgstr "Nauja adresų knyga"
 
@@ -12785,72 +12836,88 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "EFolderList XML, skirtas adresų pabaigimo sąrašui."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Enable address formatting"
+msgstr "Įgalinti adreso formatavimą"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented horizontally."
 msgstr "Kontaktų peržiūros polangio pozicija, kai jis pasuktas horizontaliai."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
 msgid "Position of the contact preview pane when oriented vertically."
 msgstr "Kontaktų peržiūros polangio pozicija, kai jis pasuktas vertikaliai."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Primary address book"
 msgstr "Pirminė adresų knyga"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
 msgid "Show autocompleted name with an address"
 msgstr "Rodyti automatiškai pabaigtą vardą kartu su adresu"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show maps"
 msgstr "Rodyti žemėlapius"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "Show preview pane"
 msgstr "Rodyti peržiūros skydelį"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid "The UID of the selected (or \"primary\") address book in the sidebar of the \"Contacts\" view."
 msgstr "„Kontaktų“ rodinio šoniniame skydelyje pažymėtosios (arba „pirminės“) adresų knygos UID."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
 msgstr "Išdėstymo stilius nurodo, kur kontaktų sąrašo atžvilgiu yra peržiūros polangis. „0“ (klasikinis rodinys) – peržiūros polangis yra po kontaktų sąrašu. „1“ (vertikalus rodinys) – peržiūros polangis yra šalia kontaktų sąrašo."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
 msgstr "Simbolių kiekis, kuris turi būti įvestas prieš Evolution bandant papildyti įvedimą."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Aplanko adresas paskutinį kartą panaudotas vardų pasirinkimo dialoge"
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
 msgid "URI for the folder last used in the select names dialog."
 msgstr "Aplanko, paskutinį kartą naudoto vardų parinkimo dialoge, adresas."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:18
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+msgid "Whether addresses should be formatted according to standard in their destination country."
+msgstr "Ar adresai turėtų būti suformatuoti pagal paskirties šalies standartus."
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
 msgstr "Ar įrašo vietoje priverstinai rodyti pašto adresą kartu su automatiškai pabaigto kontakto vardu."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:21
 msgid "Whether to show maps in preview pane."
 msgstr "Ar rodyti žemėlapius peržiūros polangyje."
 
-#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:22
 msgid "Whether to show the preview pane."
 msgstr "Ar rodyti peržiūros polangį."
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:184
-#: ../modules/mail/em-mailer-prefs.c:1029
+#: ../modules/addressbook/autocompletion-config.c:194
+#: ../modules/mail/em-mailer-prefs.c:1049
 msgid "_Table column:"
 msgstr "_LentelÄ—s stulpelis:"
 
-#: ../modules/addressbook/autocompletion-config.c:187
+#: ../modules/addressbook/autocompletion-config.c:197
+msgid "Address formatting"
+msgstr "Adreso formatavimas"
+
+#: ../modules/addressbook/autocompletion-config.c:200
+msgid "_Format address according to standard of its destination country"
+msgstr "_Formatuoti adresÄ… pagal paskirties Å¡alies formatus"
+
+#: ../modules/addressbook/autocompletion-config.c:209
 msgid "Autocompletion"
 msgstr "Automatinis pabaigimas"
 
-#: ../modules/addressbook/autocompletion-config.c:190
+#: ../modules/addressbook/autocompletion-config.c:212
 msgid "Always _show address of the autocompleted contact"
 msgstr "Visada _rodyti automatiškai pabaigto kontakto adresą"
 
@@ -12954,10 +13021,10 @@ msgid "Show map with all contacts from selected address book"
 msgstr "Rodyti žemėlapį su visais adresatais iš pasirinktos adresų knygos"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1404
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
-#: ../modules/calendar/e-task-shell-view-actions.c:765
-#: ../modules/mail/e-mail-shell-view-actions.c:1199
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-memo-shell-view-actions.c:640
+#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
 msgid "_Rename..."
 msgstr "Pe_rvadinti..."
 
@@ -13030,22 +13097,22 @@ msgid "Send a message to the selected contacts"
 msgstr "Siųsti laišką nurodytiems kontaktams"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
-#: ../modules/calendar/e-task-shell-view-actions.c:823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "_Veiksmai"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:678
-#: ../modules/calendar/e-task-shell-view-actions.c:830
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/calendar/e-memo-shell-view-actions.c:677
+#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/mail/e-mail-shell-view-actions.c:1347
 msgid "_Preview"
 msgstr "_Peržiūra"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
-#: ../modules/calendar/e-memo-shell-view-actions.c:691
-#: ../modules/calendar/e-task-shell-view-actions.c:843
+#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-memo-shell-view-actions.c:690
+#: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "_IÅ¡trinti"
 
@@ -13074,9 +13141,9 @@ msgid "Show maps in contact preview window"
 msgstr "Rodyti žemėlapius adresatų peržiūros lange"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-#: ../modules/mail/e-mail-shell-view-actions.c:1472
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:1462
 msgid "_Classic View"
 msgstr "_Klasikinis rodinys"
 
@@ -13085,9 +13152,9 @@ msgid "Show contact preview below the contact list"
 msgstr "Rodyti kontakto peržiūrą po kontaktų sąrašu"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:919
-#: ../modules/mail/e-mail-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:1469
 msgid "_Vertical View"
 msgstr "_Vertikalus rodinys"
 
@@ -13096,25 +13163,25 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Rodyti kontaktų peržiūrą šalia kontaktų sąrašo"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Neatitinkantys"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../modules/calendar/e-cal-shell-view-actions.c:1719
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
-#: ../shell/e-shell-content.c:666
+#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Sudėtingesnė paieška"
 
@@ -13168,22 +13235,22 @@ msgstr "_Siųsti laišką į konferenciją"
 msgid "_Send Message to Contact"
 msgstr "_Siųsti laišką kontaktui"
 
-#: ../modules/addressbook/eab-composer-util.c:147
+#: ../modules/addressbook/eab-composer-util.c:149
 msgid "Multiple vCards"
 msgstr "Keletas vCard kortelių"
 
-#: ../modules/addressbook/eab-composer-util.c:155
+#: ../modules/addressbook/eab-composer-util.c:157
 #, c-format
 msgid "vCard for %s"
 msgstr "%s vCard"
 
-#: ../modules/addressbook/eab-composer-util.c:167
-#: ../modules/addressbook/eab-composer-util.c:194
+#: ../modules/addressbook/eab-composer-util.c:169
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information"
 msgstr "Kontakto informacija"
 
-#: ../modules/addressbook/eab-composer-util.c:196
+#: ../modules/addressbook/eab-composer-util.c:198
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s kontakto informacija"
@@ -13368,7 +13435,6 @@ msgid "Minutes"
 msgstr "MinutÄ—s"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
-#| msgid "Publishing Location"
 msgid "Publishing Information"
 msgstr "Publikavimo informacija"
 
@@ -13439,7 +13505,7 @@ msgid "Wee_k starts on:"
 msgstr "Sa_vaitÄ— prasideda:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:52
-#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
 msgid "Work Week"
 msgstr "Darbo savaitÄ—"
 
@@ -14036,15 +14102,15 @@ msgstr "I_mportuoti į kalendorių"
 msgid "I_mport to Tasks"
 msgstr "I_mportuoti į užduotis"
 
-#: ../modules/calendar/e-calendar-preferences.c:441
+#: ../modules/calendar/e-calendar-preferences.c:461
 msgid "Selected Calendars for Reminders"
 msgstr "Pasirinkti kalendoriai perspÄ—jimams"
 
-#: ../modules/calendar/e-calendar-preferences.c:841
+#: ../modules/calendar/e-calendar-preferences.c:863
 msgid "Ti_me and date:"
 msgstr "_Laikas ir data:"
 
-#: ../modules/calendar/e-calendar-preferences.c:842
+#: ../modules/calendar/e-calendar-preferences.c:864
 msgid "_Date only:"
 msgstr "_Tik data:"
 
@@ -14059,7 +14125,7 @@ msgid "On The Web"
 msgstr "Tinkle"
 
 #: ../modules/calendar/e-cal-shell-backend.c:119
-#: ../plugins/calendar-weather/calendar-weather.c:125
+#: ../plugins/calendar-weather/calendar-weather.c:127
 msgid "Weather"
 msgstr "Oras"
 
@@ -14074,7 +14140,7 @@ msgid "_Appointment"
 msgstr "_Paskyrimas"
 
 #: ../modules/calendar/e-cal-shell-backend.c:441
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Create a new appointment"
 msgstr "Sukurti naujÄ… paskyrimÄ…"
 
@@ -14102,7 +14168,7 @@ msgid "Cale_ndar"
 msgstr "_Kalendorius"
 
 #: ../modules/calendar/e-cal-shell-backend.c:465
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
@@ -14158,290 +14224,294 @@ msgid "event"
 msgstr "įvykis"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1177
-#: ../modules/calendar/e-cal-shell-view-memopad.c:220
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:525
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-memopad.c:219
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "Save as iCalendar"
 msgstr "Įrašyti kaip iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Kopijuoti..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "D_elete Calendar"
 msgstr "_Ištrinti kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1343
+#: ../modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Delete the selected calendar"
 msgstr "Ištrinti pasirinktą kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Go Back"
 msgstr "Eiti atgal"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Go Forward"
 msgstr "Eiti pirmyn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Select today"
 msgstr "Pasirinkti Å¡iandienÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Select _Date"
 msgstr "Pasirinkite _datÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Select a specific date"
 msgstr "Pasirinkti specifinÄ™ datÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "_New Calendar"
 msgstr "_Naujas kalendorius"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1390
-#: ../modules/calendar/e-task-shell-view-actions.c:814
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "_IÅ¡valyti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Purge old appointments and meetings"
 msgstr "Pašalinti visus paskyrimus ir susitikimus"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1397
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "_Atnaujinti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Refresh the selected calendar"
 msgstr "Atnaujinti pasirinktą kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Rename the selected calendar"
 msgstr "Pervadinti pasirinktą kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Show _Only This Calendar"
 msgstr "R_odyti tik šį kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Cop_y to Calendar..."
 msgstr "Kopi_juoti į kalendorių..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "_Delegate Meeting..."
 msgstr "_Pavesti susitikimÄ…..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "_Delete Appointment"
 msgstr "_IÅ¡trinti paskyrimÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Delete selected appointments"
 msgstr "IÅ¡trinti pasirinktus paskyrimus"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "Delete This _Occurrence"
 msgstr "Ištrinti šį _atvejį"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Delete this occurrence"
 msgstr "Ištrinti šį atvejį"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Delete All Occ_urrences"
 msgstr "IÅ¡trinti _visus atvejus"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Delete all occurrences"
 msgstr "IÅ¡trinti visus atvejus"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "New All Day _Event..."
 msgstr "Naujas visos _dienos įvykis..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Create a new all day event"
 msgstr "Sukurti naują visos dienos įvykį"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1460
-#: ../modules/calendar/e-cal-shell-view-memopad.c:254
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+#: ../modules/calendar/e-task-shell-view-actions.c:722
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1467
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "New _Meeting..."
 msgstr "Naujas _susitikimas..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Create a new meeting"
 msgstr "Sukurti naujÄ… susitikimÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1474
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Mo_ve to Calendar..."
 msgstr "Per_kelti į kalendorių..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1481
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "New _Appointment..."
 msgstr "Naujas _paskyrimas..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1488
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Make this Occurrence _Movable"
 msgstr "Padaryti šį pasikartojimą perkelia_mą"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1495
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Open Appointment"
 msgstr "_Atverti paskyrimÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "View the current appointment"
 msgstr "Peržiūrėti esamą paskyrimą"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1502
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "_Reply"
 msgstr "_Atsakyti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1516
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti susitikimÄ…..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Converts an appointment to a meeting"
 msgstr "Konvertuoja paskyrimą į susitikimą"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1523
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "Conv_ert to Appointment..."
 msgstr "Konv_ertuoti į paskyrimą..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Converts a meeting to an appointment"
 msgstr "Konvertuoja susitikimą į paskyrimą"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Quit"
 msgstr "IÅ¡eiti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1650
+#: ../modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Day"
 msgstr "Diena"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one day"
 msgstr "Rodyti vienÄ… dienÄ…"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "List"
 msgstr "Sąrašas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show as list"
 msgstr "Rodyti sąrašą"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
 msgid "Month"
 msgstr "MÄ—nuo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-actions.c:1667
 msgid "Show one month"
 msgstr "Rodyti vieną mėnesį"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
 msgid "Week"
 msgstr "SavaitÄ—"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1673
+#: ../modules/calendar/e-cal-shell-view-actions.c:1674
 msgid "Show one week"
 msgstr "Rodyti vienÄ… savaitÄ™"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-cal-shell-view-actions.c:1681
 msgid "Show one work week"
 msgstr "Rodyti vienÄ… darbo savaitÄ™"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Active Appointments"
 msgstr "Aktyvūs paskyrimai"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Next 7 Days' Appointments"
 msgstr "Paskyrimai 7 dienoms"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+msgid "Occurs Less Than 5 Times"
+msgstr "Pasikartoja mažiau nei 5 kartus"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "Aprašyme yra"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
-#: ../modules/calendar/e-memo-shell-view-actions.c:803
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+#: ../modules/calendar/e-memo-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "Santraukoje yra"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1752
+#: ../modules/calendar/e-cal-shell-view-actions.c:1760
 msgid "Print this calendar"
 msgstr "Spausdinti šį kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1767
 msgid "Preview the calendar to be printed"
 msgstr "Peržiūrėti spausdintiną kalendorių"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:844
-#: ../modules/calendar/e-task-shell-view-actions.c:1043
+#: ../modules/calendar/e-cal-shell-view-actions.c:1789
+#: ../modules/calendar/e-cal-shell-view-memopad.c:294
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:381
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
 msgid "_Save as iCalendar..."
 msgstr "_Įrašyti kaip iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1858
+#: ../modules/calendar/e-cal-shell-view-actions.c:1866
 msgid "Go To"
 msgstr "Eiti į"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:523
+#: ../modules/calendar/e-cal-shell-view-memopad.c:217
+#: ../modules/calendar/e-memo-shell-view-actions.c:522
 msgid "memo"
 msgstr "raštelis"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:654
 msgid "New _Memo"
 msgstr "Naujas _raštelis"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
 #: ../modules/calendar/e-memo-shell-backend.c:300
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "Create a new memo"
 msgstr "Sukurti naują raštelį"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:662
+#: ../modules/calendar/e-cal-shell-view-memopad.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
 msgid "_Open Memo"
 msgstr "_Atverti raštelį"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "View the selected memo"
 msgstr "Žiūrėti pažymėtą raštelį"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:669
-#: ../modules/calendar/e-task-shell-view-actions.c:807
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#: ../modules/calendar/e-task-shell-view-actions.c:806
 msgid "Open _Web Page"
 msgstr "Atverti _tinklalapį"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-memopad.c:286
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
 msgid "Print the selected memo"
 msgstr "Spausdinti pasirinktą raštelį"
 
@@ -14449,58 +14519,58 @@ msgstr "Spausdinti pasirinktą raštelį"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:285
-#: ../modules/calendar/e-task-shell-view-actions.c:640
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:284
+#: ../modules/calendar/e-task-shell-view-actions.c:639
 msgid "task"
 msgstr "užduotis"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:319
+#: ../modules/calendar/e-task-shell-view-actions.c:701
 msgid "_Assign Task"
 msgstr "_Priskirti užduotį"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:778
 msgid "_Mark as Complete"
 msgstr "_Pažymėti kaip baigtą"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:335
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "Mark selected tasks as complete"
 msgstr "Pažymėti pasirinktas užduotis kaip užbaigtas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:341
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
 msgid "_Mark as Incomplete"
 msgstr "_Pažymėti kaip nebaigtą"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:342
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mark selected tasks as incomplete"
 msgstr "Pažymėti pasirinktas užduotis kaip nebaigtas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:792
 msgid "New _Task"
 msgstr "Nauja _užduotis"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:350
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:349
 #: ../modules/calendar/e-task-shell-backend.c:299
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
+#: ../modules/calendar/e-task-shell-view-actions.c:799
 msgid "_Open Task"
 msgstr "_Atverti užduotį"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:356
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "View the selected task"
 msgstr "Peržiūrėti pasirinktą užduotį"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
 msgid "Print the selected task"
 msgstr "Peržiūrėti pasirinktą užduotį"
 
@@ -14524,7 +14594,7 @@ msgid "Memo Li_st"
 msgstr "Raštelių _sąrašas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "Create a new memo list"
 msgstr "Sukurti naują raštelių sąrašą"
 
@@ -14547,63 +14617,63 @@ msgstr "Atveriami %s rašteliai"
 msgid "Print Memos"
 msgstr "Spausdinti raštelius"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-memo-shell-view-actions.c:584
 msgid "_Delete Memo"
 msgstr "_Ištrinti raštelį"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:591
 msgid "_Find in Memo..."
 msgstr "_Rasti raštelyje..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "Search for text in the displayed memo"
 msgstr "Ieškoti teksto rodomame raštelyje"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
 msgid "D_elete Memo List"
 msgstr "_Ištrinti raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Delete the selected memo list"
 msgstr "Pervadinti pasirinktą raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
 msgid "_New Memo List"
 msgstr "_Naujas raštelių sąrašas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
 msgid "Refresh the selected memo list"
 msgstr "Atnaujinti pasirinktą raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Pervadinti pasirinktą raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Rodyti _tik šį raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
 msgid "Memo _Preview"
 msgstr "Raštelio _peržiūra"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Show memo preview pane"
 msgstr "Rodyti raštelių peržiūros polangį"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
 msgid "Show memo preview below the memo list"
 msgstr "Rodyti raštelių peržiūrą po raštelių sąrašu"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
 msgid "Show memo preview alongside the memo list"
 msgstr "Rodyti raštelių peržiūrą šalia raštelių sąrašo"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
 msgid "Print the list of memos"
 msgstr "Spausdinti raštelių sąrašą"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
 msgid "Preview the list of memos to be printed"
 msgstr "Peržiūrėti spausdintinų raštelių sąrašą"
 
@@ -14649,7 +14719,7 @@ msgid "Tas_k List"
 msgstr "_Užduo�ių sąrašas"
 
 #: ../modules/calendar/e-task-shell-backend.c:316
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "Create a new task list"
 msgstr "Sukurti naują užduo�ių sąrašą"
 
@@ -14672,7 +14742,7 @@ msgstr "Atveriamos užduotys, esan�ios %s"
 msgid "Print Tasks"
 msgstr "Spausdinti užduotis"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:584
+#: ../modules/calendar/e-task-shell-view-actions.c:583
 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"
@@ -14682,99 +14752,99 @@ msgstr ""
 "\n"
 "Tikrai ištrinti šias užduotis?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:591
+#: ../modules/calendar/e-task-shell-view-actions.c:590
 msgid "Do not ask me again"
 msgstr "Daugiau nebeklausti"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:708
 msgid "_Delete Task"
 msgstr "_Ištrinti užduotį"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:715
 msgid "_Find in Task..."
 msgstr "_Rasti užduotyje..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Search for text in the displayed task"
 msgstr "Ieškoti teksto rodomoje užduotyje"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:729
 msgid "Copy..."
 msgstr "Kopijuoti..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:737
+#: ../modules/calendar/e-task-shell-view-actions.c:736
 msgid "D_elete Task List"
 msgstr "_Ištrinti užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "Delete the selected task list"
 msgstr "Ištrinti pasirinktą užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:743
 msgid "_New Task List"
 msgstr "_Naujas užduo�ių sąrašas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Refresh the selected task list"
 msgstr "Atnaujinti pasirinktą užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:766
 msgid "Rename the selected task list"
 msgstr "Pervadinti pasirinktą užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:771
 msgid "Show _Only This Task List"
 msgstr "Rodyti _tik šį užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:785
 msgid "Mar_k as Incomplete"
 msgstr "_Pažymėti kaip nebaigtą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Delete completed tasks"
 msgstr "Ištrinti baigtas užduotis"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Task _Preview"
 msgstr "Užduo�ių _peržiūra"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Show task preview pane"
 msgstr "Rodyti užduo�ių peržiūros polangį"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview below the task list"
 msgstr "Rodyti užduo�ių peržiūrą po užduo�ių sąrašu"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:921
+#: ../modules/calendar/e-task-shell-view-actions.c:920
 msgid "Show task preview alongside the task list"
 msgstr "Rodyti užduo�ių peržiūrą šalia užduo�ių sąrašo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:928
 msgid "Active Tasks"
 msgstr "Aktyvios užduotys"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:942
 msgid "Completed Tasks"
 msgstr "Baigtos užduotis"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:949
 msgid "Next 7 Days' Tasks"
 msgstr "Užduotys 7 dienoms"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:956
 msgid "Overdue Tasks"
 msgstr "Vėluojamos atlikti užduotys"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:963
 msgid "Tasks with Attachments"
 msgstr "Užduotys su priedais"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
 msgid "Print the list of tasks"
 msgstr "Spausdinti užduo�ių sąrašą"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
 msgid "Preview the list of tasks to be printed"
 msgstr "Peržiūrėti spausdintinų užduo�ių sąrašą"
 
@@ -14798,11 +14868,11 @@ msgstr[0] "%d užduotis"
 msgstr[1] "%d užduotys"
 msgstr[2] "%d užduo�ių"
 
-#: ../modules/mail/em-account-prefs.c:219
+#: ../modules/mail/em-account-prefs.c:258
 msgid "Evolution Account Assistant"
 msgstr "Evolution paskyrų vediklis"
 
-#: ../modules/mail/em-account-prefs.c:268
+#: ../modules/mail/em-account-prefs.c:307
 msgid "Account Editor"
 msgstr "Paskyrų rengyklė"
 
@@ -14830,311 +14900,311 @@ msgstr "Pašto _aplankas"
 msgid "Create a new mail folder"
 msgstr "Sukurti naują pašto aplanką"
 
-#: ../modules/mail/e-mail-shell-backend.c:412
+#: ../modules/mail/e-mail-shell-backend.c:409
 msgid "Mail Accounts"
 msgstr "Pašto paskyros"
 
-#: ../modules/mail/e-mail-shell-backend.c:420
+#: ../modules/mail/e-mail-shell-backend.c:417
 msgid "Mail Preferences"
 msgstr "Pašto nustatymai"
 
-#: ../modules/mail/e-mail-shell-backend.c:428
+#: ../modules/mail/e-mail-shell-backend.c:425
 msgid "Composer Preferences"
 msgstr "Rašymo nustatymai"
 
-#: ../modules/mail/e-mail-shell-backend.c:436
+#: ../modules/mail/e-mail-shell-backend.c:433
 msgid "Network Preferences"
 msgstr "Tinklo nustatymai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1115
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
 #: ../modules/mail/e-mail-shell-view.c:960
 msgid "_Disable Account"
 msgstr "_IÅ¡jungti paskyrÄ…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "Disable this account"
 msgstr "IÅ¡jungti Å¡iÄ… paskyrÄ…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Visam laikui pašalinti visus ištrintus laiškus iš visų aplankų"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1129
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
 msgid "_Download Messages for Offline Usage"
 msgstr "_Atsiųsti laiškus darbui atsijungus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Atsiųsti paskyrų ir aplankų, pažymėtų naudojimui atsijungus, laiškus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1136
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
 msgid "Fl_ush Outbox"
 msgstr "Išsiųsti _visus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1143
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
 msgid "_Copy Folder To..."
 msgstr "_Kopijuoti aplanką į..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "Copy the selected folder into another folder"
 msgstr "Kopijuoti pažymėtą aplanką į kitą aplanką"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1152
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
 msgid "Permanently remove this folder"
 msgstr "Visam laikui pašalinti šį aplanką"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1157
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
 msgid "E_xpunge"
 msgstr "IÅ¡val_yti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Visam laikui pašalinti visus ištrintus laiškus iš šio aplanko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
 msgid "Mar_k All Messages as Read"
 msgstr "Paž_ymėti visus laiškus skaitytais"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
 msgid "Mark all messages in the folder as read"
 msgstr "Pažymėti visus laiškus aplanke kaip skaitytus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1171
+#: ../modules/mail/e-mail-shell-view-actions.c:1161
 msgid "_Move Folder To..."
 msgstr "P_erkelti aplanką į..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1163
 msgid "Move the selected folder into another folder"
 msgstr "Perkelti pažymėtą aplanką į kitą aplanką"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1178
+#: ../modules/mail/e-mail-shell-view-actions.c:1168
 msgid "_New..."
 msgstr "_Naujas..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1170
 msgid "Create a new folder for storing mail"
 msgstr "Sukurti naują aplanką pašto saugojimui"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
 msgid "Change the properties of this folder"
 msgstr "Keisti Å¡io aplanko savybes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
 msgid "Refresh the folder"
 msgstr "Atnaujinti aplankÄ…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
 msgid "Change the name of this folder"
 msgstr "Keisti Å¡io aplanko pavadinimÄ…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
 msgid "Select Message _Thread"
 msgstr "Pažymėti laiško _giją"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Pažymėti visus laiškus toje gijoje, kur yra pasirinktas laiškas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
 msgid "Select Message S_ubthread"
 msgstr "Pažymėti laiško s_ubgiją"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
 msgid "Select all replies to the currently selected message"
 msgstr "Pažymėti visus atsakymus į pasirinktą laišką"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Empty _Trash"
 msgstr "Išval_yti šiukšlinę"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Visam laikui pašalinti visus ištrintus laiškus iš visų paskyrų"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "_New Label"
 msgstr "_Nauja etiketÄ—"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
 msgid "N_one"
 msgstr "_NÄ—ra"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1247
 msgid "_Manage Subscriptions"
 msgstr "_Tvarkyti prenumeratas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1326
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Užsisakyti ar atsisakyti aplankų nutolusiuose serveriuose"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1264
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Send / _Receive"
 msgstr "Siųsti / _gauti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Send queued items and retrieve new items"
 msgstr "Išsiųsti laukiantį paštą ir paimti naują paštą"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1261
 msgid "R_eceive All"
 msgstr "_Gauti visus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "Receive new items from all accounts"
 msgstr "Gauti naujus elementus iš visų paskyrų"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1268
 msgid "_Send All"
 msgstr "_Siųsti visus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Send queued items in all accounts"
 msgstr "Išsiųsti laukian�ius elementus visose paskyrose"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1298
 msgid "Cancel the current mail operation"
 msgstr "Nutraukti vykdomą pašto operaciją"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1313
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 msgid "Collapse All _Threads"
 msgstr "Sutraukti visas _gijas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1305
 msgid "Collapse all message threads"
 msgstr "Sutraukti visas laiškų gijas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1310
 msgid "E_xpand All Threads"
 msgstr "_IÅ¡plÄ—sti visas gijas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1312
 msgid "Expand all message threads"
 msgstr "Išplėsti visas laiškų gijas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1317
 msgid "_Message Filters"
 msgstr "Laiškų _filtrai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1319
 msgid "Create or edit rules for filtering new mail"
 msgstr "Sukurti ar keisti pašto filtravimo taisykles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1324
 msgid "_Subscriptions..."
 msgstr "_Prenumeratos..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1333
 msgid "F_older"
 msgstr "_Aplankas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1340
 msgid "_Label"
 msgstr "_EtiketÄ—"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1367
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "C_reate Search Folder From Search..."
 msgstr "Suku_rti paieškos aplanką pagal paiešką..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1374
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
 msgid "Search F_olders"
 msgstr "Paiešk_os aplankai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Create or edit search folder definitions"
 msgstr "Kurti ar taisyti paieškos aplankų apibrėžimus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1407
+#: ../modules/mail/e-mail-shell-view-actions.c:1397
 msgid "_New Folder..."
 msgstr "_Naujas aplankas..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1435
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Show Message _Preview"
 msgstr "Rodyti laiško _peržiūrą"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "Show message preview pane"
 msgstr "Rodyti laiško peržiūros polangį"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1443
+#: ../modules/mail/e-mail-shell-view-actions.c:1433
 msgid "Show _Deleted Messages"
 msgstr "Rodyti _ištrintus laiškus"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "Show deleted messages with a line through them"
 msgstr "Rodyti ištrintus laiškus juos perbraukiant"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1451
+#: ../modules/mail/e-mail-shell-view-actions.c:1441
 msgid "_Group By Threads"
 msgstr "_Grupuoti pagal gijas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Threaded message list"
 msgstr "Grupuojamas pagal gijas laiškų sąrašas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1474
+#: ../modules/mail/e-mail-shell-view-actions.c:1464
 msgid "Show message preview below the message list"
 msgstr "Rodyti laiško peržiūrą po laiškų sąrašu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/mail/e-mail-shell-view-actions.c:1471
 msgid "Show message preview alongside the message list"
 msgstr "Rodyti laiškų peržiūrą šalia laiškų sąrašo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1489
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "All Messages"
 msgstr "Visi laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1496
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Important Messages"
 msgstr "Svarbūs laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1503
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "Last 5 Days' Messages"
 msgstr "Paskutinių 5 dienų laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1510
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Messages Not Junk"
 msgstr "Laiškai ne brukalas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1517
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Messages with Attachments"
 msgstr "Laiškai su priedais"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "No Label"
 msgstr "Be užrašo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Read Messages"
 msgstr "Perskaityti laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Recent Messages"
 msgstr "Naujausi laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Unread Messages"
 msgstr "Neskaityti laiškai"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1597
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "Subject or Addresses contain"
 msgstr "Temos arba adreso lauke yra"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1597
 msgid "All Accounts"
 msgstr "Visos paskyros"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1604
 msgid "Current Account"
 msgstr "DabartinÄ— paskyra"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1611
 msgid "Current Folder"
 msgstr "Dabartinis aplankas"
 
@@ -15219,18 +15289,18 @@ msgstr[2] "IÅ¡ viso %d"
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1542
+#: ../modules/mail/e-mail-shell-view-private.c:1544
 msgid "Send / Receive"
 msgstr "Siųsti / gauti"
 
-#: ../modules/mail/em-composer-prefs.c:493
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:831
-#: ../widgets/misc/e-account-tree-view.c:224
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../modules/plugin-manager/evolution-plugin-manager.c:360
+#: ../plugins/publish-calendar/publish-calendar.c:849
+#: ../widgets/misc/e-account-tree-view.c:385
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: ../modules/mail/em-composer-prefs.c:497
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Kalba (-os)"
 
@@ -15250,20 +15320,20 @@ msgstr "KartÄ… per savaitÄ™"
 msgid "Once per month"
 msgstr "Kartą per mėnesį"
 
-#: ../modules/mail/em-mailer-prefs.c:289
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Header"
 msgstr "Antraštė"
 
-#: ../modules/mail/em-mailer-prefs.c:293
+#: ../modules/mail/em-mailer-prefs.c:297
 msgid "Contains Value"
 msgstr "Yra reikšmė"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1031
+#: ../modules/mail/em-mailer-prefs.c:1051
 msgid "_Date header:"
 msgstr "_Datos antraštė:"
 
-#: ../modules/mail/em-mailer-prefs.c:1032
+#: ../modules/mail/em-mailer-prefs.c:1052
 msgid "Show _original header value"
 msgstr "Rodyti _originalią antraštės reikšmę"
 
@@ -15307,32 +15377,32 @@ msgstr "OAuth"
 msgid "This option will connect to the server by way of the GNOME Online Accounts service"
 msgstr "Å i parinktis prisijungs prie serverio per GNOME Online Accounts tarnybÄ…"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "Autorius(iai)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:255
 msgid "Plugin Manager"
 msgstr "Įskiepių tvarkymas"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:270
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Pastaba: kai kurie atlikti pakeitimai neįsigalios, kol nepaleisite programos iš naujo"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:299
 msgid "Overview"
 msgstr "Apžvalga"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:368
+#: ../modules/plugin-manager/evolution-plugin-manager.c:451
 msgid "Plugin"
 msgstr "Įskiepis"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "_Plugins"
 msgstr "Į_skiepiai"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:490
 msgid "Enable and disable plugins"
 msgstr "Įjungti ar išjungti įskiepius"
 
@@ -15406,39 +15476,39 @@ msgstr "Naudoti tik vietinius brukalo testus."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Naudoti tik vietinius brukalo testus (be DNS)."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:279
+#: ../modules/startup-wizard/evolution-startup-wizard.c:280
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "Pasirinkite norima importuoti informacijÄ…:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:311
+#: ../modules/startup-wizard/evolution-startup-wizard.c:312
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:322
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:421
 msgid "Importing Files"
 msgstr "Failų importavimas"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:398
+#: ../modules/startup-wizard/evolution-startup-wizard.c:399
 msgid "Import cancelled. Click \"Forward\" to continue."
 msgstr "Importavimas atšauktas. Spustelėkite, „Toliau“ norėdami tęsti."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:416
+#: ../modules/startup-wizard/evolution-startup-wizard.c:417
 msgid "Import complete. Click \"Forward\" to continue."
 msgstr "Importavimas baigtas. Spustelėkite, „Toliau“ norėdami tęsti."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:496
+#: ../modules/startup-wizard/evolution-startup-wizard.c:497
 msgid "Evolution Setup Assistant"
 msgstr "Evolution sÄ…rankos pagelbiklis"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:502
+#: ../modules/startup-wizard/evolution-startup-wizard.c:503
 msgid "Welcome"
 msgstr "Sveiki"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:507
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 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"
@@ -15448,7 +15518,7 @@ msgstr ""
 "\n"
 "Norėdami tęsti spustelėkite mygtuką „Pirmyn“. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:612
+#: ../modules/startup-wizard/evolution-startup-wizard.c:613
 msgid "Loading accounts..."
 msgstr "Įkeliamos paskyros..."
 
@@ -15464,12 +15534,12 @@ msgstr "Vietinės adresų knygos"
 msgid "List of clues for the attachment reminder plugin to look for in a message body"
 msgstr "Sąrašas užuominų, kurių laiško tekste ieško „priminimo apie priedus“ įskiepis."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:125
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Daugiau neberodyti šios žinutės."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:457
-#: ../plugins/templates/templates.c:450
+#: ../plugins/attachment-reminder/attachment-reminder.c:464
+#: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Raktažodžiai"
 
@@ -15505,55 +15575,55 @@ msgstr "Įterptasis garsas"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Groti prisegtus garso failus tiesiogiai laiškuose."
 
-#: ../plugins/backup-restore/backup-restore.c:186
+#: ../plugins/backup-restore/backup-restore.c:223
 msgid "Select name of the Evolution backup file"
 msgstr "Pasirinkite pavadinimÄ… atsarginiam Evolution failui"
 
-#: ../plugins/backup-restore/backup-restore.c:219
+#: ../plugins/backup-restore/backup-restore.c:256
 msgid "_Restart Evolution after backup"
 msgstr "_Po kopijavimo paleisti Evolution iš naujo"
 
-#: ../plugins/backup-restore/backup-restore.c:245
+#: ../plugins/backup-restore/backup-restore.c:283
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Pasirinkite atkurtino atsarginio Evolution failo vardÄ…"
 
-#: ../plugins/backup-restore/backup-restore.c:258
+#: ../plugins/backup-restore/backup-restore.c:296
 msgid "_Restart Evolution after restore"
 msgstr "_Atkūrus paleisti Evolution iš naujo"
 
-#: ../plugins/backup-restore/backup-restore.c:326
+#: ../plugins/backup-restore/backup-restore.c:383
 msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
 msgstr "Galite atkurti Evolution iš atsarginės kopijos. Taip galite atkurti visus laiškus, kalendorius, užduotis, raštelius ir kontaktus. Taip pat atkuriami visi asmeniniai nustatymai, laiškų filtrai ir t. t."
 
-#: ../plugins/backup-restore/backup-restore.c:333
+#: ../plugins/backup-restore/backup-restore.c:393
 msgid "_Restore Evolution from the backup file"
 msgstr "_Atkurti Evolution iš atsarginio failo"
 
-#: ../plugins/backup-restore/backup-restore.c:340
+#: ../plugins/backup-restore/backup-restore.c:403
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Pasirinkite atkurtinÄ… Evolution archyvÄ…:"
 
-#: ../plugins/backup-restore/backup-restore.c:343
+#: ../plugins/backup-restore/backup-restore.c:407
 msgid "Choose a file to restore"
 msgstr "Pasirinkite atkurtinÄ… failÄ…"
 
-#: ../plugins/backup-restore/backup-restore.c:351
+#: ../plugins/backup-restore/backup-restore.c:421
 msgid "Restore from backup"
 msgstr "Atkurti iš atsarginės kopijos"
 
-#: ../plugins/backup-restore/backup-restore.c:389
+#: ../plugins/backup-restore/backup-restore.c:468
 msgid "_Back up Evolution Data..."
 msgstr "_Kurti atsarginę Evolution duomenų kopiją..."
 
-#: ../plugins/backup-restore/backup-restore.c:391
+#: ../plugins/backup-restore/backup-restore.c:470
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Įrašyti atsarginę Evolution duomenų ir nustatymų kopiją archyve"
 
-#: ../plugins/backup-restore/backup-restore.c:396
+#: ../plugins/backup-restore/backup-restore.c:475
 msgid "R_estore Evolution Data..."
 msgstr "Atk_urti Evolution duomenis..."
 
-#: ../plugins/backup-restore/backup-restore.c:398
+#: ../plugins/backup-restore/backup-restore.c:477
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Atkurti Evolution duomenis ir nustatymus iš archyvo"
 
@@ -15578,84 +15648,83 @@ msgid "With Graphical User Interface"
 msgstr "Su grafine naudotojo sÄ…saja"
 
 #. FIXME Will the versioned setting always work?
-#: ../plugins/backup-restore/backup.c:295
-#: ../plugins/backup-restore/backup.c:412
+#: ../plugins/backup-restore/backup.c:300
+#: ../plugins/backup-restore/backup.c:424
 msgid "Shutting down Evolution"
 msgstr "IÅ¡jungiama Evolution programa"
 
-#: ../plugins/backup-restore/backup.c:304
+#: ../plugins/backup-restore/backup.c:309
 msgid "Backing Evolution accounts and settings"
 msgstr "Kuriama Evolution paskyrų ir nustatymų kopija"
 
-#: ../plugins/backup-restore/backup.c:314
+#: ../plugins/backup-restore/backup.c:321
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "Kuriama Evolution duomenų (laiškų, kontaktų, kalendorių, užduo�ių, raštelių) kopija"
 
-#: ../plugins/backup-restore/backup.c:327
+#: ../plugins/backup-restore/backup.c:337
 msgid "Back up complete"
 msgstr "AtsarginÄ— kopija sukurta"
 
-#: ../plugins/backup-restore/backup.c:334
-#: ../plugins/backup-restore/backup.c:521
+#: ../plugins/backup-restore/backup.c:344
+#: ../plugins/backup-restore/backup.c:560
 msgid "Restarting Evolution"
 msgstr "Evolution paleidžiama iš naujo"
 
-#: ../plugins/backup-restore/backup.c:418
+#: ../plugins/backup-restore/backup.c:430
 msgid "Back up current Evolution data"
 msgstr "Sukurti atsarginę Evolution duomenų kopiją"
 
-#: ../plugins/backup-restore/backup.c:426
+#: ../plugins/backup-restore/backup.c:438
 msgid "Extracting files from back up"
 msgstr "Išskleidžiami failai iš atsarginės kopijos"
 
-#: ../plugins/backup-restore/backup.c:485
+#: ../plugins/backup-restore/backup.c:505
 msgid "Loading Evolution settings"
 msgstr "Įkeliami Evolution nustatymai"
 
-#: ../plugins/backup-restore/backup.c:502
+#: ../plugins/backup-restore/backup.c:541
 msgid "Removing temporary back up files"
 msgstr "IÅ¡trinami laikinieji atsarginiai failai"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:553
 msgid "Ensuring local sources"
 msgstr "Užtikrinami vietiniai šaltiniai"
 
-#: ../plugins/backup-restore/backup.c:699
+#: ../plugins/backup-restore/backup.c:748
+msgid "Evolution Back Up"
+msgstr "Atsarginė Evolution duomenų kopija"
+
+#: ../plugins/backup-restore/backup.c:749
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Įrašoma aplanke %s"
 
-#: ../plugins/backup-restore/backup.c:704
+#: ../plugins/backup-restore/backup.c:754
+msgid "Evolution Restore"
+msgstr "Evolution atkūrimas"
+
+#: ../plugins/backup-restore/backup.c:755
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Atkuriama iš aplanko %s"
 
-#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:728
-msgid "Evolution Back up"
-msgstr "Atsarginė Evolution duomenų kopija"
-
-#: ../plugins/backup-restore/backup.c:728
-msgid "Evolution Restore"
-msgstr "Evolution atkūrimas"
-
-#: ../plugins/backup-restore/backup.c:766
+#: ../plugins/backup-restore/backup.c:824
 msgid "Backing up Evolution Data"
 msgstr "Kuriama atsarginė Evolution duomenų kopija"
 
-#: ../plugins/backup-restore/backup.c:767
+#: ../plugins/backup-restore/backup.c:825
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Luktelėkite, kol Evolution sukurs atsarginę jūsų duomenų kopiją."
 
-#: ../plugins/backup-restore/backup.c:769
+#: ../plugins/backup-restore/backup.c:827
 msgid "Restoring Evolution Data"
 msgstr "Atkuriami Evolution duomenys"
 
-#: ../plugins/backup-restore/backup.c:770
+#: ../plugins/backup-restore/backup.c:828
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Luktelėkite, kol Evolution atkuria jūsų duomenis."
 
-#: ../plugins/backup-restore/backup.c:788
+#: ../plugins/backup-restore/backup.c:846
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Tai gali kiek užtrukti, priklausomai nuo jūsų paskyros duomenų kiekio."
 
@@ -15708,36 +15777,36 @@ msgstr "Norėdami sukurti atsarginę savo duomenų ir nustatymų kopiją, pirma
 msgid "To restore your data and settings, you must first close Evolution. Please make sure that you save any unsaved data before proceeding. This will delete all your current Evolution data and settings and restore them from your back up."
 msgstr "Norėdami atstatyti savo duomenis ir nustatymus, pirma turite užverti Evolution programą. Įsitikinkite, jog įrašėte visus neįrašytus duomenis. Šios operacijos metu bus ištrinti visi dabartiniai jūsų Evolution programos duomenys bei nustatymai ir atkurti iš atsarginių kopijų."
 
-#: ../plugins/bbdb/bbdb.c:675
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:686
+#: ../plugins/bbdb/bbdb.c:695
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatiniai kontaktai"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:710
 msgid "Create _address book entries when sending mails"
 msgstr "Siun�iant laiškus kurti įrašus _adresų knygelėje"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:716
 msgid "Select Address book for Automatic Contacts"
 msgstr "Pasirinkite adresų knygelę automatiniams kontaktams"
 
-#: ../plugins/bbdb/bbdb.c:720
+#: ../plugins/bbdb/bbdb.c:731
 msgid "Instant Messaging Contacts"
 msgstr "Tikralaikių pokalbių kontaktai"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:746
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Sinchronizuoti kontaktų informaciją ir paveikslėlius su Pidgin bi�iulių sąrašu"
 
-#: ../plugins/bbdb/bbdb.c:741
+#: ../plugins/bbdb/bbdb.c:752
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Pasirinkite adresų knygelę Pidgin bi�iulių sąrašui"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:763
 msgid "Synchronize with _buddy list now"
 msgstr "Sinchronizuoti su _bi�iulių sąrašu dabar"
 
@@ -15755,15 +15824,15 @@ msgstr ""
 "\n"
 "Jums atsakinėjant į laiškus, automatiškai papildo adresų knygą naujais vardais ir el. pašto adresais. Taip pat papildo tikralaikių pokalbių kontaktų informacija iš bi�iulių sąrašų."
 
-#: ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:214
 msgid "Authentication failed. Server requires correct login."
 msgstr "Nepavyko nustatyti tapatybÄ—s. Serveris reikalauja teisingo prisijungimo."
 
-#: ../plugins/caldav/caldav-browse-server.c:205
+#: ../plugins/caldav/caldav-browse-server.c:216
 msgid "Given URL cannot be found."
 msgstr "Nurodytasis URL nerastas."
 
-#: ../plugins/caldav/caldav-browse-server.c:209
+#: ../plugins/caldav/caldav-browse-server.c:220
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -15772,119 +15841,119 @@ msgstr ""
 "Serveris grąžino netikėtus duomenis.\n"
 "%d – %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:339
-#: ../plugins/caldav/caldav-browse-server.c:663
+#: ../plugins/caldav/caldav-browse-server.c:360
+#: ../plugins/caldav/caldav-browse-server.c:694
 msgid "Failed to parse server response."
 msgstr "Nepavyko apdoroti serverio atsakymo."
 
-#: ../plugins/caldav/caldav-browse-server.c:433
+#: ../plugins/caldav/caldav-browse-server.c:454
 msgid "Events"
 msgstr "Įvykiai"
 
-#: ../plugins/caldav/caldav-browse-server.c:455
+#: ../plugins/caldav/caldav-browse-server.c:476
 msgid "User's calendars"
 msgstr "Naudotojo kalendoriai"
 
-#: ../plugins/caldav/caldav-browse-server.c:564
-#: ../plugins/caldav/caldav-browse-server.c:732
+#: ../plugins/caldav/caldav-browse-server.c:588
+#: ../plugins/caldav/caldav-browse-server.c:763
 msgid "Failed to get server URL."
 msgstr "Nepavyko gauti serverio URL."
 
-#: ../plugins/caldav/caldav-browse-server.c:730
-#: ../plugins/caldav/caldav-browse-server.c:771
-#: ../plugins/caldav/caldav-browse-server.c:1430
+#: ../plugins/caldav/caldav-browse-server.c:761
+#: ../plugins/caldav/caldav-browse-server.c:802
+#: ../plugins/caldav/caldav-browse-server.c:1493
 msgid "Searching for user's calendars..."
 msgstr "Ieškoma naudotojo kalendorių..."
 
-#: ../plugins/caldav/caldav-browse-server.c:769
+#: ../plugins/caldav/caldav-browse-server.c:800
 msgid "Could not find any user calendar."
 msgstr "Nepavyko rasti jokių naudotojo kalendorių."
 
-#: ../plugins/caldav/caldav-browse-server.c:901
+#: ../plugins/caldav/caldav-browse-server.c:938
 #, c-format
 msgid "Previous attempt failed: %s"
 msgstr "Ankstesnis mÄ—ginimas nepavyko: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:903
+#: ../plugins/caldav/caldav-browse-server.c:940
 #, c-format
 msgid "Previous attempt failed with code %d"
 msgstr "Ankstesnis mÄ—ginimas nepavyko, klaidos kodas: %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:908
+#: ../plugins/caldav/caldav-browse-server.c:945
 #, c-format
 msgid "Enter password for user %s on server %s"
 msgstr "Įveskite naudotojo %s serveryje %s slaptažodį"
 
-#: ../plugins/caldav/caldav-browse-server.c:967
+#: ../plugins/caldav/caldav-browse-server.c:1008
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Nepavyko sukurti soap laiško URL „%s“"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1213
+#: ../plugins/caldav/caldav-browse-server.c:1266
 msgid "Searching folder content..."
 msgstr "Ieškoma aplanko turinio..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:257
+#: ../plugins/caldav/caldav-browse-server.c:1325
+#: ../plugins/caldav/caldav-source.c:261
 msgid "Server _handles meeting invitations"
 msgstr "Serveris _tvarko susitikimų pakvietimus"
 
-#: ../plugins/caldav/caldav-browse-server.c:1269
+#: ../plugins/caldav/caldav-browse-server.c:1332
 msgid "List of available calendars:"
 msgstr "Prieinamų kalendorių sąrašas:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1307
+#: ../plugins/caldav/caldav-browse-server.c:1370
 msgid "Supports"
 msgstr "Palaikymas"
 
-#: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:255
+#: ../plugins/caldav/caldav-browse-server.c:1397
+#: ../plugins/caldav/caldav-source.c:259
 msgid "User e_mail:"
 msgstr "Naudotojo el. pašto adresas:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1406
+#: ../plugins/caldav/caldav-browse-server.c:1469
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Nepavyko sukurti gijos: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1515
+#: ../plugins/caldav/caldav-browse-server.c:1585
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Serverio URL „%s“ nėra tinkamas URL"
 
-#: ../plugins/caldav/caldav-browse-server.c:1521
+#: ../plugins/caldav/caldav-browse-server.c:1591
 msgid "Browse for a CalDAV calendar"
 msgstr "Naršyti CalDAV kalendoriaus"
 
-#: ../plugins/caldav/caldav-source.c:236
-#: ../plugins/calendar-http/calendar-http.c:104
+#: ../plugins/caldav/caldav-source.c:240
+#: ../plugins/calendar-http/calendar-http.c:107
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:243
-#: ../plugins/calendar-http/calendar-http.c:138
-#: ../plugins/google-account-setup/google-contacts-source.c:351
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:145
+#: ../plugins/google-account-setup/google-contacts-source.c:359
 msgid "Use _secure connection"
 msgstr "Na_udoti saugų ryšį"
 
-#: ../plugins/caldav/caldav-source.c:245
-#: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:656
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
+#: ../plugins/caldav/caldav-source.c:249
+#: ../plugins/google-account-setup/google-contacts-source.c:337
+#: ../plugins/google-account-setup/google-source.c:669
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:269
 msgid "User_name:"
 msgstr "Naudotojo _vardas:"
 
-#: ../plugins/caldav/caldav-source.c:260
+#: ../plugins/caldav/caldav-source.c:264
 msgid "Brows_e server for a calendar"
 msgstr "Naršyti s_erveryje kalendoriaus"
 
-#: ../plugins/caldav/caldav-source.c:278
-#: ../plugins/calendar-file/calendar-file.c:195
-#: ../plugins/calendar-http/calendar-http.c:123
-#: ../plugins/calendar-weather/calendar-weather.c:403
-#: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/caldav/caldav-source.c:282
+#: ../plugins/calendar-file/calendar-file.c:204
+#: ../plugins/calendar-http/calendar-http.c:129
+#: ../plugins/calendar-weather/calendar-weather.c:421
+#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../plugins/google-account-setup/google-source.c:675
 msgid "Re_fresh:"
 msgstr "_Atnaujinti:"
 
@@ -15896,31 +15965,31 @@ msgstr "PridÄ—ti Evolution CalDAV palaikymÄ…."
 msgid "CalDAV Support"
 msgstr "CalDAV palaikymas"
 
-#: ../plugins/calendar-file/calendar-file.c:129
+#: ../plugins/calendar-file/calendar-file.c:134
 msgid "_Customize options"
 msgstr "_Individualizuoti parinktis"
 
-#: ../plugins/calendar-file/calendar-file.c:148
+#: ../plugins/calendar-file/calendar-file.c:153
 msgid "File _name:"
 msgstr "Failo _vardas:"
 
-#: ../plugins/calendar-file/calendar-file.c:152
+#: ../plugins/calendar-file/calendar-file.c:157
 msgid "Choose calendar file"
 msgstr "Pasirinkite kalendoriaus failÄ…"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:209
 msgid "On open"
 msgstr "AtvÄ—rus"
 
-#: ../plugins/calendar-file/calendar-file.c:201
+#: ../plugins/calendar-file/calendar-file.c:210
 msgid "On file change"
 msgstr "Pakeitus failÄ…"
 
-#: ../plugins/calendar-file/calendar-file.c:202
+#: ../plugins/calendar-file/calendar-file.c:211
 msgid "Periodically"
 msgstr "Periodiškai"
 
-#: ../plugins/calendar-file/calendar-file.c:217
+#: ../plugins/calendar-file/calendar-file.c:228
 msgid "Force read _only"
 msgstr "Priverstinai _tik skaitomas"
 
@@ -15932,7 +16001,7 @@ msgstr "Prideda kalendorių palaikymą Evolution programoje."
 msgid "Local Calendars"
 msgstr "Vietiniai kalendoriai"
 
-#: ../plugins/calendar-http/calendar-http.c:198
+#: ../plugins/calendar-http/calendar-http.c:207
 msgid "Userna_me:"
 msgstr "_Naudotojo vardas:"
 
@@ -15944,62 +16013,62 @@ msgstr "Pridėti žiniatinklio kalendorių palaikymą Evolution."
 msgid "Web Calendars"
 msgstr "Žiniatinklio kalendoriai"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Fog"
 msgstr "Oras: rūkas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Cloudy"
 msgstr "Oras: debesuota"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Cloudy Night"
 msgstr "Oras: debesuota naktis"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Overcast"
 msgstr "Oras: didelis debesuotumas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
+#: ../plugins/calendar-weather/calendar-weather.c:69
 msgid "Weather: Showers"
 msgstr "Oras: liūtys"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:70
 msgid "Weather: Snow"
 msgstr "Oras: sniegas"
 
-#: ../plugins/calendar-weather/calendar-weather.c:70
+#: ../plugins/calendar-weather/calendar-weather.c:71
 msgid "Weather: Sunny"
 msgstr "Oras: saulÄ—ta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:71
+#: ../plugins/calendar-weather/calendar-weather.c:72
 msgid "Weather: Clear Night"
 msgstr "Oras: giedra naktis"
 
-#: ../plugins/calendar-weather/calendar-weather.c:72
+#: ../plugins/calendar-weather/calendar-weather.c:73
 msgid "Weather: Thunderstorms"
 msgstr "Oras: perkūnija"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:239
 msgid "Select a location"
 msgstr "Pasirinkite vietovÄ™"
 
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:336
-#: ../plugins/calendar-weather/calendar-weather.c:381
+#: ../plugins/calendar-weather/calendar-weather.c:350
+#: ../plugins/calendar-weather/calendar-weather.c:398
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Jokia"
 
-#: ../plugins/calendar-weather/calendar-weather.c:456
+#: ../plugins/calendar-weather/calendar-weather.c:477
 msgid "_Units:"
 msgstr "_Vienetai:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:465
+#: ../plugins/calendar-weather/calendar-weather.c:486
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Metriniai (Celsijaus, cm ir t.t.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:468
+#: ../plugins/calendar-weather/calendar-weather.c:489
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperiniai (Farenheito, coliai ir t.t.)"
 
@@ -16011,7 +16080,7 @@ msgstr "Pridėti oro kalendorių palaikymą Evolution."
 msgid "Weather Calendars"
 msgstr "Orų prognozių kalendoriai"
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:284
 msgid "Importing Outlook Express data"
 msgstr "Importuojami Outlook Express duomenys"
 
@@ -16027,23 +16096,23 @@ msgstr "Outlook DBX importavimas"
 msgid "Outlook Express 5/6 personal folders (.dbx)"
 msgstr "Outlook Express 5/6 asmeniniai aplankai (.dbx)"
 
-#: ../plugins/default-source/default-source.c:87
+#: ../plugins/default-source/default-source.c:169
 msgid "Mark as _default address book"
 msgstr "Pažymėti _numatytaja adresų knyga"
 
-#: ../plugins/default-source/default-source.c:100
+#: ../plugins/default-source/default-source.c:183
 msgid "A_utocomplete with this address book"
 msgstr "Naudoti _automatinį užbaigimą su šia adresų knyga"
 
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-source/default-source.c:192
 msgid "Mark as _default calendar"
 msgstr "Pažymėti _numatytuoju kalendoriumi"
 
-#: ../plugins/default-source/default-source.c:110
+#: ../plugins/default-source/default-source.c:193
 msgid "Mark as _default task list"
 msgstr "Pažymėti _numatytuoju užduo�ių sąrašu"
 
-#: ../plugins/default-source/default-source.c:111
+#: ../plugins/default-source/default-source.c:194
 msgid "Mark as _default memo list"
 msgstr "Pažymėti _numatytuoju raštelių sąrašu"
 
@@ -16063,52 +16132,52 @@ msgstr "Pasirinktinių antraš�ių sąrašas"
 msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
 msgstr "Šis raktas nurodo pasirinktinių antraš�ių, kurias galite įterpti siun�iamame laiške, sąrašą. Antraštės ir antraštės reikšmės nurodymo formatas yra toks: pasirinktinės antraštės pavadinimas, po jo einantis ženklas „=“ ir „;“ atskirtos reikšmės"
 
-#: ../plugins/email-custom-header/email-custom-header.c:316
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sauga:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:320
+#: ../plugins/email-custom-header/email-custom-header.c:326
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Asmeniška"
 
-#: ../plugins/email-custom-header/email-custom-header.c:321
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Neklasifikuota"
 
-#: ../plugins/email-custom-header/email-custom-header.c:322
+#: ../plugins/email-custom-header/email-custom-header.c:328
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Apsaugota"
 
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:329
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Konfidencialu"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:330
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Slapta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:331
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Visiškai slapta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:382
+#: ../plugins/email-custom-header/email-custom-header.c:388
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../plugins/email-custom-header/email-custom-header.c:574
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_Pasirinktinė antraštė"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:833
+#: ../plugins/email-custom-header/email-custom-header.c:847
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16116,12 +16185,12 @@ msgstr ""
 "Pasirinktinės antraštės rakto reikšmės formatas yra:\n"
 "Pasirinkinės antraštės rakto reikšmių, atskirtų „;“, vardas."
 
-#: ../plugins/email-custom-header/email-custom-header.c:887
+#: ../plugins/email-custom-header/email-custom-header.c:901
 msgid "Key"
 msgstr "Raktas"
 
-#: ../plugins/email-custom-header/email-custom-header.c:903
-#: ../plugins/templates/templates.c:456
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:468
 msgid "Values"
 msgstr "Reikšmės"
 
@@ -16143,7 +16212,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr "Automatiškai paleisti redaktorių, kai laiško rengyklėje paspaudžiamas klavišas"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:131
+#: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatiškai paleisti, kai redaguojamas naujas laiškas"
 
@@ -16155,11 +16224,11 @@ msgstr "Numatytoji išorinė rengyklė"
 msgid "The default command that must be used as the editor."
 msgstr "Numatytoji komanda, naudotina kaip rengyklÄ—."
 
-#: ../plugins/external-editor/external-editor.c:120
+#: ../plugins/external-editor/external-editor.c:121
 msgid "Command to be executed to launch the editor: "
 msgstr "Rengyklę paleidžianti komanda:"
 
-#: ../plugins/external-editor/external-editor.c:121
+#: ../plugins/external-editor/external-editor.c:122
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16167,8 +16236,8 @@ msgstr ""
 "Emacs rengyklei naudokite „xemacs“\n"
 "VIM rengyklei naudokite „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:399
-#: ../plugins/external-editor/external-editor.c:401
+#: ../plugins/external-editor/external-editor.c:402
+#: ../plugins/external-editor/external-editor.c:404
 msgid "Compose in External Editor"
 msgstr "Rašyti laišką išorinėje rengyklėje"
 
@@ -16212,23 +16281,23 @@ msgstr "Įterpti veido paveikslėlį, jei nenurodyta kitaip"
 msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
 msgstr "Ar įterpti veido paveikslėlį išsiun�iamuose laiškuose, jei nenurodyta kitaip. Prieš pažymint šią parinktį turėtų būti nustatytas paveikslėlis, antraip nieko nenutiks."
 
-#: ../plugins/face/face.c:286
+#: ../plugins/face/face.c:292
 msgid "Select a Face Picture"
 msgstr "Pasirinkite paveikslėlį"
 
-#: ../plugins/face/face.c:296
+#: ../plugins/face/face.c:302
 msgid "Image files"
 msgstr "Paveikslėlių failai"
 
-#: ../plugins/face/face.c:352
+#: ../plugins/face/face.c:359
 msgid "_Insert Face picture by default"
 msgstr "Į_terpti veido paveikslėlį, jei nenurodyta kitaip"
 
-#: ../plugins/face/face.c:363
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Įkelti naują _veido paveikslėlį"
 
-#: ../plugins/face/face.c:420
+#: ../plugins/face/face.c:429
 msgid "Include _Face"
 msgstr "Įterpti _veidą"
 
@@ -16260,17 +16329,17 @@ msgstr "Å io failo nepavyko perskaityti"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Jūsų pasirinktas failas neatrodo kaip tinkamas .png paveikslėlis. Klaida: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:317
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
+#: ../plugins/google-account-setup/google-contacts-source.c:325
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
 msgid "Server"
 msgstr "Serveris"
 
-#: ../plugins/google-account-setup/google-source.c:447
+#: ../plugins/google-account-setup/google-source.c:459
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Įveskite naudotojo %s slaptažodį, kad gautumėt užsakytų kalendorių sąrašą."
 
-#: ../plugins/google-account-setup/google-source.c:564
+#: ../plugins/google-account-setup/google-source.c:576
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16279,17 +16348,17 @@ msgstr ""
 "Nepavyko perskaityti duomenų iš Google serverio.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:803
-#: ../plugins/mail-to-task/mail-to-task.c:1066
+#: ../plugins/google-account-setup/google-source.c:576
+#: ../plugins/mail-to-task/mail-to-task.c:820
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Unknown error."
 msgstr "Nežinoma klaida."
 
-#: ../plugins/google-account-setup/google-source.c:667
+#: ../plugins/google-account-setup/google-source.c:679
 msgid "Cal_endar:"
 msgstr "Kal_endorius:"
 
-#: ../plugins/google-account-setup/google-source.c:702
+#: ../plugins/google-account-setup/google-source.c:714
 msgid "Retrieve _List"
 msgstr "Gauti _sąrašą"
 
@@ -16309,12 +16378,12 @@ msgstr "Įterptasis paveikslėlis"
 msgid "View image attachments directly in mail messages."
 msgstr "Rodyti prisegtus paveikslėlius tiesiogiai laiškuose."
 
-#: ../plugins/imap-features/imap-headers.c:329
+#: ../plugins/imap-features/imap-headers.c:337
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Pasirinktinės antraštės"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:349
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP antraštės"
@@ -16360,248 +16429,247 @@ msgid "IMAP Features"
 msgstr "IMAP funkcijos"
 
 #. Translators: The first '%s' is replaced with a calendar name,
-#. the second '%s' with an error message
-#: ../plugins/itip-formatter/itip-formatter.c:490
+#. * the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:499
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Nepavyko įkelti kalendoriaus „%s“ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:645
+#: ../plugins/itip-formatter/itip-formatter.c:659
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Paskyrimas kalendoriuje „%s“ konfliktuoja su šiuo susitikimu"
 
-#: ../plugins/itip-formatter/itip-formatter.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:683
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Paskyrimas rastas kalendoriuje „%s“"
 
-#: ../plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find any calendars"
 msgstr "Nepavyko rasti jokių kalendorių"
 
-#: ../plugins/itip-formatter/itip-formatter.c:782
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nepavyko rasti Å¡io susitikimo jokiame kalendoriuje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:786
+#: ../plugins/itip-formatter/itip-formatter.c:800
 msgid "Unable to find this task in any task list"
 msgstr "Nepavyko rasti šios užduoties jokiame užduo�ių sąraše"
 
-#: ../plugins/itip-formatter/itip-formatter.c:790
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find this memo in any memo list"
 msgstr "Nepavyko rasti šio raštelio jokiame raštelių sąraše"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1067
+#: ../plugins/itip-formatter/itip-formatter.c:1082
 msgid "Opening the calendar. Please wait..."
 msgstr "Atveriamas kalendorius. LuktelÄ—kite..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1070
+#: ../plugins/itip-formatter/itip-formatter.c:1085
 msgid "Searching for an existing version of this appointment"
 msgstr "Ieškoma egzistuojan�ios šio paskyrimo versijos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1343
+#: ../plugins/itip-formatter/itip-formatter.c:1362
 msgid "Unable to parse item"
 msgstr "Nepavyko apdoroti elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1432
+#: ../plugins/itip-formatter/itip-formatter.c:1451
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Nepavyko nusiųsti elemento į kalendorių „%s“.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1444
+#: ../plugins/itip-formatter/itip-formatter.c:1463
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Siųsti į kalendorių „%s“ kaip priimtą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1448
+#: ../plugins/itip-formatter/itip-formatter.c:1467
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Siųsti į kalendorių „%s“ kaip bandomąjį"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1453
+#: ../plugins/itip-formatter/itip-formatter.c:1472
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Siųsti į kalendorių „%s“ kaip atmestą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1458
+#: ../plugins/itip-formatter/itip-formatter.c:1477
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Siųsti į kalendorių „%s“ kaip atšauktą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1552
+#: ../plugins/itip-formatter/itip-formatter.c:1579
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizatorius pašalino atstovą %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1559
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Atstovui išsiųstas pranešimas apie atšaukimą"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1561
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Nepavyko išsiųsti pranešimo apie atšaukimą atstovui"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1672
+#: ../plugins/itip-formatter/itip-formatter.c:1700
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Nepavyko atnaujinti dalyvio būsenos, nes būsena yra neteisinga"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1701
+#: ../plugins/itip-formatter/itip-formatter.c:1729
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Nepavyko atnaujinti dalyvio. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1705
+#: ../plugins/itip-formatter/itip-formatter.c:1733
 msgid "Attendee status updated"
 msgstr "Dalyvio būsena atnaujinta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Dalyvio būsena negali būti atnaujinta, nes pasirinko elemento nebėra"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1759
 msgid "Meeting information sent"
 msgstr "Susitikimo informacija išsiųsta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid "Task information sent"
 msgstr "Užduoties informacija išsiųsta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1737
+#: ../plugins/itip-formatter/itip-formatter.c:1765
 msgid "Memo information sent"
 msgstr "Raštelio informacija išsiųsta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1746
+#: ../plugins/itip-formatter/itip-formatter.c:1774
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Nepavyko išsiųsti susitikimo informacijos, nes susitikimas neegzistuoja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1749
+#: ../plugins/itip-formatter/itip-formatter.c:1777
 msgid "Unable to send task information, the task does not exist"
 msgstr "Nepavyko išsiųsti užduoties informacijos, nes užduotis neegzistuoja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1752
+#: ../plugins/itip-formatter/itip-formatter.c:1780
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Nepavyko išsiųsti raštelio informacijos, nes raštelis neegzistuoja"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1817
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "calendar.ics"
 msgstr "kalendorius.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1822
+#: ../plugins/itip-formatter/itip-formatter.c:1851
 msgid "Save Calendar"
 msgstr "Įrašyti kalendorių"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1880
-#: ../plugins/itip-formatter/itip-formatter.c:1891
+#: ../plugins/itip-formatter/itip-formatter.c:1914
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The calendar attached is not valid"
 msgstr "Prisegtas kalendorius yra netinkamas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1881
-#: ../plugins/itip-formatter/itip-formatter.c:1892
+#: ../plugins/itip-formatter/itip-formatter.c:1915
+#: ../plugins/itip-formatter/itip-formatter.c:1926
 msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
 msgstr "Laiške nurodoma, kad jame yra kalendorius, bet kalendorius nėra tinkamas iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1932
-#: ../plugins/itip-formatter/itip-formatter.c:1960
-#: ../plugins/itip-formatter/itip-formatter.c:2069
+#: ../plugins/itip-formatter/itip-formatter.c:1966
+#: ../plugins/itip-formatter/itip-formatter.c:1994
+#: ../plugins/itip-formatter/itip-formatter.c:2103
 msgid "The item in the calendar is not valid"
 msgstr "Elementas kalendoriuje yra netinkamas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1933
-#: ../plugins/itip-formatter/itip-formatter.c:1961
-#: ../plugins/itip-formatter/itip-formatter.c:2070
+#: ../plugins/itip-formatter/itip-formatter.c:1967
+#: ../plugins/itip-formatter/itip-formatter.c:1995
+#: ../plugins/itip-formatter/itip-formatter.c:2104
 msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
 msgstr "Šiame laiške yra kalendorius, bet kalendoriuje nėra jokių įvykių, užduo�ių ar užimtumo informacijos"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1974
+#: ../plugins/itip-formatter/itip-formatter.c:2008
 msgid "The calendar attached contains multiple items"
 msgstr "Prisegtame kalendoriuje yra keletas elementų"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1975
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid "To process all of these items, the file should be saved and the calendar imported"
 msgstr "Norint apdoroti visus šiuos elementus, failas turėtų būti išsaugotas ir kalendorius importuotas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2633
+#: ../plugins/itip-formatter/itip-formatter.c:2665
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2649
+#: ../plugins/itip-formatter/itip-formatter.c:2681
 msgid "Tentatively Accepted"
 msgstr "Preliminariai priimtas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2767
+#: ../plugins/itip-formatter/itip-formatter.c:2799
 msgid "This meeting recurs"
 msgstr "Šis įvykis pasikartoja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2770
+#: ../plugins/itip-formatter/itip-formatter.c:2802
 msgid "This task recurs"
 msgstr "Ši užduotis pasikartoja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2773
+#: ../plugins/itip-formatter/itip-formatter.c:2805
 msgid "This memo recurs"
 msgstr "Šis raštelis pasikartoja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2992
-#| msgid "Meeting invitations"
+#: ../plugins/itip-formatter/itip-formatter.c:3029
 msgid "Meeting Invitations"
 msgstr "Susitikimų kvietimai"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:3017
+#: ../plugins/itip-formatter/itip-formatter.c:3054
 msgid "_Delete message after acting"
 msgstr "_Po įvykio laišką ištrinti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3027
-#: ../plugins/itip-formatter/itip-formatter.c:3060
+#: ../plugins/itip-formatter/itip-formatter.c:3064
+#: ../plugins/itip-formatter/itip-formatter.c:3097
 msgid "Conflict Search"
 msgstr "Konfliktų paieška"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3042
+#: ../plugins/itip-formatter/itip-formatter.c:3079
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Pasirinkite kalendorius, kuriuose ieškosite susitikimų konfliktų"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Å iandien %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Å iandien %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Å iandien %H:%M:%S"
 
 #. strftime format of a time,
-#. in 24-hour format, without seconds.
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Rytoj %H:%M"
 
 #. strftime format of a time,
-#. in 24-hour format.
+#. * in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Rytoj %H:%M:%S"
 
 #. strftime format of a time,
-#. in 12-hour format, without seconds.
+#. * in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Rytoj %H:%M"
 
 #. strftime format of a time,
-#. in 12-hour format.
+#. * in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Rytoj %H:%M:%S"
@@ -16613,56 +16681,56 @@ msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
-#. without a year.
+#. * without a year.
 #: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
-#. without a year and a time,
-#. in 24-hour format, without seconds.
+#. * without a year and a time,
+#. * in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 24-hour format.
+#. * and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format, without seconds.
+#. * and a time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
-#. and a time, in 12-hour format.
+#. * and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
@@ -16673,365 +16741,365 @@ msgid "%A, %B %e, %Y"
 msgstr "%A, %Y %B %e"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
+#. * time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %Y %B %e, %H:%M"
 
 #. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
+#. * time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %Y %B %e, %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
+#. * time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %Y %B %e, %l:%M %p"
 
 #. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
+#. * time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %Y %B %e, %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#: ../plugins/itip-formatter/itip-view.c:363
-#: ../plugins/itip-formatter/itip-view.c:450
-#: ../plugins/itip-formatter/itip-view.c:451
-#: ../plugins/itip-formatter/itip-view.c:538
+#: ../plugins/itip-formatter/itip-view.c:364
+#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:452
+#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:540
 msgid "An unknown person"
 msgstr "Nežinomas asmuo"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:542
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Prašome atsakyti %s vardu"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#: ../plugins/itip-formatter/itip-view.c:457
-#: ../plugins/itip-formatter/itip-view.c:544
+#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:459
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Gauta %s vardu"
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s per %s paskelbÄ— Å¡iÄ… susitikimo informacijÄ…:"
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s paskelbÄ— Å¡iÄ… susitikimo informacijÄ…:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:383
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s jums pavedė šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:386
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s per %s pageidauja, kad dalyvautumÄ—te Å¡iame susitikime:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:388
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s pageidauja, kad dalyvautumÄ—te Å¡iame susitikime:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:394
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s per %s nori papildyti esamÄ… susitikimÄ…:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s nori papildyti esamÄ… susitikimÄ…:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:400
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following meeting:"
 msgstr "%s per %s nori gauti naujausią informaciją apie šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:402
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s nori gauti naujausią informaciją apie šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s per %s atsiuntė šį atsakymą apie susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s atsiuntė šį atsakymą apie susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:410
+#: ../plugins/itip-formatter/itip-view.c:412
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s per %s atšaukė šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
-msgid "%s has canceled the following meeting."
-msgstr "%s atšaukė šį susitikimą."
+msgid "%s has canceled the following meeting:"
+msgstr "%s atšaukė šį susitikimą:"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s per %s pasiūlė šiuos susitikimo pakeitimus."
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
-msgid "%s has proposed the following meeting changes."
-msgstr "%s pasiūlė šiuos susitikimo pakeitimus."
+msgid "%s has proposed the following meeting changes:"
+msgstr "%s pasiūlė šiuos susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s per %s atmetÄ— Å¡iuos susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
-msgid "%s has declined the following meeting changes."
-msgstr "%s atmetÄ— Å¡iuos susitikimo pakeitimus."
+msgid "%s has declined the following meeting changes:"
+msgstr "%s atmetÄ— Å¡iuos susitikimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:464
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s per %s paskelbė šią užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:466
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s paskelbė šią užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:471
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s prašo priskirti naudotojui %s šią užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:474
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s per %s priskyrė jums užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s priskyrė jums užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s per %s nori papildyti esamą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s nori papildyti esamą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
 msgid "%s through %s wishes to receive the latest information for the following assigned task:"
 msgstr "%s per %s nori gauti naujausią informaciją apie šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:490
 #, c-format
 msgid "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s nori gauti naujausią informaciją apie šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s per %s atsiuntė šį atsakymą apie priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:496
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s atsiuntė šį atsakymą apie priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s per %s atšaukė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s atšaukė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:504
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s per %s pasiūlė šiuos užduoties priskyrimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:506
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s pasiūlė šiuos užduoties priskyrimo pakeitimus:"
 
-#: ../plugins/itip-formatter/itip-view.c:510
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s per %s atmetė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:512
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s atmetė šią priskirtą užduotį:"
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s per %s paskelbė šį raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:551
+#: ../plugins/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s paskelbė šį raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:558
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s per %s nori papildyti esamą raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:558
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s nori papildyti esamą raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:562
+#: ../plugins/itip-formatter/itip-view.c:564
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s per %s atšaukė šį viešinamą raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:564
+#: ../plugins/itip-formatter/itip-view.c:566
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s atšaukė šį viešinamą raštelį:"
 
-#: ../plugins/itip-formatter/itip-view.c:688
+#: ../plugins/itip-formatter/itip-view.c:690
 msgid "All day:"
 msgstr "VisÄ… dienÄ…:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:700
 msgid "Start day:"
 msgstr "Pradžios data:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1055
+#: ../plugins/itip-formatter/itip-view.c:700
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Start time:"
 msgstr "Pradžios laikas:"
 
-#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:712
 msgid "End day:"
 msgstr "Pabaigos data:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../plugins/itip-formatter/itip-view.c:712
+#: ../plugins/itip-formatter/itip-view.c:1073
 msgid "End time:"
 msgstr "Pabaigos laikas:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Open Calendar"
 msgstr "_Atverti kalendorių"
 
-#: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:860
-#: ../plugins/itip-formatter/itip-view.c:877
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:881
+#: ../plugins/itip-formatter/itip-view.c:886
 msgid "_Decline"
 msgstr "_Atmesti"
 
-#: ../plugins/itip-formatter/itip-view.c:851
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:879
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "A_ccept"
 msgstr "Pr_iimti"
 
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Decline all"
 msgstr "_Atmesti visus"
 
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Tentative all"
 msgstr "_Laikinai priimti visus"
 
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:878
-#: ../plugins/itip-formatter/itip-view.c:883
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:887
 msgid "_Tentative"
 msgstr "_Laikinai priimti"
 
-#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "A_ccept all"
 msgstr "Pr_iimti visus"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Send Information"
 msgstr "_Siųsti informaciją"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:871
+#: ../plugins/itip-formatter/itip-view.c:875
 msgid "_Update Attendee Status"
 msgstr "_Atnaujinti dalyvių būseną"
 
-#: ../plugins/itip-formatter/itip-view.c:874
+#: ../plugins/itip-formatter/itip-view.c:878
 msgid "_Update"
 msgstr "_Atnaujinti"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1086
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1093
+#: ../plugins/itip-formatter/itip-view.c:1147
 msgid "Comment:"
 msgstr "Komentaras:"
 
-#: ../plugins/itip-formatter/itip-view.c:1125
+#: ../plugins/itip-formatter/itip-view.c:1132
 msgid "Send _reply to sender"
 msgstr "Siųsti _atsakymą siuntėjui"
 
-#: ../plugins/itip-formatter/itip-view.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "Send _updates to attendees"
 msgstr "Siųsti atna_ujinimus dalyviams"
 
-#: ../plugins/itip-formatter/itip-view.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "_Apply to all instances"
 msgstr "Pritaikyti visiems _atvejams"
 
-#: ../plugins/itip-formatter/itip-view.c:1173
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "Show time as _free"
 msgstr "Rodyti laikÄ… kaip _laisvÄ…"
 
-#: ../plugins/itip-formatter/itip-view.c:1176
+#: ../plugins/itip-formatter/itip-view.c:1183
 msgid "_Preserve my reminder"
 msgstr "_IÅ¡saugoti mano priminimÄ…"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1182
+#: ../plugins/itip-formatter/itip-view.c:1189
 msgid "_Inherit reminder"
 msgstr "_Perimti priminimÄ…"
 
-#: ../plugins/itip-formatter/itip-view.c:1925
+#: ../plugins/itip-formatter/itip-view.c:1965
 msgid "_Tasks:"
 msgstr "_Užduotys"
 
-#: ../plugins/itip-formatter/itip-view.c:1927
+#: ../plugins/itip-formatter/itip-view.c:1967
 msgid "_Memos:"
 msgstr "_Rašteliai:"
 
@@ -17103,7 +17171,7 @@ msgstr "Ar groti garsinį failą gavus naujų laiškų"
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Ar pranešti apie naujus laiškus tik Gautų laiškų aplanke."
 
-#: ../plugins/mail-notification/mail-notification.c:391
+#: ../plugins/mail-notification/mail-notification.c:392
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -17123,12 +17191,12 @@ msgstr[2] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:416
+#: ../plugins/mail-notification/mail-notification.c:417
 #, c-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:428
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -17136,44 +17204,44 @@ msgstr[0] "Gavote %d naują laišką."
 msgstr[1] "Gavote %d naujus laiškus."
 msgstr[2] "Gavote %d naujų laiškų."
 
-#: ../plugins/mail-notification/mail-notification.c:436
-#: ../plugins/mail-notification/mail-notification.c:444
-#: ../plugins/mail-notification/mail-notification.c:447
+#: ../plugins/mail-notification/mail-notification.c:437
+#: ../plugins/mail-notification/mail-notification.c:445
+#: ../plugins/mail-notification/mail-notification.c:448
 msgid "New email"
 msgstr "Naujas paštas"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:468
+#: ../plugins/mail-notification/mail-notification.c:469
 #, c-format
 msgid "Show %s"
 msgstr "Rodyti %s"
 
-#: ../plugins/mail-notification/mail-notification.c:670
+#: ../plugins/mail-notification/mail-notification.c:674
 msgid "_Play sound when a new message arrives"
 msgstr "_Gavus naujų laiškų, sugroti garsą"
 
-#: ../plugins/mail-notification/mail-notification.c:700
+#: ../plugins/mail-notification/mail-notification.c:704
 msgid "_Beep"
 msgstr "_PyptelÄ—ti"
 
-#: ../plugins/mail-notification/mail-notification.c:713
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "Use sound _theme"
 msgstr "Naudoti garsų _temą"
 
-#: ../plugins/mail-notification/mail-notification.c:732
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Play _file:"
 msgstr "Groti _garso failÄ…:"
 
-#: ../plugins/mail-notification/mail-notification.c:741
+#: ../plugins/mail-notification/mail-notification.c:745
 msgid "Select sound file"
 msgstr "Pasirinkite garso failÄ…"
 
-#: ../plugins/mail-notification/mail-notification.c:798
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Pranešti tik gavus naujų laiškų _Gautų laiškų aplanke"
 
-#: ../plugins/mail-notification/mail-notification.c:808
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr "Rodyti _perspėjimą kai ateina naujas pranešimas"
 
@@ -17186,113 +17254,113 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Informuoja jus, kai gaunama naujų laiškų."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:235
+#: ../plugins/mail-to-task/mail-to-task.c:239
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Sukurta iš laiško, kurį atsiuntė %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/mail-to-task/mail-to-task.c:610
 #, c-format
 msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
 msgstr "Pasirinktame kalendoriuje jau yra įvykis „%s“. Ar norite taisyti senąjį įvykį?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:596
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
 msgstr "Pasirinktame užduo�ių sąraše jau yra užduotis „%s“. Ar norite taisyti senąją užduotį?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
 msgstr "Pasirinktame raštelių sąraše jau yra raštelis „%s“. Ar norite taisyti senąjį raštelį?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:633
 #, c-format
 msgid "You have selected %d mails to be converted to events. Do you really want to add them all?"
 msgstr "Jūs pasirinkote %d laiškų konvertavimui į įvykius. Ar tikrai norite pridėti juos visus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:636
 #, c-format
 msgid "You have selected %d mails to be converted to tasks. Do you really want to add them all?"
 msgstr "Jūs pasirinkote %d laiškų konvertavimui į užduotis. Ar tikrai norite pridėti juos visus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid "You have selected %d mails to be converted to memos. Do you really want to add them all?"
 msgstr "Jūs pasirinkote %d laiškų konvertavimui į įsiminimus. Ar tikrai norite pridėti juos visus?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:641
+#: ../plugins/mail-to-task/mail-to-task.c:658
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Ar norite tęsti likusių laiškų konvertavimą?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:716
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "[No Summary]"
 msgstr "[NÄ—ra santraukos]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:728
+#: ../plugins/mail-to-task/mail-to-task.c:745
 msgid "Invalid object returned from a server"
 msgstr "Netinkamas objektas grąžintas iš serverio"
 
-#: ../plugins/mail-to-task/mail-to-task.c:778
+#: ../plugins/mail-to-task/mail-to-task.c:795
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Apdorojant įvyko klaida: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:803
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Nepavyko atverti kalendoriaus. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:810
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid "Selected source is read only, thus cannot create event there. Select other source, please."
 msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti įvykių. Pasirinkite kitą šaltinį."
 
-#: ../plugins/mail-to-task/mail-to-task.c:813
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid "Selected source is read only, thus cannot create task there. Select other source, please."
 msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti užduo�ių. Pasirinkite kitą šaltinį."
 
-#: ../plugins/mail-to-task/mail-to-task.c:816
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
 msgstr "Pažymėtasis šaltinis skirtas tik skaitymui, todėl jame negalima kurti raštelių. Pasirinkite kitą šaltinį."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1066
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Nepavyko gauti šaltinio sąrašo. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1127
+#: ../plugins/mail-to-task/mail-to-task.c:1147
 msgid "No writable calendar is available."
 msgstr "Nėra rašomo kalendoriaus."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1219
+#: ../plugins/mail-to-task/mail-to-task.c:1239
 msgid "Create an _Event"
 msgstr "Sukurti į_vykį"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1221
+#: ../plugins/mail-to-task/mail-to-task.c:1241
 msgid "Create a new event from the selected message"
 msgstr "Sukurti naują įvykį iš pasirinkto laiško"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1226
+#: ../plugins/mail-to-task/mail-to-task.c:1246
 msgid "Create a Mem_o"
 msgstr "Sukurti _raštelį"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1228
+#: ../plugins/mail-to-task/mail-to-task.c:1248
 msgid "Create a new memo from the selected message"
 msgstr "Sukurti naują raštelį iš pasirinkto laiško"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1233
+#: ../plugins/mail-to-task/mail-to-task.c:1253
 msgid "Create a _Task"
 msgstr "Sukurti _užduotį"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1235
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create a new task from the selected message"
 msgstr "Sukurti naują užduotį iš pasirinkto laiško"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1243
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a _Meeting"
 msgstr "Sukurti _susitikimÄ…"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1245
+#: ../plugins/mail-to-task/mail-to-task.c:1265
 msgid "Create a new meeting from the selected message"
 msgstr "Sukurti naują susitikimą iš pasirinkto laiško"
 
@@ -17300,55 +17368,55 @@ msgstr "Sukurti naują susitikimą iš pasirinkto laiško"
 msgid "Convert a mail message to a task."
 msgstr "Konvertuoti pasirinktą laišką į užduotį."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:345
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:346
 msgid "Get List _Archive"
 msgstr "Gauti konferencijos _archyvÄ…"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:347
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:348
 msgid "Get an archive of the list this message belongs to"
 msgstr "Gauti konferencijos, kuriai priklauso šis laiškas, archyvą"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:352
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:353
 msgid "Get List _Usage Information"
 msgstr "Gauti konferencijos _naudojimosi informacijÄ…"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:354
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:355
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Gauti konferencijos, kuriai priklauso šis laiškas, naudojimosi informaciją"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:359
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:360
 msgid "Contact List _Owner"
 msgstr "Susisiekti su konferencijos _savininku"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:361
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:362
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Susisiekti su konferencijos, kuriai priklauso šis laiškas, savininku"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "_Post Message to List"
 msgstr "_Rašyti laišką į konferenciją"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Rašyti laišką į konferenciją, kuriai priklauso šis laiškas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "_Subscribe to List"
 msgstr "_Užsisakyti konferenciją"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Užsisakyti pašto konferenciją, kuriai priklauso šis laiškas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "_Unsubscribe from List"
 msgstr "Atsisak_yti konferencijos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Atsisakyti pašto konferencijos, kuriai priklauso šis laiškas"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Mailing _List"
 msgstr "Pašto _konferencija"
 
@@ -17434,15 +17502,15 @@ msgstr "Taip pat pažymėti laiškus poaplankiuose?"
 msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
 msgstr "Ar norite pažymėti laiškus kaip skaitytus tik esamame aplanke ar ir jo poaplankiuose?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:213
+#: ../plugins/mark-all-read/mark-all-read.c:215
 msgid "In Current Folder and _Subfolders"
 msgstr "Esamame aplanke ir _poaplankiuose"
 
-#: ../plugins/mark-all-read/mark-all-read.c:227
+#: ../plugins/mark-all-read/mark-all-read.c:229
 msgid "In Current _Folder Only"
 msgstr "Tik esamame _aplanke"
 
-#: ../plugins/mark-all-read/mark-all-read.c:573
+#: ../plugins/mark-all-read/mark-all-read.c:575
 msgid "Mark Me_ssages as Read"
 msgstr "Pažy_mėti laiškus skaitytais"
 
@@ -17467,35 +17535,35 @@ msgstr "Teikti pirmenybÄ™ grynajam tekstui"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Rodyti laiškus kaip grynąjį tekstą, netgi jeigu juose yra HTML turinio."
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
 msgstr "Rodyti HTML, jei jis yra"
 
-#: ../plugins/prefer-plain/prefer-plain.c:241
+#: ../plugins/prefer-plain/prefer-plain.c:252
 msgid "Let Evolution choose the best part to show."
 msgstr "Leisti Evolution pasirinkti geriausią rodytiną dalį."
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Show plain text if present"
 msgstr "Rodyti grynąjį tekstą, jei jis yra"
 
-#: ../plugins/prefer-plain/prefer-plain.c:242
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
 msgstr "Rodyti grynojo teksto dalį, jei ji yra, kitu atveju, leisti Evolution pasirinkti geriausią rodytiną dalį."
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:260
 msgid "Only ever show plain text"
 msgstr "Visada rodyti tik grynąjį tekstą"
 
-#: ../plugins/prefer-plain/prefer-plain.c:243
+#: ../plugins/prefer-plain/prefer-plain.c:261
 msgid "Always show plain text part and make attachments from other parts, if requested."
 msgstr "Visada rodyti grynojo teksto dalį, o kitas dalis prisegti kaip priedus, jei prašoma."
 
-#: ../plugins/prefer-plain/prefer-plain.c:290
+#: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Rodyti _paslÄ—ptas HTML dalis kaip priedus"
 
-#: ../plugins/prefer-plain/prefer-plain.c:310
+#: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
 msgstr "HTML _veiksena"
 
@@ -17511,39 +17579,39 @@ msgstr "Outlook PST importavimas"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook asmeniniai aplankai (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:436
+#: ../plugins/pst-import/pst-importer.c:452
 msgid "_Mail"
 msgstr "_Paštas"
 
-#: ../plugins/pst-import/pst-importer.c:455
+#: ../plugins/pst-import/pst-importer.c:471
 msgid "Destination folder:"
 msgstr "Paskirties aplankas:"
 
-#: ../plugins/pst-import/pst-importer.c:461
+#: ../plugins/pst-import/pst-importer.c:478
 msgid "_Address Book"
 msgstr "_Adresų knyga"
 
-#: ../plugins/pst-import/pst-importer.c:462
+#: ../plugins/pst-import/pst-importer.c:482
 msgid "A_ppointments"
 msgstr "_Paskyrimai"
 
-#: ../plugins/pst-import/pst-importer.c:463
+#: ../plugins/pst-import/pst-importer.c:486
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Užduotys"
 
-#: ../plugins/pst-import/pst-importer.c:464
+#: ../plugins/pst-import/pst-importer.c:490
 msgid "_Journal entries"
 msgstr "_Žurnalo įrašai"
 
-#: ../plugins/pst-import/pst-importer.c:567
+#: ../plugins/pst-import/pst-importer.c:600
 msgid "Importing Outlook data"
 msgstr "Importuojami Outlook duomenys"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:146
-#: ../plugins/publish-calendar/publish-calendar.c:154
-#: ../plugins/publish-calendar/publish-calendar.c:156
+#: ../plugins/publish-calendar/publish-calendar.c:147
+#: ../plugins/publish-calendar/publish-calendar.c:155
+#: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
 msgstr "Kalendorių publikavimas"
 
@@ -17555,49 +17623,49 @@ msgstr "Vietos"
 msgid "Publish calendars to the web."
 msgstr "Skelbkite kalendorius žiniatinklyje."
 
-#: ../plugins/publish-calendar/publish-calendar.c:212
-#: ../plugins/publish-calendar/publish-calendar.c:453
+#: ../plugins/publish-calendar/publish-calendar.c:216
+#: ../plugins/publish-calendar/publish-calendar.c:463
 #, c-format
 msgid "Could not open %s:"
 msgstr "Nepavyko atverti %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:218
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Nepavyko atverti %s: nežinoma klaida"
 
-#: ../plugins/publish-calendar/publish-calendar.c:234
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Klaida skelbiant %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:236
+#: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "SÄ—kminga paskelbta %s"
 
-#: ../plugins/publish-calendar/publish-calendar.c:280
+#: ../plugins/publish-calendar/publish-calendar.c:284
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Nepavyko prijungti %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:600
+#: ../plugins/publish-calendar/publish-calendar.c:611
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "Įju_ngti"
 
-#: ../plugins/publish-calendar/publish-calendar.c:743
+#: ../plugins/publish-calendar/publish-calendar.c:759
 msgid "Are you sure you want to remove this location?"
 msgstr "Ar tikrai norite pašalinti šią vietą?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
-#. where the publishing should be done, fails. Basically, this shouldn't
-#. ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1057
+#. * where the publishing should be done, fails. Basically, this shouldn't
+#. * ever happen, and if so, then something is really wrong.
+#: ../plugins/publish-calendar/publish-calendar.c:1091
 msgid "Could not create publish thread."
 msgstr "Nepavyko sukurti skelbimo gijos."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1065
+#: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "_Publish Calendar Information"
 msgstr "_Skelbti kalendoriaus informacijÄ…"
 
@@ -17634,8 +17702,8 @@ msgid "Publishing _Frequency:"
 msgstr "Publikavimo _dažnumas:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
-msgid "Secure FTP (SSH)"
-msgstr "Saugus FTP (SSH)"
+msgid "Secure FTP (SFTP)"
+msgstr "Saugus FTP (SFTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
@@ -17689,101 +17757,101 @@ msgstr "Naudotojo _vardas:"
 msgid "iCal"
 msgstr "iCal"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:88
-#: ../plugins/publish-calendar/publish-format-ical.c:86
+#: ../plugins/publish-calendar/publish-format-fb.c:95
+#: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Nepavyko paskelbti kalendoriaus: nebÄ—ra kalendoriaus posistemÄ—s"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:487
+#: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
 msgstr "Nauja vieta"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:489
+#: ../plugins/publish-calendar/url-editor-dialog.c:520
 msgid "Edit Location"
 msgstr "Keisti vietÄ…"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:160
+#: ../plugins/save-calendar/csv-format.c:168
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Description List"
 msgstr "Aprašymų sąrašas"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Categories List"
 msgstr "Kategorijų sąrašas"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Comment List"
 msgstr "Komentarų sąrašas"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Contact List"
 msgstr "Kontaktų sąrašas"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Start"
 msgstr "Pradžia"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "End"
 msgstr "Pabaiga"
 
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "Due"
 msgstr "Iki"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "percent Done"
 msgstr "procentų atlikta"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Attendees List"
 msgstr "Dalyvių sąrašas"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:398
 msgid "Modified"
 msgstr "Pakeista"
 
-#: ../plugins/save-calendar/csv-format.c:562
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "A_dvanced options for the CSV format"
 msgstr "_IÅ¡samesnÄ—s CVS formato parinktys"
 
-#: ../plugins/save-calendar/csv-format.c:570
+#: ../plugins/save-calendar/csv-format.c:581
 msgid "Prepend a _header"
 msgstr "Priekyje pridėti _antraštę"
 
-#: ../plugins/save-calendar/csv-format.c:579
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Value delimiter:"
 msgstr "_Reikšmių skyriklis:"
 
-#: ../plugins/save-calendar/csv-format.c:590
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Record delimiter:"
 msgstr "Į_rašų skyriklis:"
 
-#: ../plugins/save-calendar/csv-format.c:601
+#: ../plugins/save-calendar/csv-format.c:612
 msgid "_Encapsulate values with:"
 msgstr "_Išskirti reikšmes su:"
 
-#: ../plugins/save-calendar/csv-format.c:627
+#: ../plugins/save-calendar/csv-format.c:638
 msgid "Comma separated values (.csv)"
 msgstr "Kableliu atskirtų reikšmių formatas (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-#: ../shell/e-shell-utils.c:225
+#: ../plugins/save-calendar/ical-format.c:173
+#: ../shell/e-shell-utils.c:191
 msgid "iCalendar (.ics)"
 msgstr "iCalendar (.ics)"
 
@@ -17800,31 +17868,31 @@ msgstr "Įrašykite kalendorių ar už užduo�ių sąrašą į diską."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:147
+#: ../plugins/save-calendar/rdf-format.c:156
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:375
+#: ../plugins/save-calendar/rdf-format.c:389
 msgid "RDF (.rdf)"
 msgstr "RDF formatas (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:122
+#: ../plugins/save-calendar/save-calendar.c:127
 msgid "_Format:"
 msgstr "_Formatas:"
 
-#: ../plugins/save-calendar/save-calendar.c:183
+#: ../plugins/save-calendar/save-calendar.c:189
 msgid "Select destination file"
 msgstr "Pasirinkite paskirties failÄ…"
 
-#: ../plugins/save-calendar/save-calendar.c:336
+#: ../plugins/save-calendar/save-calendar.c:344
 msgid "Save the selected calendar to disk"
 msgstr "Įrašyti pasirinktą kalendorių diske"
 
-#: ../plugins/save-calendar/save-calendar.c:367
+#: ../plugins/save-calendar/save-calendar.c:375
 msgid "Save the selected memo list to disk"
 msgstr "Įrašyti pasirinktą raštelių sąrašą diske"
 
-#: ../plugins/save-calendar/save-calendar.c:398
+#: ../plugins/save-calendar/save-calendar.c:406
 msgid "Save the selected task list to disk"
 msgstr "Įrašyti pasirinktą užduo�ių sąrašą diske"
 
@@ -17836,15 +17904,15 @@ msgstr "Raktažodžių / reikšmių porų, pakeistinų laiške, sąrašas Šablo
 msgid "Drafts based template plugin. You can use variables like $ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from an email you are replying to."
 msgstr "Juodraš�ių pagrindo šablonų įskiepis. Jūs galite naudoti tokius kintamuosius kaip $ORIG[subject], $ORIG[from], $ORIG[to] or $ORIG[body], kurie bus pakeisti reikšmėmis iš laiško, į kurį atsakote."
 
-#: ../plugins/templates/templates.c:1066
+#: ../plugins/templates/templates.c:1094
 msgid "No Title"
 msgstr "Be pavadinimo"
 
-#: ../plugins/templates/templates.c:1167
+#: ../plugins/templates/templates.c:1195
 msgid "Save as _Template"
 msgstr "IÅ¡saugoti kaip Å¡a_blonÄ…"
 
-#: ../plugins/templates/templates.c:1169
+#: ../plugins/templates/templates.c:1197
 msgid "Save as Template"
 msgstr "Įrašyti kaip šabloną"
 
@@ -17864,20 +17932,20 @@ msgstr "Įtaisytosios elektroninės vizitinės kortelės (vCards)"
 msgid "Show vCards directly in mail messages."
 msgstr "Rodyti elektronines vizitines korteles tiesiogiai laiškuose."
 
-#: ../plugins/vcard-inline/vcard-inline.c:206
-#: ../plugins/vcard-inline/vcard-inline.c:291
+#: ../plugins/vcard-inline/vcard-inline.c:208
+#: ../plugins/vcard-inline/vcard-inline.c:293
 msgid "Show Full vCard"
 msgstr "Rodyti visÄ… vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:209
+#: ../plugins/vcard-inline/vcard-inline.c:211
 msgid "Show Compact vCard"
 msgstr "Rodyti kompaktišką vCard"
 
-#: ../plugins/vcard-inline/vcard-inline.c:270
+#: ../plugins/vcard-inline/vcard-inline.c:272
 msgid "There is one other contact."
 msgstr "Yra dar vienas kontaktas."
 
-#: ../plugins/vcard-inline/vcard-inline.c:279
+#: ../plugins/vcard-inline/vcard-inline.c:281
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -17885,7 +17953,7 @@ msgstr[0] "Yra dar %d kitas kontaktas."
 msgstr[1] "Yra dar %d kiti kontaktai."
 msgstr[2] "Yra dar %d kitų kontaktų."
 
-#: ../plugins/vcard-inline/vcard-inline.c:300
+#: ../plugins/vcard-inline/vcard-inline.c:302
 msgid "Save in Address Book"
 msgstr "Įrašyti adresų knygoje"
 
@@ -17897,15 +17965,15 @@ msgstr "PridÄ—kite WebDAV kontaktus Evolution."
 msgid "WebDAV contacts"
 msgstr "WebDAV kontaktai"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:283
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Vengti IfMatch (reikalinga naudojant Apache < 2.2.8)"
 
@@ -17986,192 +18054,184 @@ msgid "Initial attachment view"
 msgstr "Pradinis priedų rodinys"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:20
-msgid "Initial file chooser folder"
-msgstr "Pradinis failų parinkiklio aplankas"
-
-#: ../shell/apps_evolution_shell.schemas.in.h:21
-msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Pradinis GtkFileChooser dialogų aplankas."
-
-#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
 msgstr "Pradinis priedų juostos valdymo elementų rodinys. „0“ – piktogramų rodinys, „1“ – sąrašo rodinys."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "Paskutinė atnaujinta konfigūracijos versija"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Aplankų, kurie turi būti sinchronizuoti su disku, naudojimui atsijungus, kelių sąrašas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
 msgstr "Kompiuteriai, prie kurių jungiamasi be tarpinio serverio"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Naudojantis HTTP tarpiniu serveriu tapatybei patvirtinti nurodomas slaptažodis"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
 msgstr "Tarpinio serverio konfigūravimo veiksena"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
 msgstr "SOCKS tarpinio serverio vardas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
 msgstr "SOCKS tarpinio serverio prievadas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
 msgstr "Saugaus HTTP tarpinio serverio vardas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
 msgstr "Saugaus HTTP tarpinio serverio prievadas"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
 msgstr "Pasirinkite tarpinio serverio konfigūracijos veikseną. Galimos reikšmės: 0 – „naudoti sistemos parametrus“; 1 – „nėra tarpinio serverio“; 2 – „naudoti rankinę tarpinio serverio konfigūraciją“; 3 – „naudoti tarpinio serverio konfigūraciją, nurodytą automatinio konfigūravimo URL“."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "Å oninÄ— juosta matoma"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "Praleisti bandomosios versijos perspÄ—jimo langÄ…"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:314
+#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/main.c:310
 msgid "Start in offline mode"
 msgstr "Paleisti atsijungimo veiksenoje"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "BÅ«senos juosta yra matoma"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Evolution konfigūracijos versija, su mažoriniu/minoriniu/konfigūracijos lygiu (pvz., „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default X coordinate for the main window."
 msgstr "Numatytoji pagrindinio lango x koordinatÄ—."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid "The default Y coordinate for the main window."
 msgstr "Numatytoji pagrindinio lango y koordinatÄ—."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "Numatytasis pagrindinio lango aukštis taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "Numatytasis pagrindinio lango plotis taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "Numatytasis šoninio skydelio plotis taškais."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
 msgstr "Paskutinė atnaujinta Evolution konfigūracijos versija, su mažoriniu/minoriniu/konfigūracijos lygiu (pvz., „2.6.0“)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
 msgstr "HTTP tarpinio serverio vardas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Saugaus HTTP tarpinio serverio vardas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
 msgstr "SOCKS tarpinio serverio vardas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
 msgstr "Tarpinio serverio, nurodyto rakte „/apps/evolution/shell/network_config/http_host“, prievadas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
 msgstr "Tarpinio serverio, nurodyto rakte „/apps/evolution/shell/network_config/secure_host“, prievadas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
 msgstr "Tarpinio serverio, nurodyto rakte „/apps/evolution/shell/network_config/socks_host“, prievadas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 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 "Lango mygtukų stilius. Gali būti „text“, „icons“, „both“, „toolbar“. Jeigu nurodyta „toolbar“, mygtukų stilius nurodomas GNOME įrankinės nustatymuose."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr "Šiame rankte yra kompiuterių, prie kurių jungiamasi tiesiogiai, o ne per tarpinį serverį (jei jis aktyvus). Reikšmės gali būti kompiuterių vardai, sritys (naudojant pradinius kaitos simbolius, pvz., *.foo.com), IP adresai (IPv4 ir IPv6) ir tinklo adresai su tinklo kauke (pvz., 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "Įrankinė yra matoma"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "URL that provides proxy configuration values."
 msgstr "URL, kuriame yra tarpinio serverio konfigūracijos reikšmės."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
 msgstr "Naudoti HTTP tarpinį serverį"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:55
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Username to pass as authentication when doing HTTP proxying."
 msgstr "Naudotojo vardas, perduodamas HTTP tarpiniam serveriui nustatant tapatybÄ™."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:56
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Ar Evolution bus paleidžiama atsijungimo veiksenoje, vietoje prisijungimo veiksenos."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:57
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "Ar langas turėtų būti išdidintas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:58
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "Ar šoninė juosta turi būti matoma."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:59
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "Ar būsenos juosta turi būti matoma."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:60
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "Ar įrankinė turi būti matoma."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:61
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "Ar perspėjimas apie bandomąją Evolution versiją bus praleidžiamas."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:62
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "Ar lango mygtukai turi būti matomi."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:63
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "Lango mygtukų stilius"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:64
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "Lango mygtukai yra matomi"
 
-#: ../shell/e-shell-content.c:729
-#: ../shell/e-shell-content.c:730
+#: ../shell/e-shell-content.c:727
+#: ../shell/e-shell-content.c:728
 msgid "Searches"
 msgstr "Paieškos"
 
-#: ../shell/e-shell-content.c:773
+#: ../shell/e-shell-content.c:771
 msgid "Save Search"
 msgstr "Įrašyti paiešką"
 
@@ -18179,31 +18239,31 @@ msgstr "Įrašyti paiešką"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "Ro_dyti: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:971
+#: ../shell/e-shell-searchbar.c:970
 msgid "Sear_ch:"
 msgstr "Ieš_koti:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1034
+#: ../shell/e-shell-searchbar.c:1033
 msgid "i_n"
 msgstr "k_ur"
 
-#: ../shell/e-shell-utils.c:223
+#: ../shell/e-shell-utils.c:189
 msgid "vCard (.vcf)"
 msgstr "vCard (.vcf)"
 
-#: ../shell/e-shell-utils.c:246
+#: ../shell/e-shell-utils.c:212
 msgid "All Files (*)"
 msgstr "Visi failai (*)"
 
-#: ../shell/e-shell-view.c:295
+#: ../shell/e-shell-view.c:296
 msgid "Saving user interface state"
 msgstr "Įrašoma naudotojo sąsajos būsena"
 
@@ -18478,12 +18538,12 @@ msgstr "Dabartinis rodinys yra pasirinktinis rodinys"
 msgid "Change the page settings for your current printer"
 msgstr "Pakeisti puslapio parametrus dabartiniam spausdintuvui"
 
-#: ../shell/e-shell-window-actions.c:2189
+#: ../shell/e-shell-window-actions.c:2194
 #, c-format
 msgid "Switch to %s"
 msgstr "Perjungti į %s"
 
-#: ../shell/e-shell-window-actions.c:2404
+#: ../shell/e-shell-window-actions.c:2414
 msgid "Execute these search parameters"
 msgstr "Vykdyti šiuos paieškos parametrus"
 
@@ -18493,24 +18553,24 @@ msgstr "Vykdyti šiuos paieškos parametrus"
 msgid "%s - Evolution"
 msgstr "%s – Evolution"
 
-#: ../shell/e-shell-window.c:442
+#: ../shell/e-shell-window.c:445
 msgid "New"
 msgstr "Nauja"
 
-#: ../shell/e-shell.c:361
+#: ../shell/e-shell.c:313
 msgid "Preparing to go offline..."
 msgstr "Ruošiamasis darbui atsijungus..."
 
-#: ../shell/e-shell.c:414
+#: ../shell/e-shell.c:366
 msgid "Preparing to go online..."
 msgstr "Ruošiamas darbui prisijungus..."
 
-#: ../shell/e-shell.c:476
+#: ../shell/e-shell.c:434
 msgid "Preparing to quit..."
 msgstr "Ruošiamasi išeiti..."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:195
+#: ../shell/main.c:193
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18546,7 +18606,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:219
+#: ../shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18554,62 +18614,62 @@ msgstr ""
 "A�iū,\n"
 "Evolution komanda\n"
 
-#: ../shell/main.c:226
+#: ../shell/main.c:224
 msgid "Do not tell me again"
 msgstr "Daugiau to neberodyti"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:308
+#: ../shell/main.c:304
 msgid "Start Evolution showing the specified component. Available options are 'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr "Paleisti Evolution rodant nurodytąjį komponentą. Galimos parinktys: „mail“, „calendar“, „contacts“, „tasks“ ir „memos“"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:308
 msgid "Apply the given geometry to the main window"
 msgstr "Pritaikyti nurodytÄ…jÄ… geometrijÄ… pagrindiniam langui"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:312
 msgid "Start in online mode"
 msgstr "Paleisti prisijungimo veiksenoje"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid "Ignore network availability"
 msgstr "Nepaisyti tinklo prieinamumo"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:316
 msgid "Start in \"express\" mode"
 msgstr "Paleisti „skubiojoje“ veiksenoje"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Priverstinai išjungti Evolution"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į failą."
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Disable loading of any plugins."
 msgstr "Išjungti visų įskiepių įkėlimą."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Išjungti laiškų, kontaktų ir užduo�ių peržiūros polangį."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importuoti URI ar failų vardus, pateiktus kaip argumentų liekana."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Request a running Evolution process to quit"
 msgstr "Nurodyti veikian�iam Evolution procesui baigti darbą"
 
-#: ../shell/main.c:511
-#: ../shell/main.c:519
+#: ../shell/main.c:508
+#: ../shell/main.c:516
 msgid "- The Evolution PIM and Email Client"
 msgstr "– Evolution PIM ir el. pašto klientas"
 
-#: ../shell/main.c:582
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18618,7 +18678,7 @@ msgstr ""
 "%s: negalima naudoti --online ir --offline tuo pa�iu metu.\n"
 "  Naudokite „%s --help“ norėdami gauti daugiau informacijos.\n"
 
-#: ../shell/main.c:588
+#: ../shell/main.c:585
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -18687,37 +18747,37 @@ msgstr "Bandomasis Å¡a_ltinis"
 msgid "Create a new test source"
 msgstr "Sukurti naują bandomąjį šaltinį"
 
-#: ../smclient/eggdesktopfile.c:165
+#: ../smclient/eggdesktopfile.c:166
 #, c-format
 msgid "File is not a valid .desktop file"
 msgstr "Tai nÄ—ra tinkamas .desktop failas"
 
-#: ../smclient/eggdesktopfile.c:188
+#: ../smclient/eggdesktopfile.c:189
 #, c-format
 msgid "Unrecognized desktop file Version '%s'"
 msgstr "Neatpažinta darbastalio failo versija „%s“"
 
-#: ../smclient/eggdesktopfile.c:957
+#: ../smclient/eggdesktopfile.c:959
 #, c-format
 msgid "Starting %s"
 msgstr "Paleidžiama %s"
 
-#: ../smclient/eggdesktopfile.c:1098
+#: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
 msgstr "Programa nepriima dokumentų komandų eilutėje"
 
-#: ../smclient/eggdesktopfile.c:1166
+#: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
 msgstr "Neatpažinta paleisties parinktis: %d"
 
-#: ../smclient/eggdesktopfile.c:1365
+#: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
 msgstr "Negalima perduoti URI „Type=Link“ darbastalio įrašui"
 
-#: ../smclient/eggdesktopfile.c:1386
+#: ../smclient/eggdesktopfile.c:1391
 #, c-format
 msgid "Not a launchable item"
 msgstr "Ne paleidžiamas elementas"
@@ -18750,7 +18810,7 @@ msgstr "Seanso valdymo parinktys:"
 msgid "Show session management options"
 msgstr "Rodyti seanso valdymo parinktis"
 
-#: ../smime/gui/ca-trust-dialog.c:104
+#: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -18761,11 +18821,11 @@ msgstr ""
 "\n"
 "Taisykite pasitikÄ—jimo parametrus:"
 
-#: ../smime/gui/cert-trust-dialog.c:144
+#: ../smime/gui/cert-trust-dialog.c:146
 msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
 msgstr "Kadangi pasitikite šį liudijimą išdavusia įstaiga, pasitikite ir šio liudijimo autentiškumu, nebent �ia nurodysite kitaip"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/cert-trust-dialog.c:150
 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 "Dėl to, kad nepasitikite šį liudijimą išdavusia įstaiga, nepasitikite ir šio liudijimo autentiškumu, nebent �ia nurodysite kitaip"
 
@@ -18789,7 +18849,7 @@ msgstr "IÅ¡duota organizacinis padaliniui"
 #: ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:566
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "Serijinis numeris"
 
@@ -18849,51 +18909,51 @@ msgstr "MD5 kontrolinis kodas"
 msgid "Email Address"
 msgstr "El. pašto adresas"
 
-#: ../smime/gui/certificate-manager.c:570
+#: ../smime/gui/certificate-manager.c:575
 msgid "Select a certificate to import..."
 msgstr "Pasirinkite importuotinÄ… liudijimÄ…..."
 
-#: ../smime/gui/certificate-manager.c:583
+#: ../smime/gui/certificate-manager.c:588
 msgid "All files"
 msgstr "Visi failai"
 
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:623
 msgid "Failed to import certificate"
 msgstr "Nepavyko importuoti liudijimo"
 
-#: ../smime/gui/certificate-manager.c:985
+#: ../smime/gui/certificate-manager.c:992
 msgid "All PKCS12 files"
 msgstr "Visi PKCS12 failai"
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1009
 msgid "All email certificate files"
 msgstr "Visi pašto liudijimų failai"
 
-#: ../smime/gui/certificate-manager.c:1021
+#: ../smime/gui/certificate-manager.c:1026
 msgid "All CA certificate files"
 msgstr "Visi liudijimų įstaigos liudijimų failai"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-viewer.c:345
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Liudijimų žiūryklė: %s"
 
-#: ../smime/gui/component.c:46
+#: ../smime/gui/component.c:50
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Įveskite „%s“ slaptažodį"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:69
+#: ../smime/gui/component.c:76
 msgid "Enter new password for certificate database"
 msgstr "Įveskite naują slaptažodį liudijimų duomenų bazei"
 
-#: ../smime/gui/component.c:71
+#: ../smime/gui/component.c:79
 msgid "Enter new password"
 msgstr "Įveskite naują slaptažodį"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:116
+#: ../smime/gui/e-cert-selector.c:118
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -18902,7 +18962,7 @@ msgstr ""
 "IÅ¡duotas:\n"
 "  Tema: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:119
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -18911,7 +18971,7 @@ msgstr ""
 "IÅ¡davÄ—:\n"
 "  Tema: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:169
+#: ../smime/gui/e-cert-selector.c:172
 msgid "Select certificate"
 msgstr "Pasirinkite liudijimÄ…"
 
@@ -18932,7 +18992,7 @@ msgid "Before trusting this CA for any purpose, you should examine its certifica
 msgstr "Prieš pasitikint liudijimų įstaiga turėtumėte patikrinti peržiūrėti jos liudijimą, jo politiką ir procedūras (jei prieinama)."
 
 #: ../smime/gui/smime-ui.ui.h:5
-#: ../smime/lib/e-cert.c:1088
+#: ../smime/lib/e-cert.c:1093
 msgid "Certificate"
 msgstr "Liudijimas"
 
@@ -19009,12 +19069,12 @@ msgid "Organizational Unit (OU)"
 msgstr "Organizacinis padalinys (OU)"
 
 #: ../smime/gui/smime-ui.ui.h:30
-#: ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:825
 msgid "SSL Client Certificate"
 msgstr "SSL kliento liudijimas"
 
 #: ../smime/gui/smime-ui.ui.h:31
-#: ../smime/lib/e-cert.c:828
+#: ../smime/lib/e-cert.c:829
 msgid "SSL Server Certificate"
 msgstr "SSL serverio liudijimas"
 
@@ -19067,37 +19127,37 @@ msgstr "_Kurti atsarginÄ™ kopijÄ…"
 msgid "_Edit CA Trust"
 msgstr "_Taisyti pasitikėjimą liudijimų įstaiga"
 
-#: ../smime/lib/e-cert-db.c:906
+#: ../smime/lib/e-cert-db.c:910
 msgid "Certificate already exists"
 msgstr "Toks liudijimas jau yra"
 
-#: ../smime/lib/e-cert.c:228
-#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:226
+#: ../smime/lib/e-cert.c:236
 msgid "%d/%m/%Y"
 msgstr "%Y %m %d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:414
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr "Pasirašyti"
 
-#: ../smime/lib/e-cert.c:415
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Å ifruoti"
 
-#: ../smime/lib/e-cert.c:527
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "Versija"
 
-#: ../smime/lib/e-cert.c:542
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "1-a versija"
 
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "2-a versija"
 
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "3-a versija"
 
@@ -19146,82 +19206,82 @@ msgstr "Liudijimų įstaigos rakto identifikatorius"
 msgid "Object Identifier (%s)"
 msgstr "Objekto identifikatorius (%s)"
 
-#: ../smime/lib/e-cert.c:744
+#: ../smime/lib/e-cert.c:745
 msgid "Algorithm Identifier"
 msgstr "Algoritmo identifikatorius"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:753
 msgid "Algorithm Parameters"
 msgstr "Algoritmo parametrai"
 
-#: ../smime/lib/e-cert.c:774
+#: ../smime/lib/e-cert.c:775
 msgid "Subject Public Key Info"
 msgstr "Antraštės viešojo rakto informacija"
 
-#: ../smime/lib/e-cert.c:779
+#: ../smime/lib/e-cert.c:780
 msgid "Subject Public Key Algorithm"
 msgstr "Antraštės viešojo rakto algoritmas"
 
-#: ../smime/lib/e-cert.c:794
+#: ../smime/lib/e-cert.c:795
 msgid "Subject's Public Key"
 msgstr "Antraštės viešasis raktas"
 
-#: ../smime/lib/e-cert.c:815
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:866
 msgid "Error: Unable to process extension"
 msgstr "Klaida: Nepavyko apdoroti plÄ—tinio"
 
-#: ../smime/lib/e-cert.c:836
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:837
+#: ../smime/lib/e-cert.c:849
 msgid "Object Signer"
 msgstr "Objekto pasirašytojas"
 
-#: ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:841
 msgid "SSL Certificate Authority"
 msgstr "SSL liudijimų įstaiga"
 
-#: ../smime/lib/e-cert.c:844
+#: ../smime/lib/e-cert.c:845
 msgid "Email Certificate Authority"
 msgstr "El. pašto liudijimų įstaiga"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:874
 msgid "Signing"
 msgstr "Pasirašoma"
 
-#: ../smime/lib/e-cert.c:876
+#: ../smime/lib/e-cert.c:878
 msgid "Non-repudiation"
 msgstr "Ne dalyvis"
 
-#: ../smime/lib/e-cert.c:880
+#: ../smime/lib/e-cert.c:882
 msgid "Key Encipherment"
 msgstr "Rakto koduotÄ—"
 
-#: ../smime/lib/e-cert.c:884
+#: ../smime/lib/e-cert.c:886
 msgid "Data Encipherment"
 msgstr "Duomenų koduotė"
 
-#: ../smime/lib/e-cert.c:888
+#: ../smime/lib/e-cert.c:890
 msgid "Key Agreement"
 msgstr "Rakto sutartis"
 
-#: ../smime/lib/e-cert.c:892
+#: ../smime/lib/e-cert.c:894
 msgid "Certificate Signer"
 msgstr "Liudijimo pasirašytojas"
 
-#: ../smime/lib/e-cert.c:896
+#: ../smime/lib/e-cert.c:898
 msgid "CRL Signer"
 msgstr "CRL pasirašytojas"
 
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:947
 msgid "Critical"
 msgstr "Kritinis"
 
-#: ../smime/lib/e-cert.c:946
 #: ../smime/lib/e-cert.c:949
+#: ../smime/lib/e-cert.c:952
 msgid "Not Critical"
 msgstr "Nekritinis"
 
-#: ../smime/lib/e-cert.c:970
+#: ../smime/lib/e-cert.c:973
 msgid "Extensions"
 msgstr "IÅ¡plÄ—timai"
 
@@ -19233,41 +19293,41 @@ msgstr "IÅ¡plÄ—timai"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1047
+#: ../smime/lib/e-cert.c:1051
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1102
-#: ../smime/lib/e-cert.c:1225
+#: ../smime/lib/e-cert.c:1107
+#: ../smime/lib/e-cert.c:1230
 msgid "Certificate Signature Algorithm"
 msgstr "Liudijimo parašo algoritmas"
 
-#: ../smime/lib/e-cert.c:1111
+#: ../smime/lib/e-cert.c:1116
 msgid "Issuer"
 msgstr "LeidÄ—jas"
 
-#: ../smime/lib/e-cert.c:1166
+#: ../smime/lib/e-cert.c:1171
 msgid "Issuer Unique ID"
 msgstr "Unikalus leidÄ—jo ID"
 
-#: ../smime/lib/e-cert.c:1185
+#: ../smime/lib/e-cert.c:1190
 msgid "Subject Unique ID"
 msgstr "Unikalus temos ID"
 
-#: ../smime/lib/e-cert.c:1231
+#: ../smime/lib/e-cert.c:1236
 msgid "Certificate Signature Value"
 msgstr "Liudijimo parašo reikšmė"
 
-#: ../smime/lib/e-pkcs12.c:249
+#: ../smime/lib/e-pkcs12.c:255
 msgid "PKCS12 File Password"
 msgstr "PKCS12 failo slaptažodis"
 
-#: ../smime/lib/e-pkcs12.c:250
+#: ../smime/lib/e-pkcs12.c:256
 msgid "Enter password for PKCS12 file:"
 msgstr "Įveskite PKCS12 failo slaptažodį:"
 
-#: ../smime/lib/e-pkcs12.c:352
+#: ../smime/lib/e-pkcs12.c:362
 msgid "Imported Certificate"
 msgstr "Importuotas liudijimas"
 
@@ -19349,7 +19409,7 @@ msgstr "Su _būsena"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:789
 msgid "UTC"
 msgstr "UTC"
 
@@ -19377,14 +19437,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Pažymėjimas"
 
-#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-define-views-dialog.c:359
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Nurodyti %s rodinius"
 
-#: ../widgets/menus/gal-define-views-dialog.c:356
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:367
+#: ../widgets/menus/gal-define-views-dialog.c:369
 msgid "Define Views"
 msgstr "Nurodyti rodinius"
 
@@ -19397,7 +19457,7 @@ msgstr "Nurodyti „%s“ rodinius"
 msgid "Table"
 msgstr "LentelÄ—"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:275
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
 msgid "Save Current View"
 msgstr "Įrašyti dabartinį rodinį"
 
@@ -19425,15 +19485,19 @@ msgstr "Rodinio tipas"
 msgid "Type of view:"
 msgstr "Rodinio tipas:"
 
-#: ../widgets/misc/e-account-manager.c:353
+#: ../widgets/misc/e-account-manager.c:383
+msgid "Use default Evolution _sort order for accounts"
+msgstr "Paskyrom naudoti numatytąjį Evolution _rikiavimą"
+
+#: ../widgets/misc/e-account-manager.c:438
 msgid "De_fault"
 msgstr "_Numatytasis"
 
-#: ../widgets/misc/e-account-tree-view.c:243
+#: ../widgets/misc/e-account-tree-view.c:404
 msgid "Account Name"
 msgstr "Paskyros pavadinimas"
 
-#: ../widgets/misc/e-account-tree-view.c:274
+#: ../widgets/misc/e-account-tree-view.c:435
 msgid "Protocol"
 msgstr "Protokolas"
 
@@ -19450,7 +19514,7 @@ msgid "MIME Type:"
 msgstr "MIME tipas:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
-#: ../widgets/misc/e-attachment-store.c:559
+#: ../widgets/misc/e-attachment-store.c:440
 msgid "_Suggest automatic display of attachment"
 msgstr "_Pasiūlyti automatinį priedo parodymą"
 
@@ -19487,24 +19551,24 @@ msgstr "Įkeliama"
 msgid "Saving"
 msgstr "Įrašoma"
 
-#: ../widgets/misc/e-attachment-paned.c:97
+#: ../widgets/misc/e-attachment-paned.c:102
 msgid "Hide Attachment _Bar"
 msgstr "Paslėpti prie_dų juostą"
 
-#: ../widgets/misc/e-attachment-paned.c:99
-#: ../widgets/misc/e-attachment-paned.c:639
+#: ../widgets/misc/e-attachment-paned.c:104
+#: ../widgets/misc/e-attachment-paned.c:716
 msgid "Show Attachment _Bar"
 msgstr "Rodyti prie_dų juostą"
 
-#: ../widgets/misc/e-attachment-store.c:547
+#: ../widgets/misc/e-attachment-store.c:428
 msgid "Add Attachment"
 msgstr "Prisegti priedÄ…"
 
-#: ../widgets/misc/e-attachment-store.c:550
+#: ../widgets/misc/e-attachment-store.c:431
 msgid "A_ttach"
 msgstr "Prise_gti"
 
-#: ../widgets/misc/e-attachment-store.c:613
+#: ../widgets/misc/e-attachment-store.c:494
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Įrašyti priedą"
@@ -19512,9 +19576,9 @@ msgstr[1] "Įrašyti priedus"
 msgstr[2] "Įrašyti priedus"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment-store.c:642
+#: ../widgets/misc/e-attachment-store.c:523
 #: ../widgets/misc/e-attachment.c:1809
-#: ../widgets/misc/e-attachment.c:2351
+#: ../widgets/misc/e-attachment.c:2347
 msgid "attachment.dat"
 msgstr "priedas.dat"
 
@@ -19560,17 +19624,17 @@ msgstr "Atverti šį priedą programoje %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:997
+#: ../widgets/misc/e-attachment.c:998
 msgid "Attached message"
 msgstr "Prisegtas laiškas"
 
 #: ../widgets/misc/e-attachment.c:1852
-#: ../widgets/misc/e-attachment.c:2653
+#: ../widgets/misc/e-attachment.c:2649
 msgid "A load operation is already in progress"
 msgstr "Jau vykdoma įkėlimo operacija"
 
 #: ../widgets/misc/e-attachment.c:1860
-#: ../widgets/misc/e-attachment.c:2661
+#: ../widgets/misc/e-attachment.c:2657
 msgid "A save operation is already in progress"
 msgstr "Jau vykdoma įrašymo operacija"
 
@@ -19584,37 +19648,37 @@ msgstr "Nepavyko įkelti „%s“"
 msgid "Could not load the attachment"
 msgstr "Nepavyko įkelti priedo"
 
-#: ../widgets/misc/e-attachment.c:2231
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Nepavyko atverti „%s“"
 
-#: ../widgets/misc/e-attachment.c:2234
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Nepavyko atverti priedo"
 
-#: ../widgets/misc/e-attachment.c:2669
+#: ../widgets/misc/e-attachment.c:2665
 msgid "Attachment contents not loaded"
 msgstr "Priedo turinys neįkeltas"
 
-#: ../widgets/misc/e-attachment.c:2745
+#: ../widgets/misc/e-attachment.c:2741
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Nepavyko įrašyti „%s“"
 
-#: ../widgets/misc/e-attachment.c:2748
+#: ../widgets/misc/e-attachment.c:2744
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Nepavyko įrašyti priedo"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:387
 msgid "Ctrl-click to open a link"
 msgstr "Laikydami klavišą Ctrl spustelėkite, jei norite atverti nuorodą"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1247
+#: ../widgets/misc/e-calendar-item.c:1250
 msgid "%B %Y"
 msgstr "%Y %B"
 
@@ -19663,24 +19727,24 @@ msgid "_Today"
 msgstr "Å _iandien"
 
 #. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
+#. * is not permitted.
 #: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "_Jokias"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1686
-#: ../widgets/misc/e-dateedit.c:1918
+#: ../widgets/misc/e-dateedit.c:1688
+#: ../widgets/misc/e-dateedit.c:1921
 msgctxt "date"
 msgid "None"
 msgstr "NÄ—ra"
 
-#: ../widgets/misc/e-dateedit.c:1813
+#: ../widgets/misc/e-dateedit.c:1815
 msgid "Invalid Date Value"
 msgstr "Netinkama datos reikšmė"
 
-#: ../widgets/misc/e-dateedit.c:1857
+#: ../widgets/misc/e-dateedit.c:1859
 msgid "Invalid Time Value"
 msgstr "Netinkama laiko reikšmė"
 
@@ -19702,7 +19766,7 @@ msgid "File _type:"
 msgstr "Failo _tipas:"
 
 #: ../widgets/misc/e-import-assistant.c:333
-#: ../widgets/misc/e-import-assistant.c:910
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Pasirinkite Å¡io importavimo paskirties vietÄ…"
 
@@ -19723,37 +19787,37 @@ msgid "Evolution checked for settings to import from the following applications:
 msgstr "Evolution ieškojo parametrus, kuriuos galima įkelti iš šių programų: Pine, Netscape, Elm, iCalendar. Nerasta jokių įkeltinų parametrų. Jei norite bandyti dar kartą, spustelėkite mygtuką „Atgal“."
 
 #. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:767
+#: ../widgets/misc/e-import-assistant.c:768
 msgid "_Cancel Import"
 msgstr "_Atšaukti importavimą"
 
-#: ../widgets/misc/e-import-assistant.c:909
+#: ../widgets/misc/e-import-assistant.c:912
 msgid "Preview data to be imported"
 msgstr "Peržiūrėti importuotinus duomenis"
 
-#: ../widgets/misc/e-import-assistant.c:915
-#: ../widgets/misc/e-import-assistant.c:928
-#: ../widgets/misc/e-import-assistant.c:1273
-#: ../widgets/misc/e-import-assistant.c:1349
-#: ../widgets/misc/e-import-assistant.c:1358
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1352
+#: ../widgets/misc/e-import-assistant.c:1361
 msgid "Import Data"
 msgstr "Importuoti duomenis"
 
-#: ../widgets/misc/e-import-assistant.c:923
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Pasirinkite, kokio tipo failą norite importuoti iš sąrašo."
 
-#: ../widgets/misc/e-import-assistant.c:1263
-#: ../widgets/misc/e-import-assistant.c:1298
+#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1301
 msgid "Evolution Import Assistant"
 msgstr "Evolution importavimo padÄ—jÄ—jas"
 
-#: ../widgets/misc/e-import-assistant.c:1280
-#: ../widgets/misc/e-import-assistant.c:1336
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1339
 msgid "Import Location"
 msgstr "Importavimo vieta"
 
-#: ../widgets/misc/e-import-assistant.c:1291
+#: ../widgets/misc/e-import-assistant.c:1294
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing external files into Evolution."
@@ -19761,27 +19825,27 @@ msgstr ""
 "Tai Evolution importavimo pagelbiklis.\n"
 "Šis pagelbiklis padės jums įkelti išorinius failus į Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1308
+#: ../widgets/misc/e-import-assistant.c:1311
 msgid "Importer Type"
 msgstr "Importerio tipas"
 
-#: ../widgets/misc/e-import-assistant.c:1318
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Pasirinkite importuotinÄ… informacijÄ…"
 
-#: ../widgets/misc/e-import-assistant.c:1327
+#: ../widgets/misc/e-import-assistant.c:1330
 msgid "Select a File"
 msgstr "Pasirinkite failÄ…"
 
-#: ../widgets/misc/e-import-assistant.c:1344
+#: ../widgets/misc/e-import-assistant.c:1347
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Norėdami pradėti failo importavimą į Evolution, spustelėkite „Pritaikyti“."
 
-#: ../widgets/misc/e-map.c:869
+#: ../widgets/misc/e-map.c:883
 msgid "World Map"
 msgstr "Pasaulio žemėlapis"
 
-#: ../widgets/misc/e-map.c:872
+#: ../widgets/misc/e-map.c:886
 msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
 msgstr "Pele paremtas interaktyvus žemėlapis laiko juostų pasirinkimui. Naudotojai, naudojantys klaviatūrą, vietoje to turėtų pasirinkti laiko juostą žemiau esan�iame išskleidžiamame sąraše"
 
@@ -19846,7 +19910,7 @@ msgstr "Pasiekus puslapio pabaigą, paieška pratęsta nuo pradžios"
 msgid "Reached top of page, continued from bottom"
 msgstr "Pasiekus puslapio pradžią, paieška pratęsta nuo pabaigos"
 
-#: ../widgets/misc/e-send-options.c:543
+#: ../widgets/misc/e-send-options.c:552
 msgid "When de_leted:"
 msgstr "Kai išt_rinta:"
 
@@ -20083,17 +20147,17 @@ msgstr "SpustelÄ—kite, norÄ—dami slÄ—pti / rodyti adresus"
 msgid "Click to open %s"
 msgstr "SpustelÄ—kite norÄ—dami atverti %s"
 
-#: ../widgets/misc/ea-calendar-item.c:302
-#: ../widgets/misc/ea-calendar-item.c:311
+#: ../widgets/misc/ea-calendar-item.c:306
+#: ../widgets/misc/ea-calendar-item.c:315
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
-#: ../widgets/misc/ea-calendar-item.c:314
+#: ../widgets/misc/ea-calendar-item.c:318
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "kalendorius: nuo %s iki %s"
 
-#: ../widgets/misc/ea-calendar-item.c:350
+#: ../widgets/misc/ea-calendar-item.c:354
 msgid "evolution calendar item"
 msgstr "evolution kalendoriaus elementas"
 
@@ -20120,40 +20184,40 @@ msgstr "Gerai"
 msgid "The time must be in the format: %s"
 msgstr "Data turi būti įvesta formatu: %s"
 
-#: ../widgets/table/e-cell-percent.c:76
+#: ../widgets/table/e-cell-percent.c:80
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Procentinė reikšmė turi būti tarp 0 ir 100, imtinai"
 
-#: ../widgets/table/e-table-click-to-add.c:594
+#: ../widgets/table/e-table-click-to-add.c:607
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:141
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
 msgid "click to add"
 msgstr "spustelÄ—kite norÄ—dami pridÄ—ti"
 
-#: ../widgets/table/e-table-config.c:387
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393
+#: ../widgets/table/e-table-config.c:435
 msgid "(Ascending)"
 msgstr "(Didėjan�iai)"
 
-#: ../widgets/table/e-table-config.c:387
-#: ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:393
+#: ../widgets/table/e-table-config.c:435
 msgid "(Descending)"
 msgstr "(Mažėjan�iai)"
 
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:400
 msgid "Not sorted"
 msgstr "Nerikiuoti"
 
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:441
 msgid "No grouping"
 msgstr "Negrupuoti"
 
-#: ../widgets/table/e-table-config.c:659
+#: ../widgets/table/e-table-config.c:666
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Rodyti laukelius"
 
-#: ../widgets/table/e-table-config.c:679
+#: ../widgets/table/e-table-config.c:686
 msgid "Available Fields"
 msgstr "Galimi laukeliai"
 
@@ -20162,7 +20226,7 @@ msgid "A_vailable Fields:"
 msgstr "Pri_einami laukeliai:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Ascending"
 msgstr "Didėjan�iai"
 
@@ -20175,7 +20239,7 @@ msgid "Clear _All"
 msgstr "IÅ¡valyti _viskÄ…"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1679
+#: ../widgets/table/e-table-header-item.c:1721
 msgid "Descending"
 msgstr "Mažėjan�iai"
 
@@ -20252,13 +20316,13 @@ msgstr ""
 "jį į vietą, kurioje norite, kad jis atsirastų."
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which has set a title.
-#. The first %s is replaced with a column title.
-#. The second %s is replaced with an actual  group value.
-#. Finally the %d is replaced with count of items in this group.
-#. Example: "Family name: Smith (13 items)"
+#. * has turned on grouping on a column, which has set a title.
+#. * The first %s is replaced with a column title.
+#. * The second %s is replaced with an actual  group value.
+#. * Finally the %d is replaced with count of items in this group.
+#. * Example: "Family name: Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:353
+#: ../widgets/table/e-table-group-container.c:361
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -20267,12 +20331,12 @@ msgstr[1] "%s: %s (%d elementai)"
 msgstr[2] "%s: %s (%d elementų)"
 
 #. Translators: This text is used as a special row when an ETable
-#. has turned on grouping on a column, which doesn't have set a title.
-#. The %s is replaced with an actual group value.
-#. The %d is replaced with count of items in this group.
-#. Example: "Smith (13 items)"
+#. * has turned on grouping on a column, which doesn't have set a title.
+#. * The %s is replaced with an actual group value.
+#. * The %d is replaced with count of items in this group.
+#. * Example: "Smith (13 items)"
 #.
-#: ../widgets/table/e-table-group-container.c:365
+#: ../widgets/table/e-table-group-container.c:373
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -20280,60 +20344,60 @@ msgstr[0] "%s (%d elementas)"
 msgstr[1] "%s (%d elementai)"
 msgstr[2] "%s (%d elementų)"
 
-#: ../widgets/table/e-table-header-item.c:1523
+#: ../widgets/table/e-table-header-item.c:1561
 msgid "Customize Current View"
 msgstr "Derinti dabartinį rodinį"
 
-#: ../widgets/table/e-table-header-item.c:1544
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Sort _Ascending"
 msgstr "Rikiuoti _didėjan�iai"
 
-#: ../widgets/table/e-table-header-item.c:1547
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Sort _Descending"
 msgstr "Rikiuoti _mažėjan�iai"
 
-#: ../widgets/table/e-table-header-item.c:1550
+#: ../widgets/table/e-table-header-item.c:1589
 msgid "_Unsort"
 msgstr "Neriki_uoti"
 
-#: ../widgets/table/e-table-header-item.c:1553
+#: ../widgets/table/e-table-header-item.c:1592
 msgid "Group By This _Field"
 msgstr "Grupuoti pagal šį _lauką"
 
-#: ../widgets/table/e-table-header-item.c:1556
+#: ../widgets/table/e-table-header-item.c:1595
 msgid "Group By _Box"
 msgstr "Grupuoti pagal _laukelį"
 
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1599
 msgid "Remove This _Column"
 msgstr "Pašalinti šį _stulpelį"
 
-#: ../widgets/table/e-table-header-item.c:1563
+#: ../widgets/table/e-table-header-item.c:1602
 msgid "Add a C_olumn..."
 msgstr "Pridėti s_tulpelį..."
 
-#: ../widgets/table/e-table-header-item.c:1567
+#: ../widgets/table/e-table-header-item.c:1606
 msgid "A_lignment"
 msgstr "_Lygiavimas"
 
-#: ../widgets/table/e-table-header-item.c:1570
+#: ../widgets/table/e-table-header-item.c:1609
 msgid "B_est Fit"
 msgstr "Geriausiai _tinka"
 
-#: ../widgets/table/e-table-header-item.c:1573
+#: ../widgets/table/e-table-header-item.c:1612
 msgid "Format Column_s..."
 msgstr "Formatuoti stulpeli_us..."
 
-#: ../widgets/table/e-table-header-item.c:1577
+#: ../widgets/table/e-table-header-item.c:1616
 msgid "Custo_mize Current View..."
 msgstr "Tinkinti _dabartinį rodinį..."
 
-#: ../widgets/table/e-table-header-item.c:1636
+#: ../widgets/table/e-table-header-item.c:1678
 msgid "_Sort By"
 msgstr "_Rikiuoti pagal"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1654
+#: ../widgets/table/e-table-header-item.c:1696
 msgid "_Custom"
 msgstr "_Pasirinktinis"
 
@@ -20357,26 +20421,38 @@ msgstr "išple�ia ETree esan�ią eilutę, kurioje yra šis langelis"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "sutraukia ETree esan�ią eilutę, kurioje yra šis langelis"
 
-#: ../widgets/table/gal-a11y-e-cell.c:121
+#: ../widgets/table/gal-a11y-e-cell.c:123
 msgid "Table Cell"
 msgstr "LentelÄ—s langelis"
 
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:71
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
 msgid "click"
 msgstr "spustelÄ—ti"
 
-#: ../widgets/table/gal-a11y-e-table-column-header.c:157
+#: ../widgets/table/gal-a11y-e-table-column-header.c:158
 msgid "sort"
 msgstr "rikiuoti"
 
-#: ../widgets/text/e-text.c:2306
+#: ../widgets/text/e-text.c:2325
 msgid "Select All"
 msgstr "Pažymėti visus"
 
-#: ../widgets/text/e-text.c:2318
+#: ../widgets/text/e-text.c:2337
 msgid "Input Methods"
 msgstr "Įvesties metodai"
 
+#~ msgid "Composer load/attach directory"
+#~ msgstr "Rašymo lango priedų aplankas"
+
+#~ msgid "Directory for loading/attaching files to composer."
+#~ msgstr "Failų įkėlimo / prisegimo laiško rašymo lange aplankas."
+
+#~ msgid "Initial file chooser folder"
+#~ msgstr "Pradinis failų parinkiklio aplankas"
+
+#~ msgid "Initial folder for GtkFileChooser dialogs."
+#~ msgstr "Pradinis GtkFileChooser dialogų aplankas."
+
 #~ msgid "Local Folders"
 #~ msgstr "Vietiniai aplankai"
 
diff --git a/po/vi.po b/po/vi.po
index 48273067c0..d61035c031 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N\n"
 "POT-Creation-Date: 2011-09-25 16:23+0000\n"
-"PO-Revision-Date: 2011-10-02 20:48+1100\n"
+"PO-Revision-Date: 2011-10-07 22:46+1100\n"
 "Last-Translator: Nguyễn Thái Ng�c Duy <pclouds@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -10163,6 +10163,8 @@ msgid ""
 "Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
+"Mô tả dòng đầu thông điệp trong khung xem mặc định thu nh� hay bung ra. "
+"\"0\" là bung, \"1\" là thu nh�."
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
@@ -10262,6 +10264,8 @@ msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
+"Bật ảnh động trong thư HTML. Nhi�u ngư�i dùng không thích ảnh động và ch�n "
+"ảnh tĩnh thay thế."
 
 #: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -10291,7 +10295,7 @@ msgstr "Bật thư mục tìm kiếm vào lúc khởi chạy."
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
-msgstr ""
+msgstr "Bật thanh tìm kiếm bên để cho phép tìm tương tác với tên thư mục."
 
 #: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
@@ -10878,19 +10882,19 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr ""
+msgstr "Hiện trư�ng \"Bcc\" khi gửi thư"
 
 #: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr ""
+msgstr "Hiện trư�ng \"Cc\" khi gửi thư"
 
 #: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr ""
+msgstr "Hiện trư�ng \"From\" (từ) khi gửi thư"
 
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr ""
+msgstr "Hiện trư�ng \"Reply To\" (trả l�i cho) khi gửi thư"
 
 #: ../mail/evolution-mail.schemas.in.h:170
 #| msgid "Also encrypt to sel_f when sending encrypted messages"
@@ -13879,11 +13883,11 @@ msgstr "Lỗi chạy Bogofilter (%s): "
 
 #: ../modules/bogofilter/evolution-bogofilter.c:164
 msgid "Failed to stream mail message content to Bogofilter: "
-msgstr ""
+msgstr "Lỗi truy�n nội dung thư cho Bogofilter: "
 
 #: ../modules/bogofilter/evolution-bogofilter.c:213
 msgid "Bogofilter either crashed or failed to process a mail message"
-msgstr ""
+msgstr "Bogofilter hoặc đổ vỡ hoặc thất bại trong việc xử lý thư"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:312
 msgid "Bogofilter Options"
@@ -14248,7 +14252,7 @@ msgstr "Danh sách các múi gi� vừa dùng trong một ô Xem Ngày."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
-msgstr "Danh sách các địa chỉ mạng máy chủ để xuất bản thông tin Rảnh/Bận."
+msgstr "Danh sách các địa chỉ mạng máy chủ để công bố thông tin Rảnh/Bận."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
@@ -16016,6 +16020,8 @@ msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
 msgstr ""
+"Không tìm thấy tài khoản tương ứng trong dịch vụ org.gnome.OnlineAccounts để "
+"lấy thẻ xác thực."
 
 #: ../modules/online-accounts/camel-sasl-xoauth.c:461
 #| msgid "Other"
@@ -16026,7 +16032,7 @@ msgstr "OAuth"
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
-msgstr ""
+msgstr "Tuỳ ch�n này sẽ kết nối đến dịch vụ Tài khoản trực tuyến GNOME"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
@@ -16078,7 +16084,7 @@ msgstr "Các hàm thử Bộ Nạp Phần Bổ Sung Python"
 #: ../modules/spamassassin/evolution-spamassassin.c:191
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr ""
+msgstr "Lỗi chạy SpamAssassin (%s): "
 
 #: ../modules/spamassassin/evolution-spamassassin.c:214
 #| msgid "Filter junk messages using SpamAssassin."
@@ -16093,11 +16099,11 @@ msgstr "Lỗi ghi '%s' vào SpamAssassin: "
 
 #: ../modules/spamassassin/evolution-spamassassin.c:261
 msgid "Failed to read output from SpamAssassin: "
-msgstr ""
+msgstr "Lỗi đ�c kết quả từ SpamAssassin: "
 
 #: ../modules/spamassassin/evolution-spamassassin.c:316
 msgid "SpamAssassin either crashed or failed to process a mail message"
-msgstr ""
+msgstr "SpamAssassin hoặc đổ vỡ hoặc thất bại trong việc xử lý thư"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:835
 msgid "SpamAssassin Options"
@@ -16878,7 +16884,7 @@ msgstr "Nguồn mặc định"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
 msgid "Mark your preferred address book and calendar as default."
-msgstr ""
+msgstr "�ánh dấu sổ địa chỉ và lịch yêu thích làm mặc định."
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
@@ -16980,12 +16986,12 @@ msgstr "Gửi dòng đầu tự ch�n"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr ""
+msgstr "Tự động chạy trình biên soạn khi nhấn phím trong trình soạn thư"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 #: ../plugins/external-editor/external-editor.c:132
 msgid "Automatically launch when a new mail is edited"
-msgstr ""
+msgstr "Tự động chạy khi sửa thư mới"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
@@ -17052,6 +17058,8 @@ msgid ""
 "The external editor is still running. The mail composer window cannot be "
 "closed as long as the editor is active."
 msgstr ""
+"Trình biên soạn ngoại vẫn đang chạy. Trình soạn thư không thể đóng khi trình "
+"biên soạn vẫn hoạt động."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -17063,7 +17071,7 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr ""
+msgstr "Chèn ảnh chân dung mặc định"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
@@ -18157,6 +18165,7 @@ msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr ""
+"Lịch được ch�n đã chứa sự kiện '%s' rồi. Bạn có muốn sửa sự kiện cũ không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:606
 #, c-format
@@ -18164,6 +18173,8 @@ msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
+"Danh sách tác vụ được ch�n đã chứa tác vụ '%s' rồi. Bạn có muốn sửa tác vụ "
+"cũ không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
@@ -18171,6 +18182,8 @@ msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
+"Danh sách ghi nhớ được ch�n đã chứa ghi nhớ '%s' rồi. Bạn có muốn sửa ghi "
+"nhớ cũ không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:626
 #, c-format
@@ -18178,6 +18191,8 @@ msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 msgstr ""
+"Bạn đã ch�n %d thư để chuyển sang sự kiện. Bạn có thực sự muốn chuyển hết "
+"không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:629
 #, c-format
@@ -18185,6 +18200,8 @@ msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 msgstr ""
+"Bạn đã ch�n %d thư để chuyển sang tác vụ. Bạn có thực sự muốn chuyển hết "
+"không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:632
 #, c-format
@@ -18192,6 +18209,8 @@ msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 msgstr ""
+"Bạn đã ch�n %d thư để chuyển sang ghi nhớ. Bạn có thực sự muốn chuyển hết "
+"không?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:651
 #| msgid "Do you wish to overwrite it?"
@@ -18205,7 +18224,7 @@ msgstr "[Không tóm tắt]"
 
 #: ../plugins/mail-to-task/mail-to-task.c:738
 msgid "Invalid object returned from a server"
-msgstr ""
+msgstr "Máy chủ trả v� đối tượng không hợp lệ."
 
 #: ../plugins/mail-to-task/mail-to-task.c:788
 #, c-format
@@ -18492,7 +18511,7 @@ msgstr "Ưu tiên văn bản thô"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr ""
+msgstr "Xem thư dạng văn bản thô thậm chí khi chứa HTML."
 
 #: ../plugins/prefer-plain/prefer-plain.c:251
 msgid "Show HTML if present"
@@ -18520,11 +18539,11 @@ msgstr "Luôn luôn chỉ hiện văn bản thô"
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
-msgstr ""
+msgstr "Luôn hiện phần văn bản thô và coi phần khác là đính kèm nếu yêu cầu."
 
 #: ../plugins/prefer-plain/prefer-plain.c:313
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr ""
+msgstr "Hiện _nội dung HTML dạng đính kèm"
 
 #: ../plugins/prefer-plain/prefer-plain.c:333
 msgid "HTML _Mode"
@@ -18575,7 +18594,7 @@ msgstr "�ang nhập dữ liệu Outlook"
 #: ../plugins/publish-calendar/publish-calendar.c:155
 #: ../plugins/publish-calendar/publish-calendar.c:157
 msgid "Calendar Publishing"
-msgstr "Xuất bản lịch"
+msgstr "Công bố lịch"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
@@ -18602,17 +18621,17 @@ msgstr "Không thể mở %s: lỗi lạ"
 #: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr ""
+msgstr "Lỗi công bố đến %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:240
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr ""
+msgstr "Hoàn tất tốt đẹp công bố đến %s"
 
 #: ../plugins/publish-calendar/publish-calendar.c:288
 #, c-format
 msgid "Mount of %s failed:"
-msgstr ""
+msgstr "Lỗi gắn kết %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:619
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -18628,11 +18647,11 @@ msgstr "Bạn có chắc muốn gỡ b� địa chỉ này không?"
 #. * ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1099
 msgid "Could not create publish thread."
-msgstr ""
+msgstr "Không thể tạo nhánh công bố."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
-msgstr "_Xuất bản thông tin lịch"
+msgstr "_Công bố thông tin lịch"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Custom Location"
@@ -18660,11 +18679,11 @@ msgstr "FTP Công cộng"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
-msgstr "�ịa điểm Xuất bản"
+msgstr "�ịa điểm công bố"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
-msgstr "_Tần số Xuất bản:"
+msgstr "_Tần số công bố:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
@@ -18684,7 +18703,7 @@ msgstr "Nguồn"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
-msgstr ""
+msgstr "_Khoảng th�i gian:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "WebDAV (HTTP)"
@@ -18708,7 +18727,7 @@ msgstr "_Mật khẩu:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
-msgstr "_Xuất dạng:"
+msgstr "_Công bố dạng:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
@@ -18726,7 +18745,7 @@ msgstr "iCal"
 #: ../plugins/publish-calendar/publish-format-ical.c:92
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr ""
+msgstr "Không thể công bố lịch: Backend lịch không còn tồn tại"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:518
 msgid "New Location"
@@ -18885,6 +18904,9 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
+"Phần mở rộng nháp dựa theo mẫu. Bạn có thể dùng những biến như $ORIG"
+"[subject], $ORIG[from], $ORIG[to] hoặc $ORIG[body], những biến này sẽ được "
+"thay thế bằng giá trị từ thư bạn định gửi trả l�i."
 
 #: ../plugins/templates/templates.c:1094
 msgid "No Title"
@@ -18900,7 +18922,7 @@ msgstr "Lưu làm mẫu"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr ""
+msgstr "Giải mã đính kèm TNEF (winmail.data) từ Microsoft Office."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
@@ -18908,11 +18930,11 @@ msgstr "Bộ giải mã đính kèm TNEF"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
-msgstr ""
+msgstr "vCard nhúng"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
 msgid "Show vCards directly in mail messages."
-msgstr ""
+msgstr "Hiện vCard trực tiếp trong thư."
 
 #: ../plugins/vcard-inline/vcard-inline.c:207
 #: ../plugins/vcard-inline/vcard-inline.c:292
@@ -19676,6 +19698,9 @@ msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
+"Khởi động Evolution với thành phần xác định. Tuỳ ch�n chấp nhận là "
+"'mail' (thư), 'calendar' (lịch), 'contacts' (sổ địa chỉ), 'tasks' (tác vụ) "
+"và 'memos' (ghi nhớ)"
 
 #: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
@@ -19711,7 +19736,7 @@ msgstr "Tắt ô cửa sổ xem thử của Thư, Liên lạc và Tác vụ."
 
 #: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
-msgstr ""
+msgstr "URI hoặc tên tập tin nhập làm phần còn lại của đối số."
 
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
@@ -19839,17 +19864,17 @@ msgstr "�ang bắt đầu %s"
 #: ../smclient/eggdesktopfile.c:1102
 #, c-format
 msgid "Application does not accept documents on command line"
-msgstr ""
+msgstr "Ứng dụng không chấp nhận tài liệu từ dòng lệnh"
 
 #: ../smclient/eggdesktopfile.c:1170
 #, c-format
 msgid "Unrecognized launch option: %d"
-msgstr ""
+msgstr "Tham số phóng không nhận dạng được: %d"
 
 #: ../smclient/eggdesktopfile.c:1370
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
+msgstr "Không thể chuyển URI tài liệu cho mục desktop 'Type=Link'"
 
 #: ../smclient/eggdesktopfile.c:1391
 #, c-format
@@ -23964,7 +23989,7 @@ msgstr "Cách nhập"
 #~ msgstr "Thư cuộc h�p sai"
 
 #~ msgid "<b>%s</b> has published task information."
-#~ msgstr "<b>%s</b> đã xuất bản tin tức tác vụ."
+#~ msgstr "<b>%s</b> đã công bố tin tức tác vụ."
 
 #~ msgid "Task Information"
 #~ msgstr "Tin tức tác vụ"
@@ -24006,7 +24031,7 @@ msgstr "Cách nhập"
 #~ msgstr "Thư tác vụ sai"
 
 #~ msgid "<b>%s</b> has published free/busy information."
-#~ msgstr "<b>%s</b> đã xuất bản tin tức Rảnh/Bận"
+#~ msgstr "<b>%s</b> đã công bố tin tức Rảnh/Bận"
 
 #~ msgid "Free/Busy Information"
 #~ msgstr "Tin tức bận/rảnh"
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
index 09c376edda..20e7af463d 100644
--- a/shell/apps_evolution_shell.schemas.in
+++ b/shell/apps_evolution_shell.schemas.in
@@ -58,20 +58,6 @@
       </locale>
     </schema>
 
-    <!-- Initial GtkFileChooser Folder -->
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/file_chooser_folder</key>
-      <applyto>/apps/evolution/shell/file_chooser_folder</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Initial file chooser folder</short>
-        <long>Initial folder for GtkFileChooser dialogs.</long>
-      </locale>
-    </schema>
-
     <!-- Offline Mode -->
 
     <schema>
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index c7a41510f2..069e0bfa83 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -40,7 +40,6 @@
 #include "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
-#include "widgets/misc/e-hinted-entry.h"
 
 #include "e-shell-backend.h"
 #include "e-shell-searchbar.h"
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 13b0b49349..370d6b4f5e 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -36,7 +36,6 @@
 
 #include "e-util/e-util.h"
 #include "widgets/misc/e-action-combo-box.h"
-#include "widgets/misc/e-hinted-entry.h"
 
 #include "e-shell-window-actions.h"
 
@@ -979,7 +978,7 @@ e_shell_searchbar_init (EShellSearchbar *searchbar)
 
 	label = GTK_LABEL (widget);
 
-	widget = e_hinted_entry_new ();
+	widget = gtk_entry_new ();
 	gtk_label_set_mnemonic_widget (label, widget);
 	gtk_box_pack_start (box, widget, TRUE, TRUE, 0);
 	searchbar->priv->search_entry = widget;
@@ -1168,26 +1167,26 @@ e_shell_searchbar_set_filter_visible (EShellSearchbar *searchbar,
 const gchar *
 e_shell_searchbar_get_search_hint (EShellSearchbar *searchbar)
 {
-	EHintedEntry *entry;
+	GtkEntry *entry;
 
 	g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), NULL);
 
-	entry = E_HINTED_ENTRY (searchbar->priv->search_entry);
+	entry = GTK_ENTRY (searchbar->priv->search_entry);
 
-	return e_hinted_entry_get_hint (entry);
+	return gtk_entry_get_placeholder_text (entry);
 }
 
 void
 e_shell_searchbar_set_search_hint (EShellSearchbar *searchbar,
                                    const gchar *search_hint)
 {
-	EHintedEntry *entry;
+	GtkEntry *entry;
 
 	g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar));
 
-	entry = E_HINTED_ENTRY (searchbar->priv->search_entry);
+	entry = GTK_ENTRY (searchbar->priv->search_entry);
 
-	e_hinted_entry_set_hint (entry, search_hint);
+	gtk_entry_set_placeholder_text (entry, search_hint);
 
 	g_object_notify (G_OBJECT (searchbar), "search-hint");
 }
@@ -1233,26 +1232,31 @@ e_shell_searchbar_set_search_option (EShellSearchbar *searchbar,
 const gchar *
 e_shell_searchbar_get_search_text (EShellSearchbar *searchbar)
 {
-	EHintedEntry *entry;
+	GtkEntry *entry;
 
 	g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), NULL);
 
-	entry = E_HINTED_ENTRY (searchbar->priv->search_entry);
+	entry = GTK_ENTRY (searchbar->priv->search_entry);
 
-	return e_hinted_entry_get_text (entry);
+	return gtk_entry_get_text (entry);
 }
 
 void
 e_shell_searchbar_set_search_text (EShellSearchbar *searchbar,
                                    const gchar *search_text)
 {
-	EHintedEntry *entry;
+	GtkEntry *entry;
 
 	g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar));
 
-	entry = E_HINTED_ENTRY (searchbar->priv->search_entry);
+	entry = GTK_ENTRY (searchbar->priv->search_entry);
 
-	e_hinted_entry_set_text (entry, search_text);
+	/* XXX Really wish gtk_entry_set_text()
+	 *     would just learn to accept NULL. */
+	if (search_text == NULL)
+		search_text = "";
+
+	gtk_entry_set_text (entry, search_text);
 
 	shell_searchbar_update_search_widgets (searchbar);
 
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 740960f555..b5a1f490ae 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -65,11 +65,10 @@ e_shell_configure_ui_manager (EShell *shell,
  * @customize_data: optional data to pass to @customize_func
  *
  * Runs a #GtkFileChooserDialog in open mode with the given title and
- * returns the selected #GFile.  It automatically remembers the selected
- * folder.  If @customize_func is provided, the function is called just
- * prior to running the dialog (the file chooser is the first argument,
- * @customize data is the second).  If the user cancels the dialog the
- * function will return %NULL.
+ * returns the selected #GFile.  If @customize_func is provided, the
+ * function is called just prior to running the dialog (the file chooser
+ * is the first argument, @customize data is the second).  If the user
+ * cancels the dialog the function will return %NULL.
  *
  * Returns: the #GFile to open, or %NULL
  **/
@@ -79,19 +78,13 @@ e_shell_run_open_dialog (EShell *shell,
                          GtkCallback customize_func,
                          gpointer customize_data)
 {
-	EShellSettings *shell_settings;
 	GtkFileChooser *file_chooser;
 	GFile *chosen_file = NULL;
 	GtkWidget *dialog;
 	GtkWindow *parent;
-	const gchar *property_name;
-	gchar *uri;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
-	property_name = "file-chooser-folder";
-	shell_settings = e_shell_get_shell_settings (shell);
-
 	parent = e_shell_get_active_window (shell);
 
 	dialog = gtk_file_chooser_dialog_new (
@@ -107,27 +100,13 @@ e_shell_run_open_dialog (EShell *shell,
 
 	gtk_file_chooser_set_local_only (file_chooser, FALSE);
 
-	/* Restore the current folder from the previous file chooser. */
-	uri = e_shell_settings_get_string (shell_settings, property_name);
-	if (uri != NULL)
-		gtk_file_chooser_set_current_folder_uri (file_chooser, uri);
-	g_free (uri);
-
 	/* Allow further customizations before running the dialog. */
 	if (customize_func != NULL)
 		customize_func (dialog, customize_data);
 
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT)
-		goto exit;
-
-	chosen_file = gtk_file_chooser_get_file (file_chooser);
-
-	/* Save the current folder for subsequent file choosers. */
-	uri = gtk_file_chooser_get_current_folder_uri (file_chooser);
-	e_shell_settings_set_string (shell_settings, property_name, uri);
-	g_free (uri);
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+		chosen_file = gtk_file_chooser_get_file (file_chooser);
 
-exit:
 	gtk_widget_destroy (dialog);
 
 	return chosen_file;
@@ -143,16 +122,15 @@ exit:
  * @customize_data: optional data to pass to @customize_func
  *
  * Runs a #GtkFileChooserDialog in save mode with the given title and
- * returns the selected #GFile.  It automatically remembers the selected
- * folder.  If @customize_func is provided, the function is called just
- * prior to running the dialog (the file chooser is the first argument,
- * @customize_data is the second).  If the user cancels the dialog the
- * function will return %NULL.
+ * returns the selected #GFile.  If @customize_func is provided, the
+ * function is called just prior to running the dialog (the file chooser
+ * is the first argument, @customize_data is the second).  If the user
+ * cancels the dialog the function will return %NULL.
  *
  * With non-%NULL @filters will be added also file filters to the dialog.
  * The string format is "pat1:mt1;pat2:mt2:...", where 'pat' is a pattern
- * and 'mt' is a MIME type for the pattern to be used.
- * There can be more than one MIME type, those are separated by comma.
+ * and 'mt' is a MIME type for the pattern to be used.  There can be more
+ * than one MIME type, those are separated by comma.
  *
  * Returns: the #GFile to save to, or %NULL
  **/
@@ -164,19 +142,13 @@ e_shell_run_save_dialog (EShell *shell,
                          GtkCallback customize_func,
                          gpointer customize_data)
 {
-	EShellSettings *shell_settings;
 	GtkFileChooser *file_chooser;
 	GFile *chosen_file = NULL;
 	GtkWidget *dialog;
 	GtkWindow *parent;
-	const gchar *property_name;
-	gchar *uri;
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
-	property_name = "file-chooser-folder";
-	shell_settings = e_shell_get_shell_settings (shell);
-
 	parent = e_shell_get_active_window (shell);
 
 	dialog = gtk_file_chooser_dialog_new (
@@ -193,12 +165,6 @@ e_shell_run_save_dialog (EShell *shell,
 	gtk_file_chooser_set_local_only (file_chooser, FALSE);
 	gtk_file_chooser_set_do_overwrite_confirmation (file_chooser, TRUE);
 
-	/* Restore the current folder from the previous file chooser. */
-	uri = e_shell_settings_get_string (shell_settings, property_name);
-	if (uri != NULL)
-		gtk_file_chooser_set_current_folder_uri (file_chooser, uri);
-	g_free (uri);
-
 	if (suggestion != NULL)
 		gtk_file_chooser_set_current_name (file_chooser, suggestion);
 
@@ -254,17 +220,9 @@ e_shell_run_save_dialog (EShell *shell,
 	if (customize_func != NULL)
 		customize_func (dialog, customize_data);
 
-	if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT)
-		goto exit;
-
-	chosen_file = gtk_file_chooser_get_file (file_chooser);
-
-	/* Save the current folder for subsequent file choosers. */
-	uri = gtk_file_chooser_get_current_folder_uri (file_chooser);
-	e_shell_settings_set_string (shell_settings, property_name, uri);
-	g_free (uri);
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+		chosen_file = gtk_file_chooser_get_file (file_chooser);
 
-exit:
 	gtk_widget_destroy (dialog);
 
 	return chosen_file;
@@ -306,7 +264,9 @@ e_shell_utils_import_uris (EShell *shell,
 			assistant, "finished",
 			G_CALLBACK (gtk_widget_destroy), NULL);
 
-		e_shell_watch_window (shell, GTK_WINDOW (assistant));
+		gtk_application_add_window (
+			GTK_APPLICATION (shell),
+			GTK_WINDOW (assistant));
 
 		gtk_widget_show (assistant);
 	} else
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 105e45e6a6..2b86bb1ec3 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -475,7 +475,7 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 	e_plugin_ui_register_manager (ui_manager, id, shell_window);
 	e_plugin_ui_enable_manager (ui_manager, id);
 
-	e_shell_watch_window (shell, window);
+	gtk_application_add_window (GTK_APPLICATION (shell), window);
 }
 
 void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 8e9f39c5ce..1a969de8c9 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -125,17 +125,20 @@ static void
 shell_window_update_close_action_cb (EShellWindow *shell_window)
 {
 	EShell *shell;
-	GList *watched_windows;
+	GtkApplication *application;
+	GList *list;
 	gint n_shell_windows = 0;
 
 	shell = e_shell_window_get_shell (shell_window);
-	watched_windows = e_shell_get_watched_windows (shell);
+
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
 
 	/* Count the shell windows. */
-	while (watched_windows != NULL) {
-		if (E_IS_SHELL_WINDOW (watched_windows->data))
+	while (list != NULL) {
+		if (E_IS_SHELL_WINDOW (list->data))
 			n_shell_windows++;
-		watched_windows = g_list_next (watched_windows);
+		list = g_list_next (list);
 	}
 
 	/* Disable Close Window if there's only one shell window.
@@ -171,14 +174,14 @@ shell_window_set_shell (EShellWindow *shell_window,
 	array = shell_window->priv->signal_handler_ids;
 
 	handler_id = g_signal_connect_swapped (
-		shell, "window-created",
+		shell, "window-added",
 		G_CALLBACK (shell_window_update_close_action_cb),
 		shell_window);
 
 	g_array_append_val (array, handler_id);
 
 	handler_id = g_signal_connect_swapped (
-		shell, "window-destroyed",
+		shell, "window-removed",
 		G_CALLBACK (shell_window_update_close_action_cb),
 		shell_window);
 
@@ -1510,9 +1513,9 @@ e_shell_window_set_toolbar_visible (EShellWindow *shell_window,
  * Registers a list of #GtkAction<!-- -->s to appear in
  * @shell_window<!-- -->'s "New" menu and toolbar button.  This
  * function should be called from an #EShell<!-- -->'s
- * #EShell::window-created signal handler.  The #EShellBackend calling
- * this function should pass its own name for the @backend_name argument
- * (i.e. the <structfield>name</structfield> field from its own
+ * #GtkApplication::window-added signal handler.  The #EShellBackend
+ * calling this function should pass its own name for the @backend_name
+ * argument (i.e. the <structfield>name</structfield> field from its own
  * #EShellBackendInfo).
  *
  * The registered #GtkAction<!-- -->s should be for creating individual
@@ -1597,9 +1600,9 @@ e_shell_window_register_new_item_actions (EShellWindow *shell_window,
  * Registers a list of #GtkAction<!-- -->s to appear in
  * @shell_window<!-- -->'s "New" menu and toolbar button.  This
  * function should be called from an #EShell<!-- -->'s
- * #EShell::window-created signal handler.  The #EShellBackend calling
- * this function should pass its own name for the @backend_name argument
- * (i.e. the <structfield>name</structfield> field from its own
+ * #GtkApplication::window-added signal handler.  The #EShellBackend
+ * calling this function should pass its own name for the @backend_name
+ * argument (i.e. the <structfield>name</structfield> field from its own
  * #EShellBackendInfo).
  *
  * The registered #GtkAction<!-- -->s should be for creating item
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 7ef48c2149..1e8cd3c0f9 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -48,7 +48,6 @@
 
 struct _EShellPrivate {
 	GQueue alerts;
-	GList *watched_windows;
 	EShellSettings *settings;
 	GConfClient *gconf_client;
 	GActionGroup *action_group;
@@ -98,8 +97,6 @@ enum {
 	PREPARE_FOR_ONLINE,
 	PREPARE_FOR_QUIT,
 	QUIT_REQUESTED,
-	WINDOW_CREATED,
-	WINDOW_DESTROYED,
 	LAST_SIGNAL
 };
 
@@ -162,86 +159,37 @@ shell_notify_online_cb (EShell *shell)
 }
 
 static gboolean
-shell_window_delete_event_cb (EShell *shell,
-                              GtkWindow *window)
+shell_window_delete_event_cb (GtkWindow *window,
+                              GdkEvent *event,
+                              GtkApplication *application)
 {
 	/* If other windows are open we can safely close this one. */
-	if (g_list_length (shell->priv->watched_windows) > 1)
+	if (g_list_length (gtk_application_get_windows (application)) > 1)
 		return FALSE;
 
 	/* Otherwise we initiate application quit. */
-	e_shell_quit (shell, E_SHELL_QUIT_LAST_WINDOW);
+	e_shell_quit (E_SHELL (application), E_SHELL_QUIT_LAST_WINDOW);
 
 	return TRUE;
 }
 
-static gboolean
-shell_window_focus_in_event_cb (EShell *shell,
-                                GdkEventFocus *event,
-                                GtkWindow *window)
-{
-	GList *list, *link;
-
-	/* Keep the watched windows list sorted by most recently focused,
-	 * so the first item in the list should always be the currently
-	 * focused window. */
-
-	list = shell->priv->watched_windows;
-	link = g_list_find (list, window);
-	g_return_val_if_fail (link != NULL, FALSE);
-
-	if (link != list) {
-		list = g_list_remove_link (list, link);
-		list = g_list_concat (link, list);
-	}
-
-	shell->priv->watched_windows = list;
-
-	return FALSE;
-}
-
-static gboolean
-shell_emit_window_destroyed_cb (EShell *shell)
-{
-	g_signal_emit (shell, signals[WINDOW_DESTROYED], 0);
-
-	g_object_unref (shell);
-
-	return FALSE;
-}
-
-static void
-shell_window_weak_notify_cb (EShell *shell,
-                             GObject *where_the_object_was)
-{
-	GList *list;
-
-	list = shell->priv->watched_windows;
-	list = g_list_remove (list, where_the_object_was);
-	shell->priv->watched_windows = list;
-
-	/* Let the watched window finish finalizing itself before we
-	 * emit the "window-destroyed" signal, which may trigger the
-	 * application to initiate shutdown. */
-	g_idle_add (
-		(GSourceFunc) shell_emit_window_destroyed_cb,
-		g_object_ref (shell));
-}
-
 static void
 shell_action_new_window_cb (GSimpleAction *action,
                             GVariant *parameter,
                             EShell *shell)
 {
-	GList *watched_windows;
+	GtkApplication *application;
+	GList *list;
 	const gchar *view_name;
 
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
+
 	view_name = g_variant_get_string (parameter, NULL);
-	watched_windows = e_shell_get_watched_windows (shell);
 
 	/* Present the first EShellWindow showing 'view_name'. */
-	while (watched_windows != NULL) {
-		GtkWindow *window = GTK_WINDOW (watched_windows->data);
+	while (list != NULL) {
+		GtkWindow *window = GTK_WINDOW (list->data);
 
 		if (E_IS_SHELL_WINDOW (window)) {
 			const gchar *active_view;
@@ -254,7 +202,7 @@ shell_action_new_window_cb (GSimpleAction *action,
 			}
 		}
 
-		watched_windows = g_list_next (watched_windows);
+		list = g_list_next (list);
 	}
 
 	/* No suitable EShellWindow found, so create one. */
@@ -433,11 +381,14 @@ shell_ready_for_quit (EShell *shell,
                       EActivity *activity,
                       gboolean is_last_ref)
 {
+	GtkApplication *application;
 	GList *list;
 
 	if (!is_last_ref)
 		return;
 
+	application = GTK_APPLICATION (shell);
+
 	/* Increment the reference count so we can safely emit
 	 * a signal without triggering the toggle reference. */
 	g_object_ref (activity);
@@ -455,7 +406,7 @@ shell_ready_for_quit (EShell *shell,
 	 * of the watched windows list because the act of destroying a
 	 * watched window will modify the watched windows list, which
 	 * would derail the iteration. */
-	list = g_list_copy (e_shell_get_watched_windows (shell));
+	list = g_list_copy (gtk_application_get_windows (application));
 	g_list_foreach (list, (GFunc) gtk_widget_destroy, NULL);
 	g_list_free (list);
 }
@@ -463,12 +414,15 @@ shell_ready_for_quit (EShell *shell,
 static void
 shell_prepare_for_quit (EShell *shell)
 {
+	GtkApplication *application;
 	GList *list, *iter;
 
 	/* Are preparations already in progress? */
 	if (shell->priv->preparing_for_quit != NULL)
 		return;
 
+	application = GTK_APPLICATION (shell);
+
 	shell->priv->preparing_for_quit = e_activity_new ();
 
 	e_activity_set_text (
@@ -490,7 +444,7 @@ shell_prepare_for_quit (EShell *shell)
 	g_object_unref (shell->priv->preparing_for_quit);
 
 	/* Desensitize all watched windows to prevent user action. */
-	list = e_shell_get_watched_windows (shell);
+	list = gtk_application_get_windows (application);
 	for (iter = list; iter != NULL; iter = iter->next)
 		gtk_widget_set_sensitive (GTK_WIDGET (iter->data), FALSE);
 }
@@ -839,43 +793,50 @@ shell_startup (GApplication *application)
 static void
 shell_activate (GApplication *application)
 {
-	EShell *shell;
-	GList *watched_windows;
+	GList *list;
 
 	/* Do not chain up.  Default method just emits a warning. */
 
-	shell = E_SHELL (application);
-	watched_windows = e_shell_get_watched_windows (shell);
+	list = gtk_application_get_windows (GTK_APPLICATION (application));
 
 	/* Present the first EShellWindow, if found. */
-	while (watched_windows != NULL) {
-		GtkWindow *window = GTK_WINDOW (watched_windows->data);
+	while (list != NULL) {
+		GtkWindow *window = GTK_WINDOW (list->data);
 
 		if (E_IS_SHELL_WINDOW (window)) {
 			gtk_window_present (window);
 			return;
 		}
 
-		watched_windows = g_list_next (watched_windows);
+		list = g_list_next (list);
 	}
 
 	/* No EShellWindow found, so create one. */
-	e_shell_create_shell_window (shell, NULL);
+	e_shell_create_shell_window (E_SHELL (application), NULL);
 }
 
 static void
-shell_quit_mainloop (GApplication *application)
+shell_window_added (GtkApplication *application,
+                    GtkWindow *window)
 {
-	/* XXX Don't allow GApplication to quit the main loop.
-	 *     We'll do that ourselves until GtkApplication gets
-	 *     a signal equivalent to EShell::window-destroyed. */
-}
+	gchar *role;
 
-static void
-shell_window_destroyed (EShell *shell)
-{
-	if (e_shell_get_watched_windows (shell) == NULL)
-		gtk_main_quit ();
+	/* Chain up to parent's window_added() method. */
+	GTK_APPLICATION_CLASS (e_shell_parent_class)->
+		window_added (application, window);
+
+	g_signal_connect (
+		window, "delete-event",
+		G_CALLBACK (shell_window_delete_event_cb), application);
+
+	/* We use the window's own type name and memory
+	 * address to form a unique window role for X11. */
+	role = g_strdup_printf (
+		"%s-%" G_GINTPTR_FORMAT,
+		G_OBJECT_TYPE_NAME (window),
+		(gintptr) window);
+	gtk_window_set_role (window, role);
+	g_free (role);
 }
 
 static gboolean
@@ -895,6 +856,7 @@ e_shell_class_init (EShellClass *class)
 {
 	GObjectClass *object_class;
 	GApplicationClass *application_class;
+	GtkApplicationClass *gtk_application_class;
 
 	g_type_class_add_private (class, sizeof (EShellPrivate));
 
@@ -908,9 +870,9 @@ e_shell_class_init (EShellClass *class)
 	application_class = G_APPLICATION_CLASS (class);
 	application_class->startup = shell_startup;
 	application_class->activate = shell_activate;
-	application_class->quit_mainloop =  shell_quit_mainloop;
 
-	class->window_destroyed = shell_window_destroyed;
+	gtk_application_class = GTK_APPLICATION_CLASS (class);
+	gtk_application_class->window_added = shell_window_added;
 
 	/**
 	 * EShell:express-mode
@@ -1184,38 +1146,6 @@ e_shell_class_init (EShellClass *class)
 		g_cclosure_marshal_VOID__ENUM,
 		G_TYPE_NONE, 1,
 		E_TYPE_SHELL_QUIT_REASON);
-
-	/**
-	 * EShell::window-created
-	 * @shell: the #EShell which emitted the signal
-	 * @window: the newly created #GtkWindow
-	 *
-	 * Emitted when @shell begins watching a newly created window.
-	 **/
-	signals[WINDOW_CREATED] = g_signal_new (
-		"window-created",
-		G_OBJECT_CLASS_TYPE (object_class),
-		G_SIGNAL_RUN_LAST,
-		G_STRUCT_OFFSET (EShellClass, window_created),
-		NULL, NULL,
-		g_cclosure_marshal_VOID__OBJECT,
-		G_TYPE_NONE, 1,
-		GTK_TYPE_WINDOW);
-
-	/**
-	 * EShell::window-destroyed
-	 * @shell: the #EShell which emitted the signal
-	 *
-	 * Emitted when a watched is destroyed.
-	 **/
-	signals[WINDOW_DESTROYED] = g_signal_new (
-		"window-destroyed",
-		G_OBJECT_CLASS_TYPE (object_class),
-		G_SIGNAL_RUN_LAST,
-		G_STRUCT_OFFSET (EShellClass, window_destroyed),
-		NULL, NULL,
-		g_cclosure_marshal_VOID__VOID,
-		G_TYPE_NONE, 0);
 }
 
 static void
@@ -1266,10 +1196,6 @@ e_shell_init (EShell *shell)
 	 *     otherwise the GConf bindings will not get set up. */
 
 	e_shell_settings_install_property_for_key (
-		"file-chooser-folder",
-		"/apps/evolution/shell/file_chooser_folder");
-
-	e_shell_settings_install_property_for_key (
 		"start-offline",
 		"/apps/evolution/shell/start_offline");
 
@@ -1481,9 +1407,9 @@ e_shell_get_gconf_client (EShell *shell)
  * @shell: an #EShell
  * @view_name: name of the initial shell view, or %NULL
  *
- * Creates a new #EShellWindow and emits the #EShell::window-created
- * signal.  Use this function instead of e_shell_window_new() so that
- * @shell can track the window.
+ * Creates a new #EShellWindow.  Use this function instead of
+ * e_shell_window_new() so that @shell can properly configure
+ * the window.
  *
  * Returns: a new #EShellWindow
  **/
@@ -1619,18 +1545,21 @@ void
 e_shell_submit_alert (EShell *shell,
                       EAlert *alert)
 {
+	GtkApplication *application;
 	GList *list, *iter;
 
 	g_return_if_fail (E_IS_SHELL (shell));
 	g_return_if_fail (E_IS_ALERT (alert));
 
+	application = GTK_APPLICATION (shell);
+
 	g_queue_push_tail (&shell->priv->alerts, g_object_ref (alert));
 
 	g_signal_connect_swapped (
 		alert, "response",
 		G_CALLBACK (shell_alert_response_cb), shell);
 
-	list = e_shell_get_watched_windows (shell);
+	list = gtk_application_get_windows (application);
 
 	/* Submit the alert to all available EShellWindows. */
 	for (iter = list; iter != NULL; iter = g_list_next (iter))
@@ -1640,92 +1569,11 @@ e_shell_submit_alert (EShell *shell,
 }
 
 /**
- * e_shell_watch_window:
- * @shell: an #EShell
- * @window: a #GtkWindow
- *
- * Makes @shell "watch" a newly created toplevel window, and emits the
- * #EShell::window-created signal.  All #EShellWindow<!-- -->s should be
- * watched, along with any editor or viewer windows that may be shown in
- * response to e_shell_handle_uris().  When the last watched window is
- * closed, Evolution terminates.
- **/
-void
-e_shell_watch_window (EShell *shell,
-                      GtkWindow *window)
-{
-	GList *list;
-	gchar *role;
-
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (GTK_IS_WINDOW (window));
-
-	list = shell->priv->watched_windows;
-
-	/* XXX If my suggestion in [1] is accepted for GtkApplication
-	 *     then we can get rid of our own watched_windows list.
-	 *
-	 *     [1] https://bugzilla.gnome.org/show_bug.cgi?id=624539
-	 */
-
-	/* Ignore duplicates. */
-	if (g_list_find (list, window) != NULL)
-		return;
-
-	list = g_list_prepend (list, window);
-	shell->priv->watched_windows = list;
-
-	gtk_application_add_window (GTK_APPLICATION (shell), window);
-
-	/* We use the window's own type name and memory
-	 * address to form a unique window role for X11. */
-	role = g_strdup_printf (
-		"%s-%" G_GINTPTR_FORMAT,
-		G_OBJECT_TYPE_NAME (window),
-		(gintptr) window);
-	gtk_window_set_role (window, role);
-	g_free (role);
-
-	g_signal_connect_swapped (
-		window, "delete-event",
-		G_CALLBACK (shell_window_delete_event_cb), shell);
-
-	g_signal_connect_swapped (
-		window, "focus-in-event",
-		G_CALLBACK (shell_window_focus_in_event_cb), shell);
-
-	g_object_weak_ref (
-		G_OBJECT (window), (GWeakNotify)
-		shell_window_weak_notify_cb, shell);
-
-	g_signal_emit (shell, signals[WINDOW_CREATED], 0, window);
-}
-
-/**
- * e_shell_get_watched_windows:
- * @shell: an #EShell
- *
- * Returns a list of windows being watched by @shell.  The list is sorted
- * by the most recently focused window, such that the first instance is the
- * currently focused window.  (Useful for choosing a parent for a transient
- * window.)  The list is owned by @shell and should not be modified or freed.
- *
- * Returns: a list of watched windows
- **/
-GList *
-e_shell_get_watched_windows (EShell *shell)
-{
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->watched_windows;
-}
-
-/**
  * e_shell_get_active_window:
  * @shell: an #EShell or %NULL to use the default shell
  *
  * Returns the most recently focused watched window, according to
- * e_shell_get_watched_windows().  Convenient for finding a parent
+ * gtk_application_get_windows().  Convenient for finding a parent
  * for a transient window.
  *
  * Note the returned window is not necessarily an #EShellWindow.
@@ -1735,22 +1583,24 @@ e_shell_get_watched_windows (EShell *shell)
 GtkWindow *
 e_shell_get_active_window (EShell *shell)
 {
-	GList *watched_windows;
+	GtkApplication *application;
+	GList *list;
 
 	if (shell == NULL)
 		shell = e_shell_get_default ();
 
 	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
 
-	watched_windows = e_shell_get_watched_windows (shell);
+	application = GTK_APPLICATION (shell);
+	list = gtk_application_get_windows (application);
 
-	if (!watched_windows)
+	if (list == NULL)
 		return NULL;
 
 	/* Sanity check */
-	g_return_val_if_fail (GTK_IS_WINDOW (watched_windows->data), NULL);
+	g_return_val_if_fail (GTK_IS_WINDOW (list->data), NULL);
 
-	return GTK_WINDOW (watched_windows->data);
+	return GTK_WINDOW (list->data);
 }
 
 /**
diff --git a/shell/e-shell.h b/shell/e-shell.h
index ede071e2e3..5110dd4a9c 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -106,9 +106,6 @@ struct _EShellClass {
 						 EActivity *activity);
 	void		(*quit_requested)	(EShell *shell,
 						 EShellQuitReason reason);
-	void		(*window_created)	(EShell *shell,
-						 GtkWindow *window);
-	void		(*window_destroyed)	(EShell *shell);
 };
 
 GType		e_shell_get_type		(void);
@@ -130,9 +127,6 @@ guint		e_shell_handle_uris		(EShell *shell,
 						 gboolean do_import);
 void		e_shell_submit_alert		(EShell *shell,
 						 EAlert *alert);
-void		e_shell_watch_window		(EShell *shell,
-						 GtkWindow *window);
-GList *		e_shell_get_watched_windows	(EShell *shell);
 GtkWindow *     e_shell_get_active_window	(EShell *shell);
 gboolean	e_shell_get_meego_mode		(EShell *shell);
 gboolean	e_shell_get_express_mode	(EShell *shell);
diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c
index a30cb8a7b5..79f4aa876f 100644
--- a/shell/test/e-test-shell-backend.c
+++ b/shell/test/e-test-shell-backend.c
@@ -97,8 +97,8 @@ test_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
 }
 
 static void
-test_shell_backend_window_created_cb (EShellBackend *shell_backend,
-                                      GtkWindow *window)
+test_shell_backend_window_added_cb (EShellBackend *shell_backend,
+                                    GtkWindow *window)
 {
 	const gchar *backend_name;
 
@@ -119,7 +119,7 @@ test_shell_backend_window_created_cb (EShellBackend *shell_backend,
 }
 
 static void
-test_shell_backend_window_destroyed_cb (EShellBackend *shell_backend)
+test_shell_backend_window_removed_cb (EShellBackend *shell_backend)
 {
 	g_debug ("%s", G_STRFUNC);
 }
@@ -139,13 +139,13 @@ test_shell_backend_constructed (GObject *object)
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-created",
-		G_CALLBACK (test_shell_backend_window_created_cb),
+		shell, "window-added",
+		G_CALLBACK (test_shell_backend_window_added_cb),
 		shell_backend);
 
 	g_signal_connect_swapped (
-		shell, "window-destroyed",
-		G_CALLBACK (test_shell_backend_window_destroyed_cb),
+		shell, "window-removed",
+		G_CALLBACK (test_shell_backend_window_removed_cb),
 		shell_backend);
 
 	/* Chain up to parent's constructed() method. */
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index cd5cada041..79bc14bcbe 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -38,7 +38,6 @@ widgetsinclude_HEADERS =			\
 	e-contact-marker.h			\
 	e-dateedit.h				\
 	e-focus-tracker.h			\
-	e-hinted-entry.h			\
 	e-image-chooser.h			\
 	e-import-assistant.h			\
 	e-map.h					\
@@ -123,7 +122,6 @@ libemiscwidgets_la_SOURCES =			\
 	e-contact-marker.c			\
 	e-dateedit.c				\
 	e-focus-tracker.c			\
-	e-hinted-entry.c			\
 	e-image-chooser.c			\
 	e-import-assistant.c			\
 	e-map.c					\
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index b842aecf8d..2903c84227 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -53,7 +53,8 @@ struct _EAttachmentPanedPrivate {
 	GtkWidget *content_area;
 
 	gint active_view;
-	guint expanded : 1;
+	gboolean expanded;
+	gboolean resize_toplevel;
 };
 
 enum {
@@ -61,7 +62,8 @@ enum {
 	PROP_ACTIVE_VIEW,
 	PROP_DRAGGING,
 	PROP_EDITABLE,
-	PROP_EXPANDED
+	PROP_EXPANDED,
+	PROP_RESIZE_TOPLEVEL
 };
 
 /* Forward Declarations */
@@ -87,6 +89,9 @@ attachment_paned_notify_cb (EAttachmentPaned *paned,
                             GParamSpec *pspec,
                             GtkExpander *expander)
 {
+	GtkAllocation toplevel_allocation;
+	GtkWidget *toplevel;
+	GtkWidget *child;
 	GtkLabel *label;
 	const gchar *text;
 
@@ -99,6 +104,47 @@ attachment_paned_notify_cb (EAttachmentPaned *paned,
 		text = _("Show Attachment _Bar");
 
 	gtk_label_set_text_with_mnemonic (label, text);
+
+	/* Resize the top-level window if required conditions are met.
+	 * This is based on gtk_expander_resize_toplevel(), but adapted
+	 * to the fact our GtkExpander has no direct child widget. */
+
+	if (!e_attachment_paned_get_resize_toplevel (paned))
+		return;
+
+	if (!gtk_widget_get_realized (GTK_WIDGET (paned)))
+		return;
+
+	child = gtk_paned_get_child2 (GTK_PANED (paned));
+	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (paned));
+
+	if (toplevel == NULL)
+		return;
+
+	if (!gtk_widget_get_realized (GTK_WIDGET (toplevel)))
+		return;
+
+	gtk_widget_get_allocation (toplevel, &toplevel_allocation);
+
+	if (gtk_expander_get_expanded (expander)) {
+		GtkRequisition child_requisition;
+
+		gtk_widget_get_preferred_size (
+			child, &child_requisition, NULL);
+
+		toplevel_allocation.height += child_requisition.height;
+	} else {
+		GtkAllocation child_allocation;
+
+		gtk_widget_get_allocation (child, &child_allocation);
+
+		toplevel_allocation.height -= child_allocation.height;
+	}
+
+	gtk_window_resize (
+		GTK_WINDOW (toplevel),
+		toplevel_allocation.width,
+		toplevel_allocation.height);
 }
 
 static void
@@ -177,6 +223,12 @@ attachment_paned_set_property (GObject *object,
 				E_ATTACHMENT_PANED (object),
 				g_value_get_boolean (value));
 			return;
+
+		case PROP_RESIZE_TOPLEVEL:
+			e_attachment_paned_set_resize_toplevel (
+				E_ATTACHMENT_PANED (object),
+				g_value_get_boolean (value));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -191,25 +243,36 @@ attachment_paned_get_property (GObject *object,
 	switch (property_id) {
 		case PROP_ACTIVE_VIEW:
 			g_value_set_int (
-				value, e_attachment_paned_get_active_view (
+				value,
+				e_attachment_paned_get_active_view (
 				E_ATTACHMENT_PANED (object)));
 			return;
 
 		case PROP_DRAGGING:
 			g_value_set_boolean (
-				value, e_attachment_view_get_dragging (
+				value,
+				e_attachment_view_get_dragging (
 				E_ATTACHMENT_VIEW (object)));
 			return;
 
 		case PROP_EDITABLE:
 			g_value_set_boolean (
-				value, e_attachment_view_get_editable (
+				value,
+				e_attachment_view_get_editable (
 				E_ATTACHMENT_VIEW (object)));
 			return;
 
 		case PROP_EXPANDED:
 			g_value_set_boolean (
-				value, e_attachment_paned_get_expanded (
+				value,
+				e_attachment_paned_get_expanded (
+				E_ATTACHMENT_PANED (object)));
+			return;
+
+		case PROP_RESIZE_TOPLEVEL:
+			g_value_set_boolean (
+				value,
+				e_attachment_paned_get_resize_toplevel (
 				E_ATTACHMENT_PANED (object)));
 			return;
 	}
@@ -494,7 +557,14 @@ e_attachment_paned_class_init (EAttachmentPanedClass *class)
 			NUM_VIEWS,
 			0,
 			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT));
+			G_PARAM_CONSTRUCT |
+			G_PARAM_STATIC_STRINGS));
+
+	g_object_class_override_property (
+		object_class, PROP_DRAGGING, "dragging");
+
+	g_object_class_override_property (
+		object_class, PROP_EDITABLE, "editable");
 
 	g_object_class_install_property (
 		object_class,
@@ -505,13 +575,20 @@ e_attachment_paned_class_init (EAttachmentPanedClass *class)
 			NULL,
 			FALSE,
 			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT));
-
-	g_object_class_override_property (
-		object_class, PROP_DRAGGING, "dragging");
+			G_PARAM_CONSTRUCT |
+			G_PARAM_STATIC_STRINGS));
 
-	g_object_class_override_property (
-		object_class, PROP_EDITABLE, "editable");
+	g_object_class_install_property (
+		object_class,
+		PROP_RESIZE_TOPLEVEL,
+		g_param_spec_boolean (
+			"resize-toplevel",
+			"Resize-Toplevel",
+			NULL,
+			FALSE,
+			G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT |
+			G_PARAM_STATIC_STRINGS));
 }
 
 static void
@@ -768,6 +845,25 @@ e_attachment_paned_set_expanded (EAttachmentPaned *paned,
 	g_object_notify (G_OBJECT (paned), "expanded");
 }
 
+gboolean
+e_attachment_paned_get_resize_toplevel (EAttachmentPaned *paned)
+{
+	g_return_val_if_fail (E_IS_ATTACHMENT_PANED (paned), FALSE);
+
+	return paned->priv->resize_toplevel;
+}
+
+void
+e_attachment_paned_set_resize_toplevel (EAttachmentPaned *paned,
+                                        gboolean resize_toplevel)
+{
+	g_return_if_fail (E_IS_ATTACHMENT_PANED (paned));
+
+	paned->priv->resize_toplevel = resize_toplevel;
+
+	g_object_notify (G_OBJECT (paned), "resize-toplevel");
+}
+
 void
 e_attachment_paned_drag_data_received (EAttachmentPaned *paned,
                                        GdkDragContext *context,
diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h
index a9022a7bc6..7daffd5508 100644
--- a/widgets/misc/e-attachment-paned.h
+++ b/widgets/misc/e-attachment-paned.h
@@ -70,6 +70,11 @@ void		e_attachment_paned_set_active_view
 gboolean	e_attachment_paned_get_expanded	(EAttachmentPaned *paned);
 void		e_attachment_paned_set_expanded	(EAttachmentPaned *paned,
 						 gboolean expanded);
+gboolean	e_attachment_paned_get_resize_toplevel
+						(EAttachmentPaned *paned);
+void		e_attachment_paned_set_resize_toplevel
+						(EAttachmentPaned *paned,
+						 gboolean resize_toplevel);
 void		e_attachment_paned_drag_data_received
 						(EAttachmentPaned *paned,
 						 GdkDragContext *context,
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index 691fd518b8..8c808d9731 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -34,14 +34,12 @@
 
 struct _EAttachmentStorePrivate {
 	GHashTable *attachment_index;
-	gchar *current_folder_uri;
 
 	guint ignore_row_changed : 1;
 };
 
 enum {
 	PROP_0,
-	PROP_CURRENT_FOLDER_URI,
 	PROP_NUM_ATTACHMENTS,
 	PROP_NUM_LOADING,
 	PROP_TOTAL_SIZE
@@ -53,36 +51,12 @@ G_DEFINE_TYPE (
 	GTK_TYPE_LIST_STORE)
 
 static void
-attachment_store_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_CURRENT_FOLDER_URI:
-			e_attachment_store_set_current_folder_uri (
-				E_ATTACHMENT_STORE (object),
-				g_value_get_string (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
 attachment_store_get_property (GObject *object,
                                guint property_id,
                                GValue *value,
                                GParamSpec *pspec)
 {
 	switch (property_id) {
-		case PROP_CURRENT_FOLDER_URI:
-			g_value_set_string (
-				value,
-				e_attachment_store_get_current_folder_uri (
-				E_ATTACHMENT_STORE (object)));
-			return;
-
 		case PROP_NUM_ATTACHMENTS:
 			g_value_set_uint (
 				value,
@@ -126,28 +100,11 @@ attachment_store_finalize (GObject *object)
 
 	g_hash_table_destroy (priv->attachment_index);
 
-	g_free (priv->current_folder_uri);
-
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (e_attachment_store_parent_class)->finalize (object);
 }
 
 static void
-attachment_store_constructed (GObject *object)
-{
-	GConfBridge *bridge;
-	const gchar *key;
-
-	bridge = gconf_bridge_get ();
-
-	key = "/apps/evolution/shell/file_chooser_folder";
-	gconf_bridge_bind_property (bridge, key, object, "current-folder-uri");
-
-	/* Chain up to parent's constructed() method. */
-	G_OBJECT_CLASS (e_attachment_store_parent_class)->constructed (object);
-}
-
-static void
 e_attachment_store_class_init (EAttachmentStoreClass *class)
 {
 	GObjectClass *object_class;
@@ -155,22 +112,9 @@ e_attachment_store_class_init (EAttachmentStoreClass *class)
 	g_type_class_add_private (class, sizeof (EAttachmentStorePrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = attachment_store_set_property;
 	object_class->get_property = attachment_store_get_property;
 	object_class->dispose = attachment_store_dispose;
 	object_class->finalize = attachment_store_finalize;
-	object_class->constructed = attachment_store_constructed;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_CURRENT_FOLDER_URI,
-		g_param_spec_string (
-			"current-folder-uri",
-			"Current Folder URI",
-			NULL,
-			NULL,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT));
 
 	g_object_class_install_property (
 		object_class,
@@ -409,34 +353,6 @@ e_attachment_store_get_attachments (EAttachmentStore *store)
 	return g_list_reverse (list);
 }
 
-const gchar *
-e_attachment_store_get_current_folder_uri (EAttachmentStore *store)
-{
-	g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), NULL);
-
-	return store->priv->current_folder_uri;
-}
-
-void
-e_attachment_store_set_current_folder_uri (EAttachmentStore *store,
-                                           const gchar *current_folder_uri)
-{
-	gchar *allocated;
-
-	g_return_if_fail (E_IS_ATTACHMENT_STORE (store));
-
-	if (current_folder_uri == NULL) {
-		const gchar *home_dir = g_get_home_dir ();
-		allocated = g_filename_to_uri (home_dir, NULL, NULL);
-	} else
-		allocated = g_strdup (current_folder_uri);
-
-	g_free (store->priv->current_folder_uri);
-	store->priv->current_folder_uri = allocated;
-
-	g_object_notify (G_OBJECT (store), "current-folder-uri");
-}
-
 guint
 e_attachment_store_get_num_attachments (EAttachmentStore *store)
 {
@@ -493,41 +409,6 @@ e_attachment_store_get_total_size (EAttachmentStore *store)
 	return total_size;
 }
 
-gint
-e_attachment_store_run_file_chooser_dialog (EAttachmentStore *store,
-                                            GtkWidget *dialog)
-{
-	GtkFileChooser *file_chooser;
-	gint response = GTK_RESPONSE_NONE;
-	const gchar *current_uri;
-	gboolean update_folder;
-
-	g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), response);
-	g_return_val_if_fail (GTK_IS_FILE_CHOOSER_DIALOG (dialog), response);
-
-	file_chooser = GTK_FILE_CHOOSER (dialog);
-	current_uri = e_attachment_store_get_current_folder_uri (store);
-	gtk_file_chooser_set_current_folder_uri (file_chooser, current_uri);
-
-	response = gtk_dialog_run (GTK_DIALOG (dialog));
-
-	update_folder =
-		(response == GTK_RESPONSE_ACCEPT) ||
-		(response == GTK_RESPONSE_OK) ||
-		(response == GTK_RESPONSE_YES) ||
-		(response == GTK_RESPONSE_APPLY);
-
-	if (update_folder) {
-		gchar *uri;
-
-		uri = gtk_file_chooser_get_current_folder_uri (file_chooser);
-		e_attachment_store_set_current_folder_uri (store, uri);
-		g_free (uri);
-	}
-
-	return response;
-}
-
 void
 e_attachment_store_run_load_dialog (EAttachmentStore *store,
                                     GtkWindow *parent)
@@ -560,7 +441,7 @@ e_attachment_store_run_load_dialog (EAttachmentStore *store,
 	gtk_file_chooser_set_extra_widget (file_chooser, option);
 	gtk_widget_show (option);
 
-	response = e_attachment_store_run_file_chooser_dialog (store, dialog);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
 	if (response != GTK_RESPONSE_OK)
 		goto exit;
@@ -643,7 +524,7 @@ e_attachment_store_run_save_dialog (EAttachmentStore *store,
 		gtk_file_chooser_set_current_name (file_chooser, name);
 	}
 
-	response = e_attachment_store_run_file_chooser_dialog (store, dialog);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
 	if (response == GTK_RESPONSE_OK)
 		destination = gtk_file_chooser_get_file (file_chooser);
@@ -773,10 +654,8 @@ attachment_store_get_uris_save_cb (EAttachment *attachment,
 
 	if (error == NULL)
 		g_simple_async_result_set_op_res_gpointer (simple, uris, NULL);
-	else {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	else
+		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
 
@@ -996,10 +875,8 @@ attachment_store_load_ready_cb (EAttachment *attachment,
 
 	if (error == NULL)
 		g_simple_async_result_set_op_res_gboolean (simple, TRUE);
-	else {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	else
+		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
 
@@ -1277,21 +1154,19 @@ attachment_store_save_cb (EAttachment *attachment,
 		save_context->error = NULL;
 
 		simple = save_context->simple;
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 
 		attachment_store_save_context_free (save_context);
-		g_error_free (error);
 		return;
 	}
 
 	if (error != NULL) {
 		simple = save_context->simple;
-		g_simple_async_result_set_from_error (simple, error);
+		g_simple_async_result_take_error (simple, error);
 		g_simple_async_result_complete (simple);
 
 		attachment_store_save_context_free (save_context);
-		g_error_free (error);
 		return;
 	}
 
diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h
index cdf33f507a..7309dd9415 100644
--- a/widgets/misc/e-attachment-store.h
+++ b/widgets/misc/e-attachment-store.h
@@ -87,20 +87,12 @@ void		e_attachment_store_add_to_multipart
 						 const gchar *default_charset);
 GList *		e_attachment_store_get_attachments
 						(EAttachmentStore *store);
-const gchar *	e_attachment_store_get_current_folder_uri
-						(EAttachmentStore *store);
-void		e_attachment_store_set_current_folder_uri
-						(EAttachmentStore *store,
-						 const gchar *current_folder);
 guint		e_attachment_store_get_num_attachments
 						(EAttachmentStore *store);
 guint		e_attachment_store_get_num_loading
 						(EAttachmentStore *store);
 goffset		e_attachment_store_get_total_size
 						(EAttachmentStore *store);
-gint		e_attachment_store_run_file_chooser_dialog
-						(EAttachmentStore *store,
-						 GtkWidget *dialog);
 void		e_attachment_store_run_load_dialog
 						(EAttachmentStore *store,
 						 GtkWindow *parent);
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index ccd135e5a0..4174fe92a5 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -1517,9 +1517,8 @@ attachment_load_check_for_error (LoadContext *load_context,
 		return FALSE;
 
 	simple = load_context->simple;
-	g_simple_async_result_set_from_error (simple, error);
+	g_simple_async_result_take_error (simple, error);
 	g_simple_async_result_complete (simple);
-	g_error_free (error);
 
 	attachment_load_context_free (load_context);
 
@@ -2021,9 +2020,8 @@ attachment_open_check_for_error (OpenContext *open_context,
 		return FALSE;
 
 	simple = open_context->simple;
-	g_simple_async_result_set_from_error (simple, error);
+	g_simple_async_result_take_error (simple, error);
 	g_simple_async_result_complete (simple);
-	g_error_free (error);
 
 	attachment_open_context_free (open_context);
 
@@ -2064,10 +2062,8 @@ attachment_open_file (GFile *file,
 
 	g_simple_async_result_set_op_res_gboolean (simple, success);
 
-	if (error != NULL) {
-		g_simple_async_result_set_from_error (simple, error);
-		g_error_free (error);
-	}
+	if (error != NULL)
+		g_simple_async_result_take_error (simple, error);
 
 	g_simple_async_result_complete (simple);
 	attachment_open_context_free (open_context);
@@ -2324,9 +2320,8 @@ attachment_save_check_for_error (SaveContext *save_context,
 		return FALSE;
 
 	simple = save_context->simple;
-	g_simple_async_result_set_from_error (simple, error);
+	g_simple_async_result_take_error (simple, error);
 	g_simple_async_result_complete (simple);
-	g_error_free (error);
 
 	attachment_save_context_free (save_context);
 
diff --git a/widgets/misc/e-hinted-entry.c b/widgets/misc/e-hinted-entry.c
deleted file mode 100644
index 21a4fff58e..0000000000
--- a/widgets/misc/e-hinted-entry.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * e-hinted-entry.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-hinted-entry.h"
-
-struct _EHintedEntryPrivate {
-	gchar *hint;
-	guint hint_shown : 1;
-};
-
-enum {
-	PROP_0,
-	PROP_HINT,
-	PROP_HINT_SHOWN
-};
-
-G_DEFINE_TYPE (
-	EHintedEntry,
-	e_hinted_entry,
-	GTK_TYPE_ENTRY)
-
-static void
-hinted_entry_show_hint (EHintedEntry *entry)
-{
-	GtkStyle *style;
-	const GdkColor *color;
-	const gchar *hint;
-
-	entry->priv->hint_shown = TRUE;
-
-	hint = e_hinted_entry_get_hint (entry);
-	gtk_entry_set_text (GTK_ENTRY (entry), hint);
-
-	style = gtk_widget_get_style (GTK_WIDGET (entry));
-	color = &style->text[GTK_STATE_INSENSITIVE];
-	gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, color);
-
-	g_object_notify (G_OBJECT (entry), "hint-shown");
-}
-
-static void
-hinted_entry_show_text (EHintedEntry *entry,
-                        const gchar *text)
-{
-	entry->priv->hint_shown = FALSE;
-
-	gtk_entry_set_text (GTK_ENTRY (entry), text);
-
-	gtk_widget_modify_text (GTK_WIDGET (entry), GTK_STATE_NORMAL, NULL);
-
-	g_object_notify (G_OBJECT (entry), "hint-shown");
-}
-
-static void
-hinted_entry_set_property (GObject *object,
-                           guint property_id,
-                           const GValue *value,
-                           GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_HINT:
-			e_hinted_entry_set_hint (
-				E_HINTED_ENTRY (object),
-				g_value_get_string (value));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-hinted_entry_get_property (GObject *object,
-                           guint property_id,
-                           GValue *value,
-                           GParamSpec *pspec)
-{
-	switch (property_id) {
-		case PROP_HINT:
-			g_value_set_string (
-				value, e_hinted_entry_get_hint (
-				E_HINTED_ENTRY (object)));
-			return;
-
-		case PROP_HINT_SHOWN:
-			g_value_set_boolean (
-				value, e_hinted_entry_get_hint_shown (
-				E_HINTED_ENTRY (object)));
-			return;
-	}
-
-	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-}
-
-static void
-hinted_entry_finalize (GObject *object)
-{
-	EHintedEntryPrivate *priv;
-
-	priv = E_HINTED_ENTRY (object)->priv;
-
-	g_free (priv->hint);
-
-	/* Chain up to parent's finalize() method. */
-	G_OBJECT_CLASS (e_hinted_entry_parent_class)->finalize (object);
-}
-
-static void
-hinted_entry_grab_focus (GtkWidget *widget)
-{
-	GtkWidgetClass *chain_class;
-
-	/* We don't want hints to be selected so we chain to
-	 * the GtkEntry parent if we have a hint set */
-	chain_class = e_hinted_entry_parent_class;
-	if (e_hinted_entry_get_hint_shown (E_HINTED_ENTRY (widget)))
-		chain_class = g_type_class_peek_parent (chain_class);
-
-	/* Chain up to parent's grab_focus() method. */
-	GTK_WIDGET_CLASS (chain_class)->grab_focus (widget);
-}
-
-static gboolean
-hinted_entry_focus_in_event (GtkWidget *widget,
-                             GdkEventFocus *event)
-{
-	EHintedEntry *entry = E_HINTED_ENTRY (widget);
-
-	if (e_hinted_entry_get_hint_shown (entry))
-		hinted_entry_show_text (entry, "");
-
-	/* Chain up to parent's focus_in_event() method. */
-	return GTK_WIDGET_CLASS (e_hinted_entry_parent_class)->
-		focus_in_event (widget, event);
-}
-
-static gboolean
-hinted_entry_focus_out_event (GtkWidget *widget,
-                              GdkEventFocus *event)
-{
-	EHintedEntry *entry = E_HINTED_ENTRY (widget);
-	const gchar *text;
-
-	text = e_hinted_entry_get_text (entry);
-
-	if (text == NULL || *text == '\0')
-		hinted_entry_show_hint (E_HINTED_ENTRY (widget));
-
-	/* Chain up to parent's focus_out_event() method. */
-	return GTK_WIDGET_CLASS (e_hinted_entry_parent_class)->
-		focus_out_event (widget, event);
-}
-
-static void
-e_hinted_entry_class_init (EHintedEntryClass *class)
-{
-	GObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	g_type_class_add_private (class, sizeof (EHintedEntryPrivate));
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->set_property = hinted_entry_set_property;
-	object_class->get_property = hinted_entry_get_property;
-	object_class->finalize = hinted_entry_finalize;
-
-	widget_class = GTK_WIDGET_CLASS (class);
-	widget_class->grab_focus = hinted_entry_grab_focus;
-	widget_class->focus_in_event = hinted_entry_focus_in_event;
-	widget_class->focus_out_event = hinted_entry_focus_out_event;
-
-	g_object_class_install_property (
-		object_class,
-		PROP_HINT,
-		g_param_spec_string (
-			"hint",
-			"Hint",
-			NULL,
-			NULL,
-			G_PARAM_READWRITE));
-
-	g_object_class_install_property (
-		object_class,
-		PROP_HINT_SHOWN,
-		g_param_spec_boolean (
-			"hint-shown",
-			"Hint Shown",
-			NULL,
-			FALSE,
-			G_PARAM_READABLE));
-}
-
-static void
-e_hinted_entry_init (EHintedEntry *entry)
-{
-	entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		entry, E_TYPE_HINTED_ENTRY, EHintedEntryPrivate);
-	entry->priv->hint = g_strdup ("");  /* hint must never be NULL */
-	hinted_entry_show_hint (entry);
-}
-
-GtkWidget *
-e_hinted_entry_new (void)
-{
-	return g_object_new (E_TYPE_HINTED_ENTRY, NULL);
-}
-
-const gchar *
-e_hinted_entry_get_hint (EHintedEntry *entry)
-{
-	g_return_val_if_fail (E_IS_HINTED_ENTRY (entry), NULL);
-
-	return entry->priv->hint;
-}
-
-void
-e_hinted_entry_set_hint (EHintedEntry *entry,
-                         const gchar *hint)
-{
-	g_return_if_fail (E_IS_HINTED_ENTRY (entry));
-
-	if (hint == NULL)
-		hint = "";
-
-	g_free (entry->priv->hint);
-	entry->priv->hint = g_strdup (hint);
-
-	if (e_hinted_entry_get_hint_shown (entry))
-		gtk_entry_set_text (GTK_ENTRY (entry), hint);
-
-	g_object_notify (G_OBJECT (entry), "hint");
-}
-
-gboolean
-e_hinted_entry_get_hint_shown (EHintedEntry *entry)
-{
-	g_return_val_if_fail (E_IS_HINTED_ENTRY (entry), FALSE);
-
-	return entry->priv->hint_shown;
-}
-
-const gchar *
-e_hinted_entry_get_text (EHintedEntry *entry)
-{
-	const gchar *text = "";
-
-	/* XXX This clumsily overrides gtk_entry_get_text(). */
-
-	g_return_val_if_fail (E_IS_HINTED_ENTRY (entry), NULL);
-
-	if (!e_hinted_entry_get_hint_shown (entry))
-		text = gtk_entry_get_text (GTK_ENTRY (entry));
-
-	return text;
-}
-
-void
-e_hinted_entry_set_text (EHintedEntry *entry,
-                         const gchar *text)
-{
-	/* XXX This clumsily overrides gtk_entry_set_text(). */
-
-	g_return_if_fail (E_IS_HINTED_ENTRY (entry));
-
-	if (text == NULL)
-		text = "";
-
-	if (*text == '\0' && !gtk_widget_has_focus (GTK_WIDGET (entry)))
-		hinted_entry_show_hint (entry);
-	else
-		hinted_entry_show_text (entry, text);
-}
diff --git a/widgets/misc/e-hinted-entry.h b/widgets/misc/e-hinted-entry.h
deleted file mode 100644
index 02379d4ad7..0000000000
--- a/widgets/misc/e-hinted-entry.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * e-hinted-entry.h
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef E_HINTED_ENTRY_H
-#define E_HINTED_ENTRY_H
-
-#include <gtk/gtk.h>
-
-/* Standard GObject macros */
-#define E_TYPE_HINTED_ENTRY \
-	(e_hinted_entry_get_type ())
-#define E_HINTED_ENTRY(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST \
-	((obj), E_TYPE_HINTED_ENTRY, EHintedEntry))
-#define E_HINTED_ENTRY_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_CAST \
-	((cls), E_TYPE_HINTED_ENTRY, EHintedEntryClass))
-#define E_IS_HINTED_ENTRY(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE \
-	((obj), E_TYPE_HINTED_ENTRY))
-#define E_IS_HINTED_ENTRY_CLASS(cls) \
-	(G_TYPE_CHECK_CLASS_TYPE \
-	((cls), E_TYPE_HINTED_ENTRY))
-#define E_HINTED_ENTRY_GET_CLASS(obj) \
-	(G_TYPE_INSTANCE_GET_CLASS \
-	((obj), E_TYPE_HINTED_ENTRY, EHintedEntryClass))
-
-G_BEGIN_DECLS
-
-typedef struct _EHintedEntry EHintedEntry;
-typedef struct _EHintedEntryClass EHintedEntryClass;
-typedef struct _EHintedEntryPrivate EHintedEntryPrivate;
-
-struct _EHintedEntry {
-	GtkEntry parent;
-	EHintedEntryPrivate *priv;
-};
-
-struct _EHintedEntryClass {
-	GtkEntryClass parent_class;
-};
-
-GType		e_hinted_entry_get_type		(void);
-GtkWidget *	e_hinted_entry_new		(void);
-const gchar *	e_hinted_entry_get_hint		(EHintedEntry *entry);
-void		e_hinted_entry_set_hint		(EHintedEntry *entry,
-						 const gchar *hint);
-gboolean	e_hinted_entry_get_hint_shown	(EHintedEntry *entry);
-const gchar *	e_hinted_entry_get_text		(EHintedEntry *entry);
-void		e_hinted_entry_set_text		(EHintedEntry *entry,
-						 const gchar *text);
-
-G_END_DECLS
-
-#endif /* E_HINTED_ENTRY_H */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index b8aa55f369..43871a278a 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1192,6 +1192,11 @@ ethi_end_resize (ETableHeaderItem *ethi)
 	ethi->resize_col = -1;
 	ethi->resize_guide = GINT_TO_POINTER (0);
 
+	if (ethi->table)
+		e_table_thaw_state_change (ethi->table);
+	else if (ethi->tree)
+		e_tree_thaw_state_change (ethi->tree);
+
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ethi));
 }
 
@@ -1903,6 +1908,11 @@ ethi_event (GnomeCanvasItem *item,
 			ethi->resize_col = col;
 			ethi->resize_start_pos = start - ecol->width;
 			ethi->resize_min_width = ecol->min_width;
+
+			if (ethi->table)
+				e_table_freeze_state_change (ethi->table);
+			else if (ethi->tree)
+				e_tree_freeze_state_change (ethi->tree);
 		} else {
 			if (e->button.button == 1) {
 				ethi->click_x = e->button.x;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 472681796f..e81dc6b23c 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -203,7 +203,10 @@ et_disconnect_model (ETable *et)
 static void
 e_table_state_change (ETable *et)
 {
-	g_signal_emit (G_OBJECT (et), et_signals[STATE_CHANGE], 0);
+	if (et->state_change_freeze)
+		et->state_changed = TRUE;
+	else
+		g_signal_emit (G_OBJECT (et), et_signals[STATE_CHANGE], 0);
 }
 
 #define CHECK_HORIZONTAL(et) \
@@ -605,6 +608,9 @@ e_table_init (ETable *e_table)
 	e_table->current_search_col     = NULL;
 
 	e_table->header_width           = 0;
+
+	e_table->state_changed		= FALSE;
+	e_table->state_change_freeze	= 0;
 }
 
 /* Grab_focus handler for the ETable */
@@ -3709,3 +3715,28 @@ e_table_class_init (ETableClass *class)
 
 	gal_a11y_e_table_init ();
 }
+
+void
+e_table_freeze_state_change (ETable *table)
+{
+	g_return_if_fail (table != NULL);
+
+	table->state_change_freeze++;
+	if (table->state_change_freeze == 1)
+		table->state_changed = FALSE;
+
+	g_return_if_fail (table->state_change_freeze != 0);
+}
+
+void
+e_table_thaw_state_change (ETable *table)
+{
+	g_return_if_fail (table != NULL);
+	g_return_if_fail (table->state_change_freeze != 0);
+
+	table->state_change_freeze--;
+	if (table->state_change_freeze == 0 && table->state_changed) {
+		table->state_changed = FALSE;
+		e_table_state_change (table);
+	}
+}
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index e1e4e0eb8f..6c2908811c 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -170,6 +170,9 @@ struct _ETable {
 	gint header_width;
 
 	gchar *domain;
+
+	gboolean state_changed;
+	guint state_change_freeze;
 };
 
 struct _ETableClass {
@@ -386,6 +389,9 @@ void		e_table_right_click_up		(ETable *table);
 
 void		e_table_commit_click_to_add	(ETable *table);
 
+void		e_table_freeze_state_change	(ETable *table);
+void		e_table_thaw_state_change	(ETable *table);
+
 G_END_DECLS
 
 #endif /* _E_TABLE_H_ */
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index effd1e9aa6..e24ce6a6e0 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -197,6 +197,9 @@ struct _ETreePrivate {
 	ETreeDragSourceSite *site;
 
 	GList *expanded_list;
+
+	gboolean state_changed;
+	guint state_change_freeze;
 };
 
 static guint et_signals[LAST_SIGNAL] = { 0, };
@@ -299,7 +302,10 @@ current_search_col (ETree *et)
 static void
 e_tree_state_change (ETree *et)
 {
-	g_signal_emit (G_OBJECT (et), et_signals[STATE_CHANGE], 0);
+	if (et->priv->state_change_freeze)
+		et->priv->state_changed = TRUE;
+	else
+		g_signal_emit (G_OBJECT (et), et_signals[STATE_CHANGE], 0);
 }
 
 static void
@@ -629,6 +635,9 @@ e_tree_init (ETree *e_tree)
 		G_CALLBACK (et_search_accept), e_tree);
 
 	e_tree->priv->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE;
+
+	e_tree->priv->state_changed = FALSE;
+	e_tree->priv->state_change_freeze = 0;
 }
 
 /* Grab_focus handler for the ETree */
@@ -3787,3 +3796,28 @@ e_tree_set_info_message (ETree *tree,
 	} else
 		gnome_canvas_item_set (tree->priv->info_text, "text", info_message, NULL);
 }
+
+void
+e_tree_freeze_state_change (ETree *tree)
+{
+	g_return_if_fail (tree != NULL);
+
+	tree->priv->state_change_freeze++;
+	if (tree->priv->state_change_freeze == 1)
+		tree->priv->state_changed = FALSE;
+
+	g_return_if_fail (tree->priv->state_change_freeze != 0);
+}
+
+void
+e_tree_thaw_state_change (ETree *tree)
+{
+	g_return_if_fail (tree != NULL);
+	g_return_if_fail (tree->priv->state_change_freeze != 0);
+
+	tree->priv->state_change_freeze--;
+	if (tree->priv->state_change_freeze == 0 && tree->priv->state_changed) {
+		tree->priv->state_changed = FALSE;
+		e_tree_state_change (tree);
+	}
+}
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 6504caf474..08e56039b3 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -362,6 +362,9 @@ GnomeCanvasItem *
 void		e_tree_set_info_message		(ETree *tree,
 						 const gchar *info_message);
 
+void		e_tree_freeze_state_change	(ETree *table);
+void		e_tree_thaw_state_change	(ETree *table);
+
 G_END_DECLS
 
 #endif /* _E_TREE_H_ */